DPML Notify

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

Author: mcconnell
Date: 2006-01-12 10:26:19 +0100 (Thu, 12 Jan 2006)
New Revision: 910

Modified:
   trunk/main/metro/station/server/build.xml
   
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
   
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
Log:
improve logging messages related to application shutdown by (a) eliminating 
messages associated with non-running applications, (b) synchronizing message 
log levels between station server and remote applications

Modified: trunk/main/metro/station/server/build.xml
===================================================================
--- trunk/main/metro/station/server/build.xml   2006-01-12 07:41:18 UTC (rev 
909)
+++ trunk/main/metro/station/server/build.xml   2006-01-12 09:26:19 UTC (rev 
910)
@@ -21,7 +21,6 @@
     <copy todir="${dpml.system}" preservelastmodified="true" 
overwrite="true">
       <fileset dir="target">
         <include name="bin/*.bat"/>
-        <include name="bin/server/*.*"/>
         <exclude name="**/*.exe"/>
         <exclude name="**/*.EXE"/>
       </fileset>
@@ -38,8 +37,6 @@
   <target name="bin" depends="standard.install">
     <copy todir="${dpml.system}" preservelastmodified="true" 
overwrite="true" filtering="false">
       <fileset dir="etc">
-        <include name="bin/server/*.exe"/>
-        <include name="bin/server/*.EXE"/>
         <include name="bin/scm/**/*.*"/>
       </fileset>
     </copy>

Modified: 
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
===================================================================
--- 
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
     2006-01-12 07:41:18 UTC (rev 909)
+++ 
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplication.java
     2006-01-12 09:26:19 UTC (rev 910)
@@ -115,7 +115,6 @@
             m_handler = handler;
             try
             {
-                //handler.activate();
                 m_instance = handler.getProvider();
                 setProcessState( ProcessState.STARTED );
             }
@@ -330,14 +329,12 @@
         //
         
         Properties properties = m_descriptor.getSystemProperties();
+        properties.setProperty( "dpml.subprocess", "true" );
         if( null == properties.getProperty( "java.util.logging.config.class" 
) )
         {
             properties.setProperty( 
               "java.util.logging.config.class", 
               "net.dpml.depot.DepotLoggingConfiguration" );
-            properties.setProperty(
-              "dpml.subprocess",
-              "true" );
         }
         Enumeration names = properties.propertyNames();
         while( names.hasMoreElements() )
@@ -372,13 +369,11 @@
     */
     public void stop() throws RemoteException
     {
-        getLogger().info( "stop" );
         handleStop( true );
     }
     
     void shutdown() throws IOException
     {
-        getLogger().info( "shutdown requested" );
         try
         {
             handleStop( false );
@@ -397,7 +392,6 @@
     
     private void handleStop( boolean check ) throws ApplicationException
     {
-        getLogger().info( "stop requested" );
         synchronized( m_state )
         {
             if( m_state.equals( ProcessState.IDLE ) )
@@ -410,6 +404,7 @@
             }
             else
             {
+                getLogger().info( "stopping application" );
                 setProcessState( ProcessState.STOPPING );
                 if( m_handler != null )
                 {

Modified: 
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
===================================================================
--- 
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
 2006-01-12 07:41:18 UTC (rev 909)
+++ 
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
 2006-01-12 09:26:19 UTC (rev 910)
@@ -79,8 +79,8 @@
         m_port = port;
         m_store = registryStorageUrl;
         
+        m_rmiRegistry = getLocalRegistry( port );
         
-        m_rmiRegistry = getLocalRegistry( port );
         try
         {
             m_rmiRegistry.bind( STATION_KEY, this );
@@ -199,9 +199,9 @@
                 m_terminated = true;
             }
             
-            if( getLogger().isDebugEnabled() )
+            if( getLogger().isInfoEnabled() )
             {
-                getLogger().debug( "handling shutdown request" );
+                getLogger().info( "initiating station shutdown" );
             }
             
             try
@@ -236,11 +236,11 @@
             }
             finally
             {
-                if( getLogger().isDebugEnabled() )
+                if( getLogger().isInfoEnabled() )
                 {
-                    getLogger().debug( "shutdown complete" );
+                    getLogger().info( "station shutdown complete" );
                 }
-            
+                
                 if( exit )
                 {
                     if( getLogger().isDebugEnabled() )