DPML Notify

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

Author: mcconnell
Date: 2006-07-31 05:00:45 +0200 (Mon, 31 Jul 2006)
New Revision: 1698

Modified:
   trunk/main/depot/core/src/main/net/dpml/depot/Main.java
   trunk/main/station/exec/etc/bin/metro
   trunk/main/station/exec/etc/bin/metro.lap
   
trunk/main/station/exec/src/main/net/dpml/station/exec/ApplicationHandler.java
Log:
resolve issue in metro cli handler concerning incorrect assignment of logging 
configuration
correct metro cli handler javadocs


Modified: trunk/main/depot/core/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/Main.java     2006-07-31 
02:58:00 UTC (rev 1697)
+++ trunk/main/depot/core/src/main/net/dpml/depot/Main.java     2006-07-31 
03:00:45 UTC (rev 1698)
@@ -88,7 +88,7 @@
         String[] args = processSystemProperties( arguments );
 
         //
-        // check for debug mode
+        // check for debug and trace cli options
         //
         
         if( CLIHelper.isOptionPresent( args, "-trace" ) )
@@ -97,7 +97,8 @@
             System.setProperty( "dpml.trace", "true" );
             m_trace = true;
         }
-        else if( CLIHelper.isOptionPresent( args, "-debug" ) )
+        
+        if( CLIHelper.isOptionPresent( args, "-debug" ) )
         {
             args = CLIHelper.consolidate( args, "-debug" );
             System.setProperty( "dpml.debug", "true" );

Modified: trunk/main/station/exec/etc/bin/metro
===================================================================
--- trunk/main/station/exec/etc/bin/metro       2006-07-31 02:58:00 UTC (rev 
1697)
+++ trunk/main/station/exec/etc/bin/metro       2006-07-31 03:00:45 UTC (rev 
1698)
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 
-METRO_JVM_OPTS="-Ddpml.depot.application=dpml.metro 
-Ddpml.logging.config=local:properties:dpml/transit/default"
+METRO_JVM_OPTS="-Ddpml.depot.application=dpml.metro"
 
 if [ "$DEPOT_JVM_OPTS" = "" ] ; then
     DEPOT_JVM_OPTS=$METRO_JVM_OPTS

Modified: trunk/main/station/exec/etc/bin/metro.lap
===================================================================
--- trunk/main/station/exec/etc/bin/metro.lap   2006-07-31 02:58:00 UTC (rev 
1697)
+++ trunk/main/station/exec/etc/bin/metro.lap   2006-07-31 03:00:45 UTC (rev 
1698)
@@ -8,7 +8,7 @@
 -Ddpml.depot.application=dpml.metro
 -Djava.protocol.handler.pkgs=net.dpml.transit
 -Djava.rmi.server.RMIClassLoaderSpi=net.dpml.depot.DepotRMIClassLoaderSpi
--Ddpml.logging.config=local:properties:dpml/transit/default
+#-Ddpml.logging.config=local:properties:dpml/transit/default
 janel.main.class=net.dpml.depot.Main
 janel.min.java.version=1.4.0
 janel.classpath.jars.dir=${env.DPML_HOME}\share\lib

Modified: 
trunk/main/station/exec/src/main/net/dpml/station/exec/ApplicationHandler.java
===================================================================
--- 
trunk/main/station/exec/src/main/net/dpml/station/exec/ApplicationHandler.java
      2006-07-31 02:58:00 UTC (rev 1697)
+++ 
trunk/main/station/exec/src/main/net/dpml/station/exec/ApplicationHandler.java
      2006-07-31 03:00:45 UTC (rev 1698)
@@ -80,18 +80,18 @@
     * The following command list help about the <tt>metro</tt> commandline 
handler:
     * <pre>$ metro help
 Usage:
-metro [exec <uri> help]
+metro [-uri <uri> | -help]
 options
-  exec <uri>               Execute deployment of an application codebase.
+  -uri <uri>               Execute deployment of an application codebase.
     -key -port
       -key (-k) <key>      Station callback application key.
       -port (-p) <port>    Override default RMI registry port selection.
-  help                     Print command help.
+  -help                    Print command help.
     * </pre>
     * A typical example of a commandline and resulting log of an application 
launch 
     * using <tt>metro</tt> is show below:
     * <pre>
-$ metro exec link:part:dpml/planet/http/dpml-http-demo
+$ metro -uri link:part:dpml/planet/http/dpml-http-demo
 [2236 ] [INFO   ] (demo): Starting
 [2236 ] [INFO   ] (org.mortbay.http.HttpServer): Version Jetty/5.1.x
 [2236 ] [INFO   ] (org.mortbay.util.Container): Started 
net.dpml.http.impl.HttpServerImpl@6355dc