DPML Notify

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

Author: mcconnell
Date: 2007-02-09 03:20:13 +0100 (Fri, 09 Feb 2007)
New Revision: 1862

Added:
   trunk/main/metro/part/
   trunk/main/metro/sample/
Removed:
   trunk/main/lang/
Modified:
   trunk/central/site/src/docs/about/download/archive.xml
   trunk/central/site/src/docs/depot/library/projects.xml
   trunk/central/site/src/docs/depot/library/types.xml
   trunk/central/site/src/docs/metro/directives/type/categories/index.xml
   trunk/central/site/src/docs/metro/directives/type/context/index.xml
   trunk/central/site/src/docs/metro/directives/type/index.xml
   trunk/central/site/src/docs/metro/directives/type/services/index.xml
   trunk/central/site/src/docs/metro/directives/type/state/index.xml
   trunk/index.xml
   trunk/main/bootstrap.bat
   trunk/main/build.xml
   trunk/main/depot/build/bootstrap.xml
   trunk/main/depot/build/etc/bin/build.lap
   trunk/main/depot/build/etc/bootstrap/part.xml
   trunk/main/depot/build/project.xml
   trunk/main/depot/library/bootstrap.xml
   trunk/main/depot/library/project.xml
   trunk/main/depot/tools/bootstrap.xml
   trunk/main/depot/tools/etc/bootstrap/builder.xml
   trunk/main/depot/tools/project.xml
   trunk/main/metro/appliance/etc/data/appliance.xml
   trunk/main/metro/appliance/etc/data/bar.xml
   trunk/main/metro/appliance/etc/data/foo.xml
   trunk/main/metro/appliance/etc/data/plan.xml
   trunk/main/metro/appliance/project.xml
   
trunk/main/metro/appliance/src/test/net/dpml/appliance/ApplianceDescriptorTestCase.java
   trunk/main/metro/connector/project.xml
   trunk/main/metro/main/etc/bin/metro.lap
   trunk/main/metro/main/project.xml
   trunk/main/metro/main/src/main/dpml/metro/console/Main.java
   trunk/main/metro/module.xml
   trunk/main/metro/part/bootstrap.xml
   trunk/main/metro/part/build.xml
   trunk/main/metro/part/project.xml
   trunk/main/metro/part/src/main/dpml/lang/StandardNamespaceResolver.java
   trunk/main/metro/part/src/main/net/dpml/annotation/Component.java
   trunk/main/metro/sample/project.xml
   trunk/main/metro/station/etc/bin/station.lap
   trunk/main/metro/station/project.xml
   trunk/main/metro/station/src/main/dpml/station/console/Main.java
   trunk/main/metro/test/etc/data/application.xml
   trunk/main/metro/test/etc/data/test.properties
   trunk/tutorials/module.xml
   trunk/tutorials/tooling/complex/plugin/index.xml
Log:
reshuffle lang into metro

Modified: trunk/central/site/src/docs/about/download/archive.xml
===================================================================
--- trunk/central/site/src/docs/about/download/archive.xml      2007-02-09 
01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/about/download/archive.xml      2007-02-09 
02:20:13 UTC (rev 1862)
@@ -548,7 +548,7 @@
         XSD schema reference have been update to use symbolic links in favour
         of direct artifact references. XSD namespace references are now 
declared
         in the form <tt>dpml:library</tt> (which in-turn references
-        an artifact such 
<tt>artifact:xsd:dpml/lang/dpml-module#1.0.0-RC8</tt>).
+        an artifact such 
<tt>artifact:xsd:dpml/metro/dpml-module#1.0.0-RC8</tt>).
         </p>
 
       </subsection>

Modified: trunk/central/site/src/docs/depot/library/projects.xml
===================================================================
--- trunk/central/site/src/docs/depot/library/projects.xml      2007-02-09 
01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/depot/library/projects.xml      2007-02-09 
02:20:13 UTC (rev 1862)
@@ -155,10 +155,10 @@
     </dependencies>
     <filters>
       <feature token="PART-HANDLER-URI" id="uri" type="part"/>
-      <feature token="STATE-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-state" alias="true"/>
-      <feature token="PART-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-lang-part" alias="true"/>
-      <feature token="TYPE-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-type" alias="true"/>
-      <feature token="COMPONENT-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-component" alias="true"/>
+      <feature token="STATE-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-state" alias="true"/>
+      <feature token="PART-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-metro-part" alias="true"/>
+      <feature token="TYPE-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-type" alias="true"/>
+      <feature token="COMPONENT-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-component" alias="true"/>
     </filters>
   </project>
 ]]></source>

Modified: trunk/central/site/src/docs/depot/library/types.xml
===================================================================
--- trunk/central/site/src/docs/depot/library/types.xml 2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/central/site/src/docs/depot/library/types.xml 2007-02-09 02:20:13 
UTC (rev 1862)
@@ -126,10 +126,10 @@
     </dependencies>
     <filters>
       <feature token="PART-HANDLER-URI" id="uri" type="part"/>
-      <feature token="STATE-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-state" alias="true"/>
-      <feature token="PART-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-lang-part" alias="true"/>
-      <feature token="TYPE-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-type" alias="true"/>
-      <feature token="COMPONENT-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-component" alias="true"/>
+      <feature token="STATE-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-state" alias="true"/>
+      <feature token="PART-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-metro-part" alias="true"/>
+      <feature token="TYPE-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-type" alias="true"/>
+      <feature token="COMPONENT-XSD-URI" id="uri" type="xsd" 
ref="dpml/metro/dpml-component" alias="true"/>
     </filters>
   </project>
 ]]></source>

Modified: 
trunk/central/site/src/docs/metro/directives/type/categories/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/directives/type/categories/index.xml    
  2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/metro/directives/type/categories/index.xml    
  2007-02-09 02:20:13 UTC (rev 1862)
@@ -35,7 +35,7 @@
 <![CDATA[
 <?xml version="1.0"?>
 
-<type xmlns="link:xsd:dpml/lang/dpml-type#1.0">
+<type xmlns="link:xsd:dpml/metro/dpml-type#1.0">
 
   <info name="categories"
       class="net.dpml.test.categories.CategoriesComponent"

Modified: trunk/central/site/src/docs/metro/directives/type/context/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/directives/type/context/index.xml 
2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/metro/directives/type/context/index.xml 
2007-02-09 02:20:13 UTC (rev 1862)
@@ -45,7 +45,7 @@
     <section name="Examples">
 
 <source>
-<![CDATA[<type xmlns="link:xsd:dpml/lang/dpml-type#1.0">
+<![CDATA[<type xmlns="link:xsd:dpml/metro/dpml-type#1.0">
 
   <info name="context"
       class="net.dpml.test.ContextTestComponent"

Modified: trunk/central/site/src/docs/metro/directives/type/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/directives/type/index.xml 2007-02-09 
01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/metro/directives/type/index.xml 2007-02-09 
02:20:13 UTC (rev 1862)
@@ -11,7 +11,7 @@
 
     <section name="Type Task">
     
-      <pre>link:xsd:dpml/lang/dpml-type#1.0</pre>
+      <pre>link:xsd:dpml/metro/dpml-type#1.0</pre>
 
       <subsection name="Description">
 
@@ -70,7 +70,7 @@
 
 <source><![CDATA[
 <?xml version="1.0"?>
-<type xmlns="link:xsd:dpml/lang/dpml-type#1.0">
+<type xmlns="link:xsd:dpml/metro/dpml-type#1.0">
 
   <info name="server"
       class="net.dpml.http.Server"
@@ -89,7 +89,7 @@
     <entry key="requestLog" class="org.mortbay.jetty.RequestLog" 
optional="true"/>
   </context>
   
-  <state xmlns="link:xsd:dpml/lang/dpml-state#1.0">
+  <state xmlns="link:xsd:dpml/metro/dpml-state#1.0">
     <trigger event="initialization">
       <transition name="init" target="started">
         <operation name="startup" method="start"/>

Modified: trunk/central/site/src/docs/metro/directives/type/services/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/directives/type/services/index.xml      
  2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/metro/directives/type/services/index.xml      
  2007-02-09 02:20:13 UTC (rev 1862)
@@ -50,10 +50,10 @@
 <source><![CDATA[
 <?xml version="1.0"?>
 
-<type xmlns="link:xsd:dpml/lang/dpml-type#1.0"
+<type xmlns="link:xsd:dpml/metro/dpml-type#1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xmlns:part="dpml:part"
-    xmlns:type="link:xsd:dpml/lang/dpml-type#1.0"
+    xmlns:type="link:xsd:dpml/metro/dpml-type#1.0"
     xmlns:component="dpml:metro">
 
   <info name="pool"

Modified: trunk/central/site/src/docs/metro/directives/type/state/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/directives/type/state/index.xml   
2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/central/site/src/docs/metro/directives/type/state/index.xml   
2007-02-09 02:20:13 UTC (rev 1862)
@@ -72,7 +72,7 @@
 <source><![CDATA[
 <?xml version="1.0"?>
 
-<type xmlns="link:xsd:dpml/lang/dpml-type#1.0">
+<type xmlns="link:xsd:dpml/metro/dpml-type#1.0">
 
   <info name="example"
       class="net.dpml.test.ExampleComponent"
@@ -89,7 +89,7 @@
     <entry key="color" class="java.awt.Color" optional="false"/>
   </context>
   
-  <state xmlns="link:xsd:dpml/lang/dpml-state#1.0">
+  <state xmlns="link:xsd:dpml/metro/dpml-state#1.0">
     <trigger event="initialization">
       <transition name="init" target="available"/>
     </trigger>

Modified: trunk/index.xml
===================================================================
--- trunk/index.xml     2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/index.xml     2007-02-09 02:20:13 UTC (rev 1862)
@@ -44,9 +44,8 @@
     
     <module file="util/module.xml"/>
     <module file="transit/module.xml"/>
-    <module file="lang/module.xml"/>
-    <module file="depot/module.xml"/>
     <module file="metro/module.xml"/>
+    <module file="depot/module.xml"/>
     
   </module>
     

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat    2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/bootstrap.bat    2007-02-09 02:20:13 UTC (rev 1862)
@@ -19,7 +19,7 @@
 rem IF ERRORLEVEL 1 GOTO :exit
 CALL :transit-main
 IF ERRORLEVEL 1 GOTO :exit
-CALL :depot-lang-part
+CALL :dpml-metro-part
 IF ERRORLEVEL 1 GOTO :exit
 CALL :dpml-depot-library
 IF ERRORLEVEL 1 GOTO :exit
@@ -56,34 +56,18 @@
 POPD
 GOTO :EOF
 
-rem :xml-setup
-rem CALL ant -f bootstrap.xml xml
-rem GOTO :EOF
-
-:depot-lang-part
-PUSHD lang\part
+:dpml-metro-part
+PUSHD metro\part
 CALL :build -f bootstrap.xml clean install
 POPD
 GOTO :EOF
 
-:depot-lang-part-rebuild
-PUSHD lang\part
-CALL :build clean install
-POPD
-GOTO :EOF
-
 :transit-main
 PUSHD transit\core
 CALL :build -f bootstrap.xml clean install
 POPD
 GOTO :EOF
 
-:dpml-transit-tools
-PUSHD transit\tools
-CALL :build -f bootstrap.xml clean install
-POPD
-GOTO :EOF
-
 :dpml-depot-library
 PUSHD depot\library
 CALL :build -f bootstrap.xml clean install
@@ -115,12 +99,6 @@
 POPD
 GOTO :EOF
 
-rem :depot-core
-rem PUSHD depot\core
-rem CALL :build -f bootstrap.xml clean install
-rem POPD
-rem GOTO :EOF
-
 :build
 
 @echo on

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml        2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/build.xml        2007-02-09 02:20:13 UTC (rev 1862)
@@ -182,7 +182,7 @@
   <target name="bin" depends="prepare">
     <x:property name="build.basedir" ref="dpml/depot/dpml-depot-build" 
feature="basedir"/>
     <x:property name="metro.basedir" ref="dpml/metro/dpml-metro-main" 
feature="basedir"/>
-    <x:property name="part.basedir" ref="dpml/lang/dpml-lang-part" 
feature="basedir"/>
+    <x:property name="part.basedir" ref="dpml/metro/dpml-metro-part" 
feature="basedir"/>
     <x:property name="station.basedir" ref="dpml/metro/dpml-metro-station" 
feature="basedir"/>
     <property name="share.bin" location="${share}/bin"/>
     <mkdir dir="${share.bin}"/>

Modified: trunk/main/depot/build/bootstrap.xml
===================================================================
--- trunk/main/depot/build/bootstrap.xml        2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/depot/build/bootstrap.xml        2007-02-09 02:20:13 UTC (rev 
1862)
@@ -18,7 +18,7 @@
   <target name="setup-path" depends="bootstrap.setup-path">
     <path id="project.main.path">
       <pathelement 
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-BOOTSTRAP.jar"/>
-      <pathelement 
location="${dpml.local.cache}/dpml/lang/jars/dpml-lang-part-BOOTSTRAP.jar"/>
+      <pathelement 
location="${dpml.local.cache}/dpml/metro/jars/dpml-metro-part-BOOTSTRAP.jar"/>
       <pathelement 
location="${dpml.local.cache}/dpml/depot/jars/dpml-depot-library-BOOTSTRAP.jar"/>
       <pathelement 
location="${dpml.local.cache}/dpml/util/jars/dpml-util-cli-BOOTSTRAP.jar"/>
       <pathelement location="${target.classes.dir}"/>

Modified: trunk/main/depot/build/etc/bin/build.lap
===================================================================
--- trunk/main/depot/build/etc/bin/build.lap    2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/depot/build/etc/bin/build.lap    2007-02-09 02:20:13 UTC (rev 
1862)
@@ -14,6 +14,6 @@
 -Djava.protocol.handler.pkgs=dpml.transit
 -Djava.rmi.server.RMIClassLoaderSpi=dpml.util.FederatingClassLoader
 -Dcom.sun.management.jmxremote
--Ddpml.class.path=link:jar:dpml/lang/dpml-lang-part
+-Ddpml.class.path=link:jar:dpml/metro/dpml-metro-part
 -Ddpml.transit.include.tools=true
 -Ddpml.depot.application=link:part:dpml/depot/dpml-depot-build

Modified: trunk/main/depot/build/etc/bootstrap/part.xml
===================================================================
--- trunk/main/depot/build/etc/bootstrap/part.xml       2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/depot/build/etc/bootstrap/part.xml       2007-02-09 02:20:13 
UTC (rev 1862)
@@ -13,7 +13,7 @@
   <classpath>
     <private>
       <uri>artifact:jar:dpml/transit/dpml-transit-main#BOOTSTRAP</uri>
-      <uri>artifact:jar:dpml/lang/dpml-lang-part#BOOTSTRAP</uri>
+      <uri>artifact:jar:dpml/metro/dpml-metro-part#BOOTSTRAP</uri>
       <uri>artifact:jar:dpml/depot/dpml-depot-library#BOOTSTRAP</uri>
       <uri>artifact:jar:dpml/util/dpml-util-cli#BOOTSTRAP</uri>
       <uri>artifact:jar:@PROJECT-GROUP@/@PROJECT-NAME@#BOOTSTRAP</uri>

Modified: trunk/main/depot/build/project.xml
===================================================================
--- trunk/main/depot/build/project.xml  2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/depot/build/project.xml  2007-02-09 02:20:13 UTC (rev 1862)
@@ -13,7 +13,7 @@
     
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
       <include ref="dpml/depot/dpml-depot-library"/>
       <include ref="dpml/util/dpml-util-cli"/>
     </runtime>

Modified: trunk/main/depot/library/bootstrap.xml
===================================================================
--- trunk/main/depot/library/bootstrap.xml      2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/depot/library/bootstrap.xml      2007-02-09 02:20:13 UTC (rev 
1862)
@@ -11,7 +11,7 @@
   <target name="setup-path" depends="bootstrap.setup-path">
     <path id="project.main.path">
       <pathelement 
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-BOOTSTRAP.jar"/>
-      <pathelement 
location="${dpml.local.cache}/dpml/lang/jars/dpml-lang-part-BOOTSTRAP.jar"/>
+      <pathelement 
location="${dpml.local.cache}/dpml/metro/jars/dpml-metro-part-BOOTSTRAP.jar"/>
       <pathelement location="${target.classes.dir}"/>
     </path>
     <path id="project.test.path">

Modified: trunk/main/depot/library/project.xml
===================================================================
--- trunk/main/depot/library/project.xml        2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/depot/library/project.xml        2007-02-09 02:20:13 UTC (rev 
1862)
@@ -12,7 +12,7 @@
     
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
     </runtime>
     <test>
       <include ref="org/apache/ant/ant-junit"/>

Modified: trunk/main/depot/tools/bootstrap.xml
===================================================================
--- trunk/main/depot/tools/bootstrap.xml        2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/depot/tools/bootstrap.xml        2007-02-09 02:20:13 UTC (rev 
1862)
@@ -29,7 +29,7 @@
   <target name="setup-path" depends="bootstrap.setup-path">
     <path id="project.main.path">
       <pathelement 
location="${dpml.local.cache}/dpml/transit/jars/dpml-transit-main-BOOTSTRAP.jar"/>
-      <pathelement 
location="${dpml.local.cache}/dpml/lang/jars/dpml-lang-part-BOOTSTRAP.jar"/>
+      <pathelement 
location="${dpml.local.cache}/dpml/metro/jars/dpml-metro-part-BOOTSTRAP.jar"/>
       <pathelement 
location="${dpml.local.cache}/dpml/depot/jars/dpml-depot-library-BOOTSTRAP.jar"/>
       <pathelement 
location="${dpml.local.cache}/dpml/depot/jars/dpml-depot-build-BOOTSTRAP.jar"/>
       <pathelement location="${target.classes.dir}"/>

Modified: trunk/main/depot/tools/etc/bootstrap/builder.xml
===================================================================
--- trunk/main/depot/tools/etc/bootstrap/builder.xml    2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/depot/tools/etc/bootstrap/builder.xml    2007-02-09 02:20:13 
UTC (rev 1862)
@@ -18,7 +18,7 @@
       <uri>artifact:jar:org/apache/ant/ant-trax#@ANT-VERSION@</uri>
       <uri>artifact:jar:org/apache/ant/ant-junit#@ANT-VERSION@</uri>
       <uri>artifact:jar:dpml/transit/dpml-transit-main#BOOTSTRAP</uri>
-      <uri>artifact:jar:dpml/lang/dpml-lang-part#BOOTSTRAP</uri>
+      <uri>artifact:jar:dpml/metro/dpml-metro-part#BOOTSTRAP</uri>
       <uri>artifact:jar:dpml/depot/dpml-depot-library#BOOTSTRAP</uri>
       <uri>artifact:jar:dpml/depot/dpml-depot-build#BOOTSTRAP</uri>
       <uri>artifact:jar:@PROJECT-GROUP@/@PROJECT-NAME@#BOOTSTRAP</uri>

Modified: trunk/main/depot/tools/project.xml
===================================================================
--- trunk/main/depot/tools/project.xml  2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/depot/tools/project.xml  2007-02-09 02:20:13 UTC (rev 1862)
@@ -13,7 +13,7 @@
   
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
       <include ref="dpml/depot/dpml-depot-library"/>
       <include ref="dpml/depot/dpml-depot-build"/>
       <include ref="org/apache/ant/ant"/>
@@ -25,8 +25,8 @@
   
   <filters>
     <filter token="PLUGIN-CLASS" value="dpml.tools.impl.StandardBuilder"/>
-    <feature token="PART-XSD-URI" id="uri" type="xsd" alias="true" 
ref="dpml/lang/dpml-lang-part" />
-    <feature token="PART-XSD-SPEC-URI" id="uri" type="xsd" alias="true" 
ref="dpml/lang/dpml-lang-part" />
+    <feature token="PART-XSD-URI" id="uri" type="xsd" alias="true" 
ref="dpml/metro/dpml-metro-part" />
+    <feature token="PART-XSD-SPEC-URI" id="uri" type="xsd" alias="true" 
ref="dpml/metro/dpml-metro-part" />
     <feature token="PROJECT-URI" id="uri" type="part"/>
     <feature token="PROJECT-LINK-URI" id="uri" type="part" alias="true"/>
     <feature token="PROJECT-NAME" id="name"/>

Modified: trunk/main/metro/appliance/etc/data/appliance.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/appliance.xml   2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/metro/appliance/etc/data/appliance.xml   2007-02-09 02:20:13 
UTC (rev 1862)
@@ -13,6 +13,6 @@
     </properties>
   </process>
   
-  <codebase 
uri="link:part:dpml/lang/dpml-lang-sample?message=Hello%20World,port=1024"/>
+  <codebase 
uri="link:part:dpml/metro/dpml-metro-sample?message=Hello%20World,port=1024"/>
 
 </appliance>

Modified: trunk/main/metro/appliance/etc/data/bar.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/bar.xml 2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/metro/appliance/etc/data/bar.xml 2007-02-09 02:20:13 UTC (rev 
1862)
@@ -13,6 +13,6 @@
     </properties>
   </process>
   
-  <codebase uri="link:part:dpml/lang/dpml-lang-sample?message=Bar"/>
+  <codebase uri="link:part:dpml/metro/dpml-metro-sample?message=Bar"/>
 
 </appliance>

Modified: trunk/main/metro/appliance/etc/data/foo.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/foo.xml 2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/metro/appliance/etc/data/foo.xml 2007-02-09 02:20:13 UTC (rev 
1862)
@@ -13,6 +13,6 @@
     </properties>
   </process>
   
-  <codebase uri="link:part:dpml/lang/dpml-lang-sample?message=Foo,port=7"/>
+  <codebase uri="link:part:dpml/metro/dpml-metro-sample?message=Foo,port=7"/>
 
 </appliance>

Modified: trunk/main/metro/appliance/etc/data/plan.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/plan.xml        2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/metro/appliance/etc/data/plan.xml        2007-02-09 02:20:13 
UTC (rev 1862)
@@ -4,6 +4,6 @@
 
   <entry key="foo" uri="link:appliance:dpml/metro/demo-foo"/>
   <entry key="bar" uri="link:appliance:dpml/metro/demo-bar"/>
-  <entry key="toto" 
uri="link:part:dpml/lang/dpml-lang-sample?message=Hello%20World,port=1024"/>
+  <entry key="toto" 
uri="link:part:dpml/metro/dpml-metro-sample?message=Hello%20World,port=1024"/>
   
 </plan>

Modified: trunk/main/metro/appliance/project.xml
===================================================================
--- trunk/main/metro/appliance/project.xml      2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/metro/appliance/project.xml      2007-02-09 02:20:13 UTC (rev 
1862)
@@ -23,10 +23,10 @@
   
   <dependencies>
     <build>
-      <include ref="dpml/lang/dpml-lang-sample"/>
+      <include ref="dpml/metro/dpml-metro-sample"/>
     </build>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
       <include ref="dpml/metro/dpml-metro-connector"/>
     </runtime>
     <test>

Modified: 
trunk/main/metro/appliance/src/test/net/dpml/appliance/ApplianceDescriptorTestCase.java
===================================================================
--- 
trunk/main/metro/appliance/src/test/net/dpml/appliance/ApplianceDescriptorTestCase.java
     2007-02-09 01:52:33 UTC (rev 1861)
+++ 
trunk/main/metro/appliance/src/test/net/dpml/appliance/ApplianceDescriptorTestCase.java
     2007-02-09 02:20:13 UTC (rev 1862)
@@ -44,7 +44,7 @@
         assertEquals( "path", null, path );
         assertEquals( "system", "bar", properties.getProperty( "foo" ) );
         assertEquals( "environment", "BAR", environment.get( "FOO" ) );
-        URI uri = new URI( 
"link:part:dpml/lang/dpml-lang-sample?message=Hello%20World,port=1024" );
+        URI uri = new URI( 
"link:part:dpml/metro/dpml-metro-sample?message=Hello%20World,port=1024" );
         URI target = application.getTargetURI();
         assertEquals( "uri", uri, target );
     }

Modified: trunk/main/metro/connector/project.xml
===================================================================
--- trunk/main/metro/connector/project.xml      2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/metro/connector/project.xml      2007-02-09 02:20:13 UTC (rev 
1862)
@@ -14,7 +14,7 @@
   
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
     </runtime>
   </dependencies>
   

Modified: trunk/main/metro/main/etc/bin/metro.lap
===================================================================
--- trunk/main/metro/main/etc/bin/metro.lap     2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/metro/main/etc/bin/metro.lap     2007-02-09 02:20:13 UTC (rev 
1862)
@@ -9,7 +9,7 @@
 -Djava.protocol.handler.pkgs=dpml.transit
 -Djava.rmi.server.RMIClassLoaderSpi=dpml.util.FederatingClassLoader
 -Dcom.sun.management.jmxremote
--Ddpml.class.path=link:jar:dpml/lang/dpml-lang-part
+-Ddpml.class.path=link:jar:dpml/metro/dpml-metro-part
 -Ddpml.depot.application=link:part:dpml/metro/dpml-metro-main
 -Ddpml.jmx.enabled=true
 janel.main.class=dpml.util.Main

Modified: trunk/main/metro/main/project.xml
===================================================================
--- trunk/main/metro/main/project.xml   2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/metro/main/project.xml   2007-02-09 02:20:13 UTC (rev 1862)
@@ -11,7 +11,7 @@
   
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
       <include ref="dpml/metro/dpml-metro-connector"/>
       <include ref="dpml/metro/dpml-metro-appliance"/>
       <include ref="dpml/util/dpml-util-cli"/>

Modified: trunk/main/metro/main/src/main/dpml/metro/console/Main.java
===================================================================
--- trunk/main/metro/main/src/main/dpml/metro/console/Main.java 2007-02-09 
01:52:33 UTC (rev 1861)
+++ trunk/main/metro/main/src/main/dpml/metro/console/Main.java 2007-02-09 
02:20:13 UTC (rev 1862)
@@ -133,13 +133,13 @@
     * An example commandline and resulting log of an application launch 
     * using <tt>metro</tt> is show below:
     * <pre>
-$ metro -command link:part:dpml/lang/dpml-lang-sample
+$ metro -command link:part:dpml/metro/dpml-metro-sample
 
 [2756 ] [INFO   ] (dpml.metro): commissioning hello
 [2756 ] [INFO   ] (hello): pid: [2756]
 [2756 ] [INFO   ] (hello): message: Hello
 [2756 ] [INFO   ] (hello): port: 0
-[2756 ] [INFO   ] (hello): target: 
artifact:jar:dpml/lang/dpml-lang-sample#SNAPSHOT
+[2756 ] [INFO   ] (hello): target: 
artifact:jar:dpml/metro/dpml-metro-sample#SNAPSHOT
 [2756 ] [INFO   ] (hello): starting
 [2756 ] [INFO   ] (hello): started
 [2756 ] [INFO   ] (dpml.metro): decommissioning hello

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/metro/module.xml 2007-02-09 02:20:13 UTC (rev 1862)
@@ -10,6 +10,8 @@
     </build>
   </dependencies>
 
+  <project file="part/project.xml"/>
+  <project file="sample/project.xml"/>
   <project file="appliance/project.xml"/>
   <project file="main/project.xml"/>
   <project file="connector/project.xml"/>

Copied: trunk/main/metro/part (from rev 1860, trunk/main/lang/part)

Modified: trunk/main/metro/part/bootstrap.xml
===================================================================
--- trunk/main/lang/part/bootstrap.xml  2007-02-09 01:32:02 UTC (rev 1860)
+++ trunk/main/metro/part/bootstrap.xml 2007-02-09 02:20:13 UTC (rev 1862)
@@ -18,10 +18,10 @@
   limitations under the License.
 -->
 
-<project name="dpml-lang-part" default="install" basedir=".">
+<project name="dpml-metro-part" default="install" basedir=".">
 
-  <property name="project.group" value="dpml/lang"/>
-  <property name="project.name" value="dpml-lang-part"/>
+  <property name="project.group" value="dpml/metro"/>
+  <property name="project.name" value="dpml-metro-part"/>
   
   <property file="${basedir}/bootstrap.properties"/>
   <property file="${home}/bootstrap.properties"/>
@@ -47,7 +47,7 @@
     <filter token="PROJECT-NAME" value="${project.name}"/>
     <filter token="PROJECT-GROUP" value="${project.group}"/>
     <filter token="PROJECT-VERSION" value="${project.version}"/>
-    <filter token="PART-XSD-SPEC-URI" 
value="link:xsd:${project.group}/dpml-lang-part"/>
+    <filter token="PART-XSD-SPEC-URI" 
value="link:xsd:${project.group}/dpml-metro-part"/>
     <filter token="COMPONENT-XSD-SPEC-URI" 
value="link:xsd:${project.group}/dpml-lang-component"/>
     <filter token="RESOURCE-NAMESPACE" 
value="link:xsd:${project.group}/dpml-lang-resource"/>
     <filter token="DEPOT-CLASSLOADER-CLASS" 
value="dpml.util.SystemClassLoader"/>
@@ -157,7 +157,7 @@
 
#----------------------------------------------------------------------------------
     </echo>
     <!--
-    <copy tofile="${user.home}/.ant/lib/dpml-lang-part.jar"
+    <copy tofile="${user.home}/.ant/lib/dpml-metro-part.jar"
       
file="${target.deliverables.jars.dir}/${project.name}-${project.version}.jar"/>
     -->
     <property name="lib" location="${dpml.system}/lib"/>

Modified: trunk/main/metro/part/build.xml
===================================================================
--- trunk/main/lang/part/build.xml      2007-02-09 01:32:02 UTC (rev 1860)
+++ trunk/main/metro/part/build.xml     2007-02-09 02:20:13 UTC (rev 1862)
@@ -15,7 +15,7 @@
     <copy file="${part.file}" toFile="${project.deliverable.xsd.path}" 
         preservelastmodified="true" overwrite="true"/>
     <checksum fileext=".md5" file="${project.deliverable.xsd.path}"/>
-    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/lang"/>
+    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/metro"/>
     <mkdir dir="${packaged.dir}"/>
     <copy file="${part.file}" toFile="${packaged.dir}/${project.name}.xsd" 
         preservelastmodified="true" overwrite="true"/>
@@ -28,7 +28,7 @@
     <copy file="${state.file}" 
toFile="${project.deliverable.xsd#dpml-lang-state.path}" 
         preservelastmodified="true" overwrite="true"/>
     <checksum fileext=".md5" 
file="${project.deliverable.xsd#dpml-lang-state.path}"/>
-    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/lang"/>
+    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/metro"/>
     <mkdir dir="${packaged.dir}"/>
     <copy file="${state.file}" toFile="${packaged.dir}/dpml-lang-state.xsd" 
         preservelastmodified="true" overwrite="true"/>
@@ -42,7 +42,7 @@
     <copy file="${component.file}" 
toFile="${project.deliverable.xsd#dpml-lang-component.path}" 
         preservelastmodified="true" overwrite="true"/>
     <checksum fileext=".md5" 
file="${project.deliverable.xsd#dpml-lang-component.path}"/>
-    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/lang"/>
+    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/metro"/>
     <mkdir dir="${packaged.dir}"/>
     <copy file="${component.file}" 
toFile="${packaged.dir}/dpml-lang-component.xsd" 
         preservelastmodified="true" overwrite="true"/>
@@ -56,7 +56,7 @@
     <copy file="${resource.file}" 
toFile="${project.deliverable.xsd#dpml-lang-resource.path}" 
         preservelastmodified="true" overwrite="true"/>
     <checksum fileext=".md5" 
file="${project.deliverable.xsd#dpml-lang-resource.path}"/>
-    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/lang"/>
+    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/metro"/>
     <mkdir dir="${packaged.dir}"/>
     <copy file="${resource.file}" 
toFile="${packaged.dir}/dpml-lang-resource.xsd" 
         preservelastmodified="true" overwrite="true"/>
@@ -70,7 +70,7 @@
     <copy file="${library.file}" 
toFile="${project.deliverable.xsd#dpml-lang-library.path}" 
         preservelastmodified="true" overwrite="true"/>
     <checksum fileext=".md5" 
file="${project.deliverable.xsd#dpml-lang-library.path}"/>
-    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/lang"/>
+    <property name="packaged.dir" 
location="${project.target.classes.main.dir}/dpml/metro"/>
     <mkdir dir="${packaged.dir}"/>
     <copy file="${library.file}" 
toFile="${packaged.dir}/dpml-lang-library.xsd" 
         preservelastmodified="true" overwrite="true"/>

Modified: trunk/main/metro/part/project.xml
===================================================================
--- trunk/main/lang/part/project.xml    2007-02-09 01:32:02 UTC (rev 1860)
+++ trunk/main/metro/part/project.xml   2007-02-09 02:20:13 UTC (rev 1862)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project xmlns="dpml:library" name="dpml-lang-part">
+<project xmlns="dpml:library" name="dpml-metro-part">
 
   <info title="DPML Part Content Handler">
     <description>Part content handler for the Transit system.</description>

Modified: 
trunk/main/metro/part/src/main/dpml/lang/StandardNamespaceResolver.java
===================================================================
--- trunk/main/lang/part/src/main/dpml/lang/StandardNamespaceResolver.java    
  2007-02-09 01:32:02 UTC (rev 1860)
+++ trunk/main/metro/part/src/main/dpml/lang/StandardNamespaceResolver.java   
  2007-02-09 02:20:13 UTC (rev 1862)
@@ -92,23 +92,23 @@
         ClassLoader classloader = getClass().getClassLoader();
         if( "dpml:part".equals( namespace ) )
         {
-            return classloader.getResource( "dpml/lang/dpml-lang-part.xsd" );
+            return classloader.getResource( "dpml/metro/dpml-metro-part.xsd" 
);
         }
         else if( "dpml:metro".equals( namespace ) )
         {
-            return classloader.getResource( 
"dpml/lang/dpml-lang-component.xsd" );
+            return classloader.getResource( 
"dpml/metro/dpml-lang-component.xsd" );
         }
         else if( "dpml:state".equals( namespace ) )
         {
-            return classloader.getResource( "dpml/lang/dpml-lang-state.xsd" 
);
+            return classloader.getResource( "dpml/metro/dpml-lang-state.xsd" 
);
         }
         else if( "dpml:antlib".equals( namespace ) )
         {
-            return classloader.getResource( 
"dpml/lang/dpml-lang-resource.xsd" );
+            return classloader.getResource( 
"dpml/metro/dpml-lang-resource.xsd" );
         }
         else if( "dpml:library".equals( namespace ) )
         {
-            return classloader.getResource( 
"dpml/lang/dpml-lang-library.xsd" );
+            return classloader.getResource( 
"dpml/metro/dpml-lang-library.xsd" );
         }
         else
         {

Modified: trunk/main/metro/part/src/main/net/dpml/annotation/Component.java
===================================================================
--- trunk/main/lang/part/src/main/net/dpml/annotation/Component.java    
2007-02-09 01:32:02 UTC (rev 1860)
+++ trunk/main/metro/part/src/main/net/dpml/annotation/Component.java   
2007-02-09 02:20:13 UTC (rev 1862)
@@ -36,6 +36,6 @@
     LifestylePolicy lifestyle() default LifestylePolicy.THREAD;
     CollectionPolicy collection() default CollectionPolicy.HARD;
     String lifecycle() default "";
-    String handlerURI() default "link:part:dpml/lang/dpml-lang-component";
+    String handlerURI() default "link:part:dpml/metro/dpml-lang-component";
     String handlerClassname() default 
"net.dpml.runtime.ComponentStrategyHandler";
 }

Copied: trunk/main/metro/sample (from rev 1860, trunk/main/lang/sample)


Property changes on: trunk/main/metro/sample
___________________________________________________________________
Name: svn:ignore
   + target


Modified: trunk/main/metro/sample/project.xml
===================================================================
--- trunk/main/lang/sample/project.xml  2007-02-09 01:32:02 UTC (rev 1860)
+++ trunk/main/metro/sample/project.xml 2007-02-09 02:20:13 UTC (rev 1862)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project xmlns="dpml:library" name="dpml-lang-sample">
+<project xmlns="dpml:library" name="dpml-metro-sample">
 
   <info title="DPML Component Example"/>
   
@@ -11,7 +11,7 @@
   
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
     </runtime>
   </dependencies>
   

Modified: trunk/main/metro/station/etc/bin/station.lap
===================================================================
--- trunk/main/metro/station/etc/bin/station.lap        2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/metro/station/etc/bin/station.lap        2007-02-09 02:20:13 
UTC (rev 1862)
@@ -9,7 +9,7 @@
 -Djava.protocol.handler.pkgs=dpml.transit
 -Djava.rmi.server.RMIClassLoaderSpi=dpml.util.FederatingClassLoader
 -Dcom.sun.management.jmxremote
--Ddpml.class.path=link:jar:dpml/lang/dpml-lang-part
+-Ddpml.class.path=link:jar:dpml/metro/dpml-metro-part
 -Ddpml.depot.application=link:part:dpml/metro/dpml-metro-station
 -Ddpml.jmx.enabled=true
 janel.main.class=dpml.util.Main

Modified: trunk/main/metro/station/project.xml
===================================================================
--- trunk/main/metro/station/project.xml        2007-02-09 01:52:33 UTC (rev 
1861)
+++ trunk/main/metro/station/project.xml        2007-02-09 02:20:13 UTC (rev 
1862)
@@ -11,7 +11,7 @@
   
   <dependencies>
     <runtime>
-      <include ref="dpml/lang/dpml-lang-part"/>
+      <include ref="dpml/metro/dpml-metro-part"/>
       <include ref="dpml/metro/dpml-metro-connector"/>
       <include ref="dpml/metro/dpml-metro-appliance"/>
       <include ref="dpml/util/dpml-util-cli"/>

Modified: trunk/main/metro/station/src/main/dpml/station/console/Main.java
===================================================================
--- trunk/main/metro/station/src/main/dpml/station/console/Main.java    
2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/main/metro/station/src/main/dpml/station/console/Main.java    
2007-02-09 02:20:13 UTC (rev 1862)
@@ -157,13 +157,13 @@
     * An example commandline and resulting log of an application launch 
     * using <tt>metro</tt> is show below:
     * <pre>
-$ metro -command link:part:dpml/lang/dpml-lang-sample
+$ metro -command link:part:dpml/metro/dpml-metro-sample
 
 [2756 ] [INFO   ] (dpml.metro): commissioning hello
 [2756 ] [INFO   ] (hello): pid: [2756]
 [2756 ] [INFO   ] (hello): message: Hello
 [2756 ] [INFO   ] (hello): port: 0
-[2756 ] [INFO   ] (hello): target: 
artifact:jar:dpml/lang/dpml-lang-sample#SNAPSHOT
+[2756 ] [INFO   ] (hello): target: 
artifact:jar:dpml/metro/dpml-metro-sample#SNAPSHOT
 [2756 ] [INFO   ] (hello): starting
 [2756 ] [INFO   ] (hello): started
 [2756 ] [INFO   ] (dpml.metro): decommissioning hello

Modified: trunk/main/metro/test/etc/data/application.xml
===================================================================
--- trunk/main/metro/test/etc/data/application.xml      2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/metro/test/etc/data/application.xml      2007-02-09 02:20:13 
UTC (rev 1862)
@@ -13,6 +13,6 @@
     </properties>
   </process>
   
-  <codebase 
uri="link:part:dpml/lang/dpml-lang-sample?message=Hello%20World,port=1024"/>
+  <codebase 
uri="link:part:dpml/metro/dpml-metro-sample?message=Hello%20World,port=1024"/>
 
 </application>

Modified: trunk/main/metro/test/etc/data/test.properties
===================================================================
--- trunk/main/metro/test/etc/data/test.properties      2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/main/metro/test/etc/data/test.properties      2007-02-09 02:20:13 
UTC (rev 1862)
@@ -3,4 +3,4 @@
 java.system.class.loader=dpml.util.SystemClassLoader
 java.protocol.handler.pkgs=dpml.transit
 java.rmi.server.RMIClassLoaderSpi=dpml.util.FederatingClassLoader
-dpml.class.path=link:jar:dpml/lang/dpml-lang-part
+dpml.class.path=link:jar:dpml/metro/dpml-metro-part

Modified: trunk/tutorials/module.xml
===================================================================
--- trunk/tutorials/module.xml  2007-02-09 01:52:33 UTC (rev 1861)
+++ trunk/tutorials/module.xml  2007-02-09 02:20:13 UTC (rev 1862)
@@ -37,7 +37,7 @@
       <dependencies>
         <test>
           <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
         </test>
       </dependencies>
     </project>
@@ -55,7 +55,7 @@
         </build>
         <test>
           <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
         </test>
       </dependencies>
     </project>
@@ -73,7 +73,7 @@
       </build>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -89,7 +89,7 @@
       </build>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -105,7 +105,7 @@
       </build>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -120,7 +120,7 @@
         <include key="acme-lookup-demo"/>
       </build>
       <runtime>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </runtime>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
@@ -138,7 +138,7 @@
         <include key="acme-lifestyle-demo"/>
       </build>
       <runtime>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </runtime>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
@@ -156,7 +156,7 @@
         <include key="acme-transient-demo"/>
       </build>
       <runtime>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </runtime>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
@@ -174,7 +174,7 @@
         <include key="acme-thread-demo"/>
       </build>
       <runtime>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </runtime>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
@@ -193,7 +193,7 @@
         <include key="acme-singleton-demo"/>
       </build>
       <test>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
         <include ref="org/apache/ant/ant-junit"/>
       </test>
     </dependencies>
@@ -212,7 +212,7 @@
         <include uri="artifact:jar:dpml/util/dpml-logging-api#1.0.0"/>
       </runtime>
       <test>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
         <include ref="org/apache/ant/ant-junit"/>
       </test>
     </dependencies>
@@ -230,7 +230,7 @@
       </build>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -251,7 +251,7 @@
       </build>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -276,7 +276,7 @@
       </runtime>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -298,7 +298,7 @@
       <test>
         <include ref="org/apache/ant/ant-junit"/>
         <include key="acme-simple-clock"/>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </test>
     </dependencies>
   </project>
@@ -327,7 +327,7 @@
     <dependencies>
       <runtime>
         <include key="acme-clock-api"/>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
         </runtime>
     </dependencies>
   </project>
@@ -353,7 +353,7 @@
       <runtime>
         <include key="acme-clock-api"/>
         <include ref="dpml/util/dpml-logging-api"/>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
       </runtime>
       <test>
         <include ref="org/apache/ant/ant-junit"/>
@@ -364,7 +364,7 @@
   <project name="acme-clock-test" basedir="import/test">
     <dependencies>
       <test>
-        <include ref="dpml/lang/dpml-lang-part"/>
+        <include ref="dpml/metro/dpml-metro-part"/>
         <include ref="org/apache/ant/ant-junit"/>
       </test>
     </dependencies>

Modified: trunk/tutorials/tooling/complex/plugin/index.xml
===================================================================
--- trunk/tutorials/tooling/complex/plugin/index.xml    2007-02-09 01:52:33 
UTC (rev 1861)
+++ trunk/tutorials/tooling/complex/plugin/index.xml    2007-02-09 02:20:13 
UTC (rev 1862)
@@ -22,7 +22,7 @@
       <dependencies>
         <runtime>
           <include key="clock-api"/>
-          <include ref="dpml/lang/dpml-lang-part"/>
+          <include ref="dpml/metro/dpml-metro-part"/>
         </runtime>
         <test>
           <include ref="org/apache/ant/ant-junit"/>