DPML Notify

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

Author: mcconnell
Date: 2007-04-03 17:29:57 +0200 (Tue, 03 Apr 2007)
New Revision: 1945

Added:
   trunk/main/metro/sample/etc/appliance-bis.xml
   trunk/main/metro/sample/etc/component-bis.xml
Modified:
   trunk/central/site/src/docs/station/cli/info.xml
   trunk/central/site/src/docs/station/cli/server.xml
   trunk/central/site/src/docs/station/cli/shutdown.xml
   trunk/central/site/src/docs/station/cli/startup.xml
   trunk/central/site/src/docs/station/scm.xml
   trunk/main/metro/part/src/main/net/dpml/runtime/ContextDirective.java
   trunk/main/metro/sample/etc/appliance.xml
   trunk/main/metro/sample/etc/plan.xml
   trunk/main/metro/sample/project.xml
Log:
update station cli docs and add supporting demo material

Modified: trunk/central/site/src/docs/station/cli/info.xml
===================================================================
--- trunk/central/site/src/docs/station/cli/info.xml    2007-04-02 19:19:07 
UTC (rev 1944)
+++ trunk/central/site/src/docs/station/cli/info.xml    2007-04-03 15:29:57 
UTC (rev 1945)
@@ -36,23 +36,6 @@
 
       </subsection>
 
-      <subsection name="Example - General Listing">
-
-<pre>$ station info
-
-  <font color="blue">Server is operational.
-  Port: 1099
-  Store: local:xml:dpml/station/registry
-  Basedir: c:\dev\dpml\main
-  Codebase: artifact:jar:dpml/metro/dpml-station-server#SNAPSHOT
-
-  Profile count: 1
-
-  (1) demo       STARTED link:part:dpml/planet/http/dpml-http-demo</font>
-</pre>
-
-      </subsection>
-
     </section>
 
   </body>

Modified: trunk/central/site/src/docs/station/cli/server.xml
===================================================================
--- trunk/central/site/src/docs/station/cli/server.xml  2007-04-02 19:19:07 
UTC (rev 1944)
+++ trunk/central/site/src/docs/station/cli/server.xml  2007-04-03 15:29:57 
UTC (rev 1945)
@@ -45,11 +45,51 @@
 
       </subsection>
 
-      <subsection name="Example">
+    </section>
+    
+    <section name="Example">
+    
+      <subsection name="Launching the station in server mode">
+      
+        <p>
+        In the following example we are starting the station as a forground 
+        process and supplying a specfic target deployment plan.  The plan
+        references two appliance definitions reflected by the process 
identifier
+        numbers in the log (2932 is the station process, 264 is the first 
+        appliance sub-process, and 92 is the second appliance subprocess.
+        </p>
 
-<pre>$ station server</pre>
+<pre>
+<font color="darkred">$ station server 
link:plan:dpml/metro/dpml-metro-sample</font>
 
-<source>[5096 ] [INFO   ] (depot.station): Station started on port: 
1099</source>
+[2932 ] [INFO   ] (dpml.station): created local registry on port 1099
+[2932 ] [INFO   ] (dpml.station.plan): loading station.sample
+[2932 ] [INFO   ] (dpml.metro.appliance): process established in 1094 ms
+[2932 ] [INFO   ] (dpml.station.plan): loading station.demo
+[2932 ] [INFO   ] (dpml.metro.appliance): process established in 1078 ms
+[2932 ] [INFO   ] (dpml.station.plan): commissioning plan
+[264  ] [INFO   ] (station.sample.hello): commissioning hello
+[264  ] [INFO   ] (station.sample.hello): pid: [264]
+[264  ] [INFO   ] (station.sample.hello): message: Fiery the angels fell. 
Deep thunder rolled 
+around their shores... burning with the fires of Orc.
+[264  ] [INFO   ] (station.sample.hello): port: 1024
+[264  ] [INFO   ] (dpml.metro.event): creation
+[264  ] [INFO   ] (dpml.metro.event): incarnation
+[264  ] [INFO   ] (station.sample.hello): target: 
artifact:jar:dpml/metro/dpml-metro-sample#2.0.0
+[264  ] [INFO   ] (station.sample.hello): starting
+[264  ] [INFO   ] (station.sample.hello): started
+[92   ] [INFO   ] (station.demo.blade): commissioning blade
+[92   ] [INFO   ] (dpml.metro.event): creation
+[92   ] [INFO   ] (dpml.metro.event): incarnation
+[92   ] [INFO   ] (station.demo.blade): pid: [92]
+[92   ] [INFO   ] (station.demo.blade): message: I've seen things you people 
wouldn't believe. 
+Attack ships on fire off the shoulder of Orion. I watched C-beams glitter in 
the dark near the 
+Tannhauser gate. All those moments will be lost in time, like tears in rain. 
Time to die.
+[92   ] [INFO   ] (station.demo.blade): port: 42
+[92   ] [INFO   ] (station.demo.blade): target: 
artifact:jar:dpml/metro/dpml-metro-sample#2.0.0
+[92   ] [INFO   ] (station.demo.blade): starting
+[2932 ] [INFO   ] (dpml.station.plan): plan commissioning complete
+[92   ] [INFO   ] (station.demo.blade): started</pre>
 
       </subsection>
 

Modified: trunk/central/site/src/docs/station/cli/shutdown.xml
===================================================================
--- trunk/central/site/src/docs/station/cli/shutdown.xml        2007-04-02 
19:19:07 UTC (rev 1944)
+++ trunk/central/site/src/docs/station/cli/shutdown.xml        2007-04-03 
15:29:57 UTC (rev 1945)
@@ -39,17 +39,6 @@
 
       </subsection>
 
-      <subsection name="Example">
-
-<pre>$ station shutdown</pre>
-
-<source>
-[6084 ] [INFO   ] (depot.station): initiating station shutdown
-[6084 ] [INFO   ] (depot.station): station shutdown complete
-</source>
-
-      </subsection>
-
     </section>
 
   </body>

Modified: trunk/central/site/src/docs/station/cli/startup.xml
===================================================================
--- trunk/central/site/src/docs/station/cli/startup.xml 2007-04-02 19:19:07 
UTC (rev 1944)
+++ trunk/central/site/src/docs/station/cli/startup.xml 2007-04-03 15:29:57 
UTC (rev 1945)
@@ -45,15 +45,6 @@
 
       </subsection>
 
-
-      <subsection name="Example">
-
-<pre>$ station startup</pre>
-
-<source>[5096 ] [INFO   ] (depot.station): Station started on port: 
1099</source>
-
-      </subsection>
-
     </section>
 
   </body>

Modified: trunk/central/site/src/docs/station/scm.xml
===================================================================
--- trunk/central/site/src/docs/station/scm.xml 2007-04-02 19:19:07 UTC (rev 
1944)
+++ trunk/central/site/src/docs/station/scm.xml 2007-04-03 15:29:57 UTC (rev 
1945)
@@ -4,7 +4,7 @@
 
   <properties>
     <author email="mcconnell AT dpml.net">Stephen McConnell</author>
-    <title>DPML Metro SCM</title>
+    <title>DPML Station SCM</title>
   </properties> 
 
   <body>
@@ -23,10 +23,11 @@
 
         <p>
         The following command will install the DPML Station as an NT Service
-        under the service name <tt>dpml</tt>.
+        under the service name <tt>dpml</tt> (or just go to the share\bin\scm
+        directory and double click on the install-DPML-SCM.exe file).
         </p> 
 <pre>
-$ %HOME%\Shared\bin\scm\install-DPML-SCM
+$ %DPML_HOME%\share\bin\scm\install-DPML-SCM
 </pre>
 
       </subsection>
@@ -49,7 +50,7 @@
         The following command will uninstall the DPML Station NT Service.
         </p> 
 <pre>
-$ %HOME%\Shared\bin\scm\uninstall-DPML-SCM
+$ %DPML_HOME%\share\bin\scm\uninstall-DPML-SCM
 </pre>
 
       </subsection>

Modified: 
trunk/main/metro/part/src/main/net/dpml/runtime/ContextDirective.java
===================================================================
--- trunk/main/metro/part/src/main/net/dpml/runtime/ContextDirective.java     
  2007-04-02 19:19:07 UTC (rev 1944)
+++ trunk/main/metro/part/src/main/net/dpml/runtime/ContextDirective.java     
  2007-04-03 15:29:57 UTC (rev 1945)
@@ -276,11 +276,12 @@
             {
                 buffer.write( " class=\"" + m_classname + "\"" );
             }
-            buffer.nl( ">" );
+            buffer.write( ">" );
+            Buffer b = buffer.indent();
             for( String k : m_values.keySet() )
             {
                 Value v = m_values.get( k );
-                v.encode( buffer, "entry", k );
+                v.encode( b, "entry", k );
             }
             buffer.nl( "</map>" );
         }

Added: trunk/main/metro/sample/etc/appliance-bis.xml
===================================================================
--- trunk/main/metro/sample/etc/appliance-bis.xml       2007-04-02 19:19:07 
UTC (rev 1944)
+++ trunk/main/metro/sample/etc/appliance-bis.xml       2007-04-03 15:29:57 
UTC (rev 1945)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<appliance xmlns="dpml:appliance">
+
+  <info name="demo"/>
+  
+  <process startup="0" shutdown="0">
+    <environment>
+      <variable name="FOO" value="BAR"/>
+    </environment>
+    <properties>
+      <property name="foo" value="bar"/>
+    </properties>
+  </process>
+  
+  <codebase uri="link:part:dpml/metro/dpml-metro-blade"/>
+
+</appliance>

Modified: trunk/main/metro/sample/etc/appliance.xml
===================================================================
--- trunk/main/metro/sample/etc/appliance.xml   2007-04-02 19:19:07 UTC (rev 
1944)
+++ trunk/main/metro/sample/etc/appliance.xml   2007-04-03 15:29:57 UTC (rev 
1945)
@@ -14,7 +14,7 @@
   </process>
   
   <codebase uri="link:part:dpml/metro/dpml-metro-sample">
-    <param key="message" value="Hello%20World"/>
+    <param key="message" 
value="Fiery%20the%20angels%20fell.%20Deep%20thunder%20rolled%20around%20their%20shores...%20burning%20with%20the%20fires%20of%20Orc."/>
     <param key="port" value="1024"/>
   </codebase>
 

Added: trunk/main/metro/sample/etc/component-bis.xml
===================================================================
--- trunk/main/metro/sample/etc/component-bis.xml       2007-04-02 19:19:07 
UTC (rev 1944)
+++ trunk/main/metro/sample/etc/component-bis.xml       2007-04-03 15:29:57 
UTC (rev 1945)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<component xmlns="dpml:metro" name="blade" class="org.acme.HelloComponent">
+  <context>
+    <entry key="message" value="I've seen things you people wouldn't 
believe. Attack ships on fire off the shoulder of Orion. I watched C-beams 
glitter in the dark near the Tannhauser gate. All those moments will be lost 
in time, like tears in rain. Time to die."/>
+    <entry key="port" value="42"/>
+  </context>
+</component>

Modified: trunk/main/metro/sample/etc/plan.xml
===================================================================
--- trunk/main/metro/sample/etc/plan.xml        2007-04-02 19:19:07 UTC (rev 
1944)
+++ trunk/main/metro/sample/etc/plan.xml        2007-04-03 15:29:57 UTC (rev 
1945)
@@ -2,6 +2,7 @@
 
 <plan xmlns="dpml:plan" name="station" title="DPML Station Deployment Plan">
 
-  <entry key="demo" uri="link:appliance:dpml/metro/dpml-metro-sample"/>
+  <entry key="sample" uri="link:appliance:dpml/metro/dpml-metro-sample"/>
+  <entry key="demo" uri="link:appliance:dpml/metro/dpml-metro-demo"/>
   
 </plan>

Modified: trunk/main/metro/sample/project.xml
===================================================================
--- trunk/main/metro/sample/project.xml 2007-04-02 19:19:07 UTC (rev 1944)
+++ trunk/main/metro/sample/project.xml 2007-04-03 15:29:57 UTC (rev 1945)
@@ -7,8 +7,10 @@
   <types>
     <type id="jar"/>
     <type id="part" source="etc/component.xml" alias="true"/>
+    <type id="part" source="etc/component-bis.xml" alias="true" 
name="dpml-metro-blade"/>
     <type id="plan" source="etc/plan.xml" alias="true"/>
     <type id="appliance" source="etc/appliance.xml" alias="true"/>
+    <type id="appliance" source="etc/appliance-bis.xml" alias="true" 
name="dpml-metro-demo"/>
   </types>
   
   <dependencies>