DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Wed Apr 13 13:11:14 2005
New Revision: 2278

Modified:
   development/main/transit/core/handler/src/main/net/dpml/transit/Main.java
   
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
   
development/main/transit/core/plugin/src/main/net/dpml/transit/control/CommandHandler.java
Log:
fix my earlier change by supplying a monitor for trace message logging

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/Main.java
==============================================================================
--- development/main/transit/core/handler/src/main/net/dpml/transit/Main.java 
  (original)
+++ development/main/transit/core/handler/src/main/net/dpml/transit/Main.java 
  Wed Apr 13 13:11:14 2005
@@ -147,7 +147,7 @@
 
         Transit transit = Transit.getInstance( monitor );
         SecuredTransitContext context = transit.getTransitContext();
-        context.setServer( server );
+        context.setServer( monitor, server );
 
         Adapter adapter = new ConsoleAdapter( debug );
         RepositoryMonitor repoMonitor = new RepositoryMonitorAdapter( 
adapter );

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/SecuredTransitContext.java
  Wed Apr 13 13:11:14 2005
@@ -274,7 +274,7 @@
      * @param serverMode true to operate Transit in Server mode.
      * @exception TransitException if not possible to make this Transit into 
a server.
      */
-    public void setServer( boolean serverMode )
+    public void setServer( SystemMonitor monitor, boolean serverMode )
         throws TransitException
     {
         boolean current = m_server;
@@ -283,7 +283,7 @@
             m_server = serverMode;
             if( m_server )
             {
-                bindServer();
+                bindServer( monitor );
             }
             else
             {
@@ -739,7 +739,7 @@
         }
     }
 
-    private void bindServer()
+    private void bindServer( SystemMonitor monitor )
         throws TransitException
     {
         // publish the cache handler as a remotely accessible
@@ -756,11 +756,14 @@
             RemoteCacheHandler rch = new RemoteCacheHandler( lch );
             Registry reg = LocateRegistry.getRegistry( 1099 );
             reg.bind( TRANSIT_NAME,  rch );
-            final String message = 
-              "Server registered on port 1099 as [" 
-              + TRANSIT_NAME
-              + "]."; 
-            monitor.trace( message );
+            if( monitor.isTraceEnabled() )
+            {
+                final String message = 
+                  "Server registered on port 1099 as [" 
+                  + TRANSIT_NAME
+                  + "]."; 
+                monitor.trace( message );
+            }
         }
         catch( Throwable e )
         {

Modified: 
development/main/transit/core/plugin/src/main/net/dpml/transit/control/CommandHandler.java
==============================================================================
--- 
development/main/transit/core/plugin/src/main/net/dpml/transit/control/CommandHandler.java
  (original)
+++ 
development/main/transit/core/plugin/src/main/net/dpml/transit/control/CommandHandler.java
  Wed Apr 13 13:11:14 2005
@@ -164,6 +164,10 @@
             String target = line.getOptionValue( "load" );
             m_payload = getLoadArguments( target );
         }
+        else if( line.hasOption( "server" ) )
+        {
+            m_command = "server";
+        }
         else if( false == line.hasOption( "Xversion" ) )
         {
             m_command = "unknown";