DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-01-04 17:12:36 +0100 (Wed, 04 Jan 2006)
New Revision: 851

Modified:
   trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
Log:
Resolve issue concerning the supply of -D values on the command line that are 
not system properties. This resolves the issue concerning target tool 
selection with the depot handler.

Modified: trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java     
2006-01-04 09:44:45 UTC (rev 850)
+++ trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java     
2006-01-04 16:12:36 UTC (rev 851)
@@ -654,7 +654,8 @@
 
     private String getSwitch( String[] args )
     {
-        String app = System.getProperty( "dpml.depot.application", null );
+        String ref = getApplicationReference( args );
+        String app = System.getProperty( "dpml.depot.application", ref );
         if( null != app )
         {
             if( "dpml.metro".equals( app ) )
@@ -709,6 +710,19 @@
         }
     }
 
+    private String getApplicationReference( String[] args )
+    {
+        for( int i=0; i<args.length; i++ )
+        {
+            String arg = args[i];
+            if( arg.startsWith( "-Ddpml.depot.application=" ) )
+            {
+                return arg.substring( 25 );
+            }
+        }
+        return null;
+    }
+
     private String[] processSystemProperties( String[] args )
     {
         ArrayList result = new ArrayList();