DPML Notify

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

Author: mcconnell
Date: 2006-03-14 17:12:43 +0100 (Tue, 14 Mar 2006)
New Revision: 1176

Modified:
   trunk/main/central/build.xml
   trunk/main/central/src/docs/depot/library/modules.xml
Log:
synchronize central

Modified: trunk/main/central/build.xml
===================================================================
--- trunk/main/central/build.xml        2006-03-14 16:12:09 UTC (rev 1175)
+++ trunk/main/central/build.xml        2006-03-14 16:12:43 UTC (rev 1176)
@@ -10,15 +10,15 @@
     <x:filter token="VERSION" feature="version"/>
     <x:filter token="ANT-JAR-VERSION" ref="ant/ant" feature="version"/>
     <x:filter token="ANT-JAR-URI" ref="ant/ant" feature="uri" type="jar" />
-    <x:filter token="TRANSIT-TOOLS-URI" 
ref="dpml/transit/dpml-transit-tools" feature="uri" type="plugin" />
+    <x:filter token="TRANSIT-TOOLS-URI" 
ref="dpml/transit/dpml-transit-tools" feature="uri" type="jar" />
     <x:filter token="TRANSIT-MODULE-VERSION" ref="dpml/transit" 
feature="version"/>
     <x:filter token="TRANSIT-HANDLER-URI" 
ref="dpml/transit/dpml-transit-main" feature="uri" type="jar" />
     <x:filter token="DEPOT-MODULE-VERSION" feature="version" 
ref="dpml/depot" />
     <x:filter token="DEPOT-CONSOLE-URI" feature="uri" type="jar" 
ref="dpml/depot/dpml-depot-console" />
-    <x:filter token="DEPOT-TOOLS-ANT-URI" feature="uri" type="plugin" 
ref="dpml/depot/dpml-tools-builder" />
-    <x:filter token="DEPOT-TOOLS-LIBRARY-URI" feature="uri" type="plugin" 
ref="dpml/depot/dpml-library-main" />
-    <x:filter token="METRO-RUNTIME-URI" feature="uri" type="plugin" 
ref="dpml/metro/dpml-metro-runtime" />
-    <x:filter token="METRO-TOOLS-URI" feature="uri" type="plugin" 
ref="dpml/metro/dpml-metro-tools" />
+    <x:filter token="DEPOT-TOOLS-ANT-URI" feature="uri" type="part" 
ref="dpml/depot/dpml-tools-builder" />
+    <x:filter token="DEPOT-TOOLS-LIBRARY-URI" feature="uri" type="jar" 
ref="dpml/depot/dpml-library" />
+    <x:filter token="METRO-RUNTIME-URI" feature="uri" type="part" 
ref="dpml/metro/dpml-metro-runtime" />
+    <x:filter token="METRO-TOOLS-URI" feature="uri" type="part" 
ref="dpml/metro/dpml-metro-tools" />
     <x:filter token="UTIL-ACTIVITY-URI" feature="uri" type="jar" 
ref="dpml/util/dpml-activity-api" />
     <x:filter token="UTIL-CLI-URI" feature="uri" type="jar" 
ref="dpml/util/dpml-util-cli" />
     <x:filter token="UTIL-CONFIGURATION-API-URI" feature="uri" type="jar" 
ref="dpml/util/dpml-configuration-api" />

Modified: trunk/main/central/src/docs/depot/library/modules.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/modules.xml       2006-03-14 
16:12:09 UTC (rev 1175)
+++ trunk/main/central/src/docs/depot/library/modules.xml       2006-03-14 
16:12:43 UTC (rev 1176)
@@ -221,7 +221,7 @@
 
 <module name="depot">
    
-  <project name="dpml-library-console" basedir="library/console">
+  <project name="dpml-library-build" basedir="library/console">
     <types>
       <type id="jar"/>
       <type id="plugin" alias="true">
@@ -232,7 +232,7 @@
     <dependencies>
       <include ref="dpml/util/dpml-util-cli"/>
       <include ref="dpml/transit/dpml-transit-main"/>
-      <include ref="dpml/depot/dpml-library-main"/>
+      <include ref="dpml/depot/dpml-library"/>
     </dependencies>
     <dependencies scope="test">
       <include ref="ant/ant-junit"/>
@@ -294,36 +294,6 @@
     </dependencies>
   </project>
 
-  <!--
-  <project name="dpml-depot-install" basedir="core/install">
-    <types>
-      <type id="jar"/>
-      <type id="plugin">
-        <property name="project.plugin.class" 
-           value="net.dpml.depot.install.PackageInstaller"/>
-      </type>
-    </types>
-    <dependencies>
-      <include key="dpml-depot-console"/>
-      <include ref="dpml/transit/dpml-transit-main"/>
-      <include key="dpml-station-api"/>
-      <include key="dpml-station-server"/>
-    </dependencies>
-  </project>
-  -->
-
-  <resource name="dpml-library-main" basedir="library/common">
-    <types>
-      <type id="jar"/>
-    </types>
-    <dependencies>
-      <include ref="dpml/transit/dpml-transit-main"/>
-    </dependencies>
-    <dependencies scope="test">
-      <include ref="ant/ant-junit"/>
-    </dependencies>
-  </resource>
-
   <resource name="dpml-tools-builder" basedir="tools/builder">
     <types>
       <type id="jar"/>
@@ -333,7 +303,7 @@
       </type>
     </types>
     <dependencies>
-      <include key="dpml-library-main"/>
+      <include ref="dpml/depot/dpml-library"/>
       <include ref="dpml/transit/dpml-transit-tools"/>
       <include ref="ant/ant-junit" tag="system"/>
       <include ref="ant/ant" tag="system"/>