DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sun Feb 20 00:35:54 2005
New Revision: 1835

Modified:
   development/main/metro/main/src/main/net/dpml/metro/Metro.java
   development/main/transit/core/handler/build.xml
   development/main/transit/core/handler/src/main/net/dpml/transit/Main.java
   
development/main/transit/core/plugin/src/main/net/dpml/transit/control/CommandHandler.java
Log:
improve the transit version message to list boith the handler and the cli 
plugin and update the metro version handler to be consitent with the style 
used in transit

Modified: development/main/metro/main/src/main/net/dpml/metro/Metro.java
==============================================================================
--- development/main/metro/main/src/main/net/dpml/metro/Metro.java      
(original)
+++ development/main/metro/main/src/main/net/dpml/metro/Metro.java      Sun 
Feb 20 00:35:54 2005
@@ -164,7 +164,7 @@
         else if( line.hasOption( "version" ) )
         {
             m_server = false;
-            handleVersionMessage( descriptor );
+            handleVersionMessage( descriptor, map );
         }
         else
         {
@@ -379,13 +379,31 @@
         System.out.println("");
     }
 
-    private void handleVersionMessage( Plugin descriptor )
+    private void handleVersionMessage( Plugin descriptor, Map map )
     {
+        System.out.println( " " );
+        try
+        {
+            Properties properties = getInitialProperties();
+            URI system = getSystemContextURI( properties );
+            System.out.println(
+              "    Metro System: "
+              + system );
+        }
+        catch( Throwable e )
+        {
+            boolean ignore = true;
+        }
+        System.out.println(
+          "       Metro CLI: "
+          + descriptor.getURI() );
         System.out.println(
-          "\n  Metro: "
-          + descriptor.getURI()
-          + "\n  Build: " + descriptor.getBuild()
-          + "\n" );
+          "     Transit CLI: "
+          + map.get( "urn:transit.cli.uri" ) );
+        System.out.println( 
+          " Transit Handler: "
+          + map.get( "urn:transit.handler.uri" ) );
+        System.out.println( " " );
     }
 
     // 
------------------------------------------------------------------------

Modified: development/main/transit/core/handler/build.xml
==============================================================================
--- development/main/transit/core/handler/build.xml     (original)
+++ development/main/transit/core/handler/build.xml     Sun Feb 20 00:35:54 
2005
@@ -26,10 +26,10 @@
 
   <target name="init" depends="standard.init">
     <filter token="PROJECT-VERSION" value="${project.version}"/>
+    <filter token="PROJECT-URI"
+        
value="artifact:plugin:dpml/transit/dpml-transit-main#${project.version}"/>
     <filter token="TRANSIT-CONTROLLER-PLUGIN" 
         
value="artifact:plugin:dpml/transit/dpml-transit-plugin#${project.version}"/>
-    <filter token="TRANSIT-INSTALLER-PLUGIN" 
-        value="artifact:plugin:osm/depot/osm-depot-setup#SNAPSHOT"/>
     <filter token="PROJECT-NAME" value="${project.name}"/>
   </target>
 

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 
  Sun Feb 20 00:35:54 2005
@@ -50,6 +50,11 @@
 public final class Main
 {
    /**
+    * The transit uri.
+    */
+    private static final String TRANSIT_URI = "@PROJECT-URI@";
+
+   /**
     * Immutable key used to lookup the a system property containing the value
     * of a plugin to be loaded by transit on startup.
     */
@@ -184,6 +189,8 @@
         URI uri = Artifact.createArtifact( path ).toURI();
 
         Map data = new Hashtable();
+        data.put( "urn:transit.handler.uri", TRANSIT_URI );
+        data.put( "urn:transit.cli.uri", uri );
         data.put( "urn:transit.system.monitor", monitor );
         data.put( "urn:transit.repository.monitor", repoMonitor );
         data.put( "urn:transit.cache.monitor", cacheMonitor );

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
  Sun Feb 20 00:35:54 2005
@@ -352,10 +352,14 @@
     */
     private void handleVersionMessage( Plugin descriptor )
     {
+        System.out.println( " " );
+        System.out.println( 
+          "     Protocol Handler: "
+          + m_map.get( "urn:transit.handler.uri" ) );
         System.out.println(
-          "\n  Transit: "
-          + descriptor.getURI()
-          + "\n" );
+          "  Commandline Handler: "
+          + m_map.get( "urn:transit.cli.uri" ) );
+        System.out.println( " " );
     }
 
     // 
------------------------------------------------------------------------