DPML Notify

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

Author: mcconnell
Date: 2006-01-11 05:50:55 +0100 (Wed, 11 Jan 2006)
New Revision: 901

Removed:
   trunk/main/metro/station/server/etc/prefs/logging.properties
Modified:
   trunk/main/build.xml
   trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
   
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
   trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf
   trunk/main/metro/station/server/etc/prefs/propertiess/logging.properties
   
trunk/main/transit/core/src/main/net/dpml/transit/util/ConfigurationHandler.java
Log:
update the station startup handler to automatically select a logging 
configuration from local:properties:dpml/station/logging

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml        2006-01-11 04:03:06 UTC (rev 900)
+++ trunk/main/build.xml        2006-01-11 04:50:55 UTC (rev 901)
@@ -146,7 +146,8 @@
   <target name="data" depends="prepare">
     <mkdir dir="${data}/cache"/>
     <mkdir dir="${data}/work"/>
-    <mkdir dir="${data}/logs"/>
+    <mkdir dir="${data}/logs/station"/>
+    <mkdir dir="${data}/logs/transit"/>
     <mkdir dir="${data}/temp"/>
   </target>
 

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-11 04:03:06 UTC (rev 900)
+++ trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java     
2006-01-11 04:50:55 UTC (rev 901)
@@ -21,6 +21,7 @@
 import java.net.URL;
 import java.net.URI;
 import java.rmi.RMISecurityManager;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Enumeration;
 
@@ -155,6 +156,7 @@
     private void handleStation( String[] arguments )
     {
         String name = "station";
+        new File( Transit.DPML_DATA, "logs/station" ).mkdirs();
         if( CLIHelper.isOptionPresent( arguments, "-server" ) )
         {
             String[] args = CLIHelper.consolidate( arguments, "-server" );

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-11 04:03:06 UTC (rev 900)
+++ 
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
       2006-01-11 04:50:55 UTC (rev 901)
@@ -434,8 +434,11 @@
             getLogger().warn( message );
             return;
         }
+        
         ArrayList list = new ArrayList();
         list.add( "station" );
+        list.add( 
"-Ddpml.logging.config=local:properties:dpml/station/logging" );
+        
         Set propertyValue = line.getProperties();
         Iterator iterator = propertyValue.iterator();
         while( iterator.hasNext() )
@@ -444,7 +447,7 @@
             String value = line.getProperty( name );
             list.add( "-D" + name + "=" + value );
         }
-
+        
         list.add( "-server" );
         list.add( "" + port );
         URI uri = getRegistryURI( line );

Modified: trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf
===================================================================
--- trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf       
2006-01-11 04:03:06 UTC (rev 900)
+++ trunk/main/metro/station/server/etc/bin/scm/conf/wrapper.conf       
2006-01-11 04:50:55 UTC (rev 901)
@@ -34,6 +34,7 @@
 wrapper.java.additional.3=-Ddpml.depot.application=dpml.station
 wrapper.java.additional.4=-Djava.protocol.handler.pkgs=net.dpml.transit
 
wrapper.java.additional.5=-Djava.rmi.server.RMIClassLoaderSpi=net.dpml.depot.DepotRMIClassLoaderSpi
+wrapper.java.additional.6=-Ddpml.logging.config=local:properties:dpml/station/logging
 
 # Initial Java Heap Size (in MB)
 #wrapper.java.initmemory=3

Deleted: trunk/main/metro/station/server/etc/prefs/logging.properties
===================================================================
--- trunk/main/metro/station/server/etc/prefs/logging.properties        
2006-01-11 04:03:06 UTC (rev 900)
+++ trunk/main/metro/station/server/etc/prefs/logging.properties        
2006-01-11 04:50:55 UTC (rev 901)
@@ -1,8 +0,0 @@
-handlers=java.util.logging.FileHandler
-java.util.logging.FileHandler.pattern=${dpml.data}/logs/dpml-station.log
-java.util.logging.FileHandler.limit=50000
-java.util.logging.FileHandler.count=1
-java.util.logging.FileHandler.formatter=net.dpml.transit.util.StandardFormatter
-sun.rmi.transport.tcp.level=INFO
-sun.rmi.loader.level=INFO
-

Modified: 
trunk/main/metro/station/server/etc/prefs/propertiess/logging.properties
===================================================================
--- trunk/main/metro/station/server/etc/prefs/propertiess/logging.properties  
  2006-01-11 04:03:06 UTC (rev 900)
+++ trunk/main/metro/station/server/etc/prefs/propertiess/logging.properties  
  2006-01-11 04:50:55 UTC (rev 901)
@@ -1,5 +1,5 @@
 handlers=java.util.logging.FileHandler
-java.util.logging.FileHandler.pattern=${dpml.data}/logs/station/server.log
+java.util.logging.FileHandler.pattern=${dpml.data}/logs/station/server-%u.log
 java.util.logging.FileHandler.limit=50000
 java.util.logging.FileHandler.count=1
 
java.util.logging.FileHandler.formatter=net.dpml.transit.util.StandardFormatter

Modified: 
trunk/main/transit/core/src/main/net/dpml/transit/util/ConfigurationHandler.java
===================================================================
--- 
trunk/main/transit/core/src/main/net/dpml/transit/util/ConfigurationHandler.java
    2006-01-11 04:03:06 UTC (rev 900)
+++ 
trunk/main/transit/core/src/main/net/dpml/transit/util/ConfigurationHandler.java
    2006-01-11 04:50:55 UTC (rev 901)
@@ -104,7 +104,7 @@
         try
         {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
-            properties.store( out, "DPML Logging properties" );
+            properties.store( out, "DPML Logging Properties" );
             byte[] bytes = out.toByteArray();
             ByteArrayInputStream input = new ByteArrayInputStream( bytes );
             LogManager manager = LogManager.getLogManager();