Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1754 - in development/main: home home/transit/etc magic metro

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1754 - in development/main: home home/transit/etc magic metro
  • Date: Tue, 08 Feb 2005 07:25:14 +0100

Author: mcconnell
Date: Tue Feb 8 07:25:13 2005
New Revision: 1754

Modified:
development/main/home/build.properties
development/main/home/build.xml
development/main/home/transit/etc/project.module
development/main/magic/index.xml
development/main/metro/index.xml
Log:
Remove the module dependency between metro and magic. Based on this commit
the metro module is not magicv indepednent. To do this I moved two resources
out of the magic module and into the transit module - junit and ant-junit
respectively. In the future we should look at creating a separate ant module.

Modified: development/main/home/build.properties
==============================================================================
--- development/main/home/build.properties (original)
+++ development/main/home/build.properties Tue Feb 8 07:25:13 2005
@@ -4,4 +4,6 @@
project.group = dpml/home
dpml.repository = http://repository.dpml.net/classic
junit.filename = junit-3.8.1.jar
-
+junit.uri = artifact:jar:junit/junit#3.8.1
+ant.junit.filename = ant-junit-1.6.2.jar
+ant.junit.uri = artifact:jar:ant/ant-junit#1.6.2

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Tue Feb 8 07:25:13 2005
@@ -104,7 +104,7 @@
</exec>
</target>

- <target name="bundle" depends="init,install.children">
+ <target name="bundle"
depends="init,install.children,install.junit,install.ant.junit">
<delete dir="${basedir}/target/bundle"/>
<mkdir dir="${bundle}/cache"/>
<!-- create the transit configuration directory -->
@@ -122,12 +122,22 @@
<copy todir="${local}/${commons-cli.parent}">
<fileset dir="${dpml.cache}/${commons-cli.parent}"/>
</copy>
+
<mkdir dir="${local}/${transit-ant.parent}"/>
<copy todir="${local}/${transit-ant.parent}">
<fileset dir="${dpml.cache}/${transit-ant.parent}">
<include name="${transit-ant.filename}"/>
+ <include name="${ant.junit.filename}"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${local}/junit/jars"/>
+ <copy todir="${local}/junit/jars">
+ <fileset dir="${dpml.cache}/junit/jars">
+ <include name="${junit.filename}"/>
</fileset>
</copy>
+
<copy todir="${local}/dpml/util">
<fileset dir="${basedir}/util/target/deliverables"/>
<fileset dir="${basedir}/util/cli/target/deliverables"/>
@@ -176,6 +186,33 @@
<copy tofile="${templates}/standard.template"
file="${basedir}/standard.xml"/>
</target>

+ <target name="transit.setup" depends="init">
+ <taskdef uri="antlib:net.dpml.transit"
resource="net/dpml/transit/antlib.xml">
+ <classpath>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/dpml-transit-main-${project.version}.jar"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/dpml-transit-tools-${project.version}.jar"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="install.junit.check" depends="init">
+ <available property="junit.available"
file="${dpml.cache}/junit/jars/${junit.filename}"/>
+ </target>
+
+ <target name="install.junit" depends="install.junit.check,transit.setup"
unless="junit.available">
+ <get xmlns="antlib:net.dpml.transit" property="junit.path"
+ uri="${junit.uri}"/>
+ </target>
+
+ <target name="install.ant.junit.check" depends="init">
+ <available property="ant.junit.available"
file="${dpml.cache}/ant/jars/${ant.junit.filename}"/>
+ </target>
+
+ <target name="install.ant.junit"
depends="install.ant.junit.check,transit.setup">
+ <get xmlns="antlib:net.dpml.transit" property="ant-junit.path"
+ uri="${ant.junit.uri}"/>
+ </target>
+
<target name="install.children">
<ant dir="transit/handler" inheritall="false"/>
<ant dir="transit/tools" inheritall="false"/>

Modified: development/main/home/transit/etc/project.module
==============================================================================
--- development/main/home/transit/etc/project.module (original)
+++ development/main/home/transit/etc/project.module Tue Feb 8 07:25:13
2005
@@ -65,6 +65,15 @@
</dependencies>
</resource>

+ <resource>
+ <info>
+ <group>junit</group>
+ <name>junit</name>
+ <version>3.8.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
<resource key="ant">
<info>
<group>ant</group>
@@ -74,6 +83,19 @@
</info>
</resource>

+ <resource>
+ <info>
+ <group>ant</group>
+ <name>ant-junit</name>
+ <version>1.6.2</version>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="junit" />
+ <include key="ant" />
+ </dependencies>
+ </resource>
+
</resources>

</module>

Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml (original)
+++ development/main/magic/index.xml Tue Feb 8 07:25:13 2005
@@ -285,27 +285,5 @@
</dependencies>
</resource>

- <resource>
- <info>
- <group>ant</group>
- <name>ant-junit</name>
- <version>1.6.2</version>
- <type>jar</type>
- </info>
- <dependencies>
- <include key="junit" />
- <include key="ant" />
- </dependencies>
- </resource>
-
- <resource>
- <info>
- <group>junit</group>
- <name>junit</name>
- <version>3.8.1</version>
- <type>jar</type>
- </info>
- </resource>
-

</index>

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Tue Feb 8 07:25:13 2005
@@ -2,7 +2,7 @@

<index key="dpml-metro">

- <import index="../magic/index.xml"/>
+ <import uri="artifact:module:dpml/transit/dpml-transit#SNAPSHOT"/>

<!--
Metro Modules
@@ -17,7 +17,6 @@
<type>module</type>
</info>
<dependencies>
- <include key="dpml-magic"/>
<include key="dpml-transit"/>
<include key="dpml-util"/>
</dependencies>



  • svn commit: r1754 - in development/main: home home/transit/etc magic metro, mcconnell, 02/08/2005

Archive powered by MHonArc 2.6.24.

Top of Page