DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Tue Feb  1 10:51:15 2005
New Revision: 1681

Added:
   development/main/home/transit/etc/project.module
Removed:
   development/main/home/transit/etc/deliverables/
   development/main/home/util/index.xml
   development/main/home/util/module.xml
Modified:
   development/main/home/build.xml
   development/main/home/standard.xml
   development/main/home/transit/build.xml
   development/main/home/util/cli/build.xml
Log:
housekeeping

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml     (original)
+++ development/main/home/build.xml     Tue Feb  1 10:51:15 2005
@@ -24,7 +24,7 @@
   <property file="build.properties"/>
   <import file="${transit.home}/standard.xml"/>
 
-  <target name="bundle">
+  <target name="bundle" depends="init">
     <property name="work" value="${basedir}/target/bundle"/>
     <delete dir="${work}"/>
     <mkdir dir="${work}"/>
@@ -38,14 +38,17 @@
     <!-- include the util package -->
     <property name="local" value="${work}/local/${project.version}"/>
     <echo>Creating local repository ${local}</echo>
-    <mkdir dir="${local}"/>
-    <copy todir="${local}">
+    <mkdir dir="${local}/dpml/util"/>
+    <copy todir="${local}/dpml/util">
       <fileset dir="${basedir}/util/target/deliverables"/>
       <fileset dir="${basedir}/util/cli/target/deliverables"/>
       <fileset dir="${basedir}/util/exception/target/deliverables"/>
       <fileset dir="${basedir}/util/criteria/target/deliverables"/>
       <fileset dir="${basedir}/util/i18n/target/deliverables"/>
       <fileset dir="${basedir}/util/cli/target/deliverables"/>
+    </copy>
+    <mkdir dir="${local}/dpml/transit"/>
+    <copy todir="${local}/dpml/transit">
       <fileset dir="${basedir}/transit/target/deliverables"/>
       <fileset dir="${basedir}/transit/handler/target/deliverables"/>
       <fileset dir="${basedir}/transit/tools/target/deliverables"/>

Modified: development/main/home/standard.xml
==============================================================================
--- development/main/home/standard.xml  (original)
+++ development/main/home/standard.xml  Tue Feb  1 10:51:15 2005
@@ -80,6 +80,9 @@
 # ${project.group}/${project.name}#${project.version}
 
#----------------------------------------------------------------------------------
     </echo>
+  </target>
+
+  <target name="setup-path">
     <path id="project.main.path">
       <pathelement location="${target.classes.dir}"/>
     </path>
@@ -208,7 +211,7 @@
     <available file="${target.build.main.dir}" 
property="build.main.available"/>
   </target>
 
-  <target name="build" depends="build.setup" if="build.main.available">
+  <target name="build" depends="build.setup,setup-path" 
if="build.main.available">
     <!--
     Compile sources in target/build/main with oputput classes under 
target/classes.
     -->
@@ -221,7 +224,7 @@
     <available file="${target.classes.dir}" 
property="target.classes.available"/>
   </target>
 
-  <target name="package" depends="package.setup" 
if="target.classes.available">
+  <target name="package" depends="build,package.setup" 
if="target.classes.available">
     <!--
     Create the jar file using the contents of target/classes.
     -->

Modified: development/main/home/transit/build.xml
==============================================================================
--- development/main/home/transit/build.xml     (original)
+++ development/main/home/transit/build.xml     Tue Feb  1 10:51:15 2005
@@ -29,8 +29,9 @@
   </target>
 
   <target name="package" depends="standard.package">
-    <move file="${basedir}/target/deliverables/modules/project.module"
-      
tofile="${basedir}/target/deliverables/modules/${project.name)-${project.version}.module"/>
+    <mkdir dir="${basedir}/target/deliverables/modules"/>
+    <move file="${basedir}/target/project.module"
+      
tofile="${basedir}/target/deliverables/modules/dpml-transit-${project.version}.module"/>
   </target>
 
 </project>

Added: development/main/home/transit/etc/project.module
==============================================================================
--- (empty file)
+++ development/main/home/transit/etc/project.module    Tue Feb  1 10:51:15 
2005
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<module uri="artifact:module:dpml/transit/dpml-transit#@PROJECT-VERSION@">
+
+  <header>
+    <publisher name="The Digital Product Meta Library"/>
+    <packages>
+      <package name="net.dpml.transit"/>
+      <package name="net.dpml.transit.*"/>
+    </packages>
+    <home href="http://www.dpml.net/products/transit"/>
+    <docs href="http://www.dpml.net"/>
+    <legal>
+      <license href="http://www.dpml.net/central/about/legal/license.html"/>
+      <notice href="http://www.dpml.net/central/about/legal/notice.html"/>
+    </legal>
+    <svn href="http://paris.dpml.net/svn/main/transit"/>
+    <repository href="http://www.dpml.net"/>
+  </header>
+
+  <resources>
+
+    <!-- imports -->
+
+    <import uri="artifact:module:dpml/util/dpml-util#@PROJECT-VERSION@"/>
+
+    <!-- module resources -->
+
+    <resource key="dpml-transit-main">
+      <info>
+        <group>dpml/transit</group>
+        <name>dpml-transit-main</name>
+        <version>@PROJECT-VERSION@</version>
+        <type>jar</type>
+      </info>
+    </resource>
+
+    <resource key="dpml-transit-plugin">
+      <info>
+        <group>dpml/transit</group>
+        <name>dpml-transit-plugin</name>
+        <version>@PROJECT-VERSION@</version>
+        <type>jar</type>
+      </info>
+      <dependencies>
+        <include key="dpml-transit-main"/>
+        <include key="dpml-util-criteria"/>
+        <include key="dpml-util-i18n"/>
+        <include key="dpml-util-exception"/>
+        <include key="dpml-util-cli"/>
+        <include key="commons-cli"/>
+      </dependencies>
+    </resource>
+
+  </resources>
+
+</module>
+

Modified: development/main/home/util/cli/build.xml
==============================================================================
--- development/main/home/util/cli/build.xml    (original)
+++ development/main/home/util/cli/build.xml    Tue Feb  1 10:51:15 2005
@@ -23,9 +23,12 @@
   <property file="build.properties"/>
   <import file="${transit.home}/standard.xml"/>
 
-  <target name="init" depends="standard.init,commons-cli-install">
+  <target name="init" depends="standard.init,commons-cli-install"/>
+
+  <target name="setup-path" depends="init">
     <path id="project.main.path">
       <pathelement location="${cli.cache}"/>
+      <pathelement 
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
       <pathelement location="${target.classes.dir}"/>
     </path>
   </target>