DPML Notify

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

Author: mcconnell
Date: 2006-01-30 09:16:58 +0100 (Mon, 30 Jan 2006)
New Revision: 990

Modified:
   
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
Log:
update station console to dereference symbolic arguments passed as invocation 
arguments

Modified: 
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
===================================================================
--- 
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
       2006-01-29 15:29:51 UTC (rev 989)
+++ 
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
       2006-01-30 08:16:58 UTC (rev 990)
@@ -58,6 +58,7 @@
 import net.dpml.transit.Disposable;
 import net.dpml.transit.info.ValueDirective;
 import net.dpml.transit.util.ExceptionHelper;
+import net.dpml.transit.util.PropertyResolver;
 
 import net.dpml.lang.UnknownKeyException;
 import net.dpml.lang.DuplicateKeyException;
@@ -228,9 +229,11 @@
     {
         if( m_flag && ( null != m_registry ) )
         {
+            getLogger().debug( "retracting registry from rmi" );
             try
             {
                 UnicastRemoteObject.unexportObject( m_registry, true );
+                m_registry = null;
             }
             catch( Throwable e )
             {
@@ -747,7 +750,8 @@
             {
                 try
                 {
-                    String[] args = line.split( " " );
+                    String[] arguments = line.split( " " );
+                    String[] args = expandArgs( arguments );
                     CommandLine commandline = parser.parse( args );
                     if( commandline.hasOption( CONTROL_HELP_COMMAND ) )
                     {
@@ -879,6 +883,18 @@
         }
     }
     
+    private String[] expandArgs( String[] args )
+    {
+        String[] result = new String[ args.length ];
+        for( int i=0; i<args.length; i++ )
+        {
+            String arg = args[i];
+            String value = PropertyResolver.resolve( arg );
+            result[i] = value;
+        }
+        return result;
+    }
+    
     private String[] getExecArgs( CommandLine line )
     {
         return getArgs( CONTROL_EXEC_COMMAND, line );