DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sat Dec 11 23:13:45 2004
New Revision: 1162

Modified:
   development/main/bootstrap.xml
   development/main/magic/bootstrap/build.properties
   development/main/magic/bootstrap/build.xml
   development/main/magic/core/build.properties
   development/main/magic/core/build.xml
   development/main/setup.xml
   development/main/transit/handler/build.properties
Log:
housekeeping

Modified: development/main/bootstrap.xml
==============================================================================
--- development/main/bootstrap.xml      (original)
+++ development/main/bootstrap.xml      Sat Dec 11 23:13:45 2004
@@ -24,6 +24,8 @@
 
   <property file="build.properties"/>
 
+  <available classname="junit.framework.TestCase" 
property="junit.available"/>
+
   <condition property="dpml.env.declared" value="false">
     <isset property="ENV.DPML_HOME"/>
   </condition>
@@ -179,14 +181,18 @@
     <mkdir dir="${target.test-classes.dir}"/>
     <javac srcdir="${target.build.test.dir}" 
            destdir="${target.test-classes.dir}" 
-           classpath="${target.classes.dir}" 
-           debug="true"/> 
+           debug="true">
+      <classpath>
+        <pathelement location="${target.classes.dir}"/>
+        <pathelement 
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
+      </classpath>
+    </javac> 
   </target>
   
   <!--
   Execute any unit test.
   -->
-  <target name="test" depends="build-tests" >
+  <target name="test" depends="build-tests" if="junit.available">
     <mkdir dir="${target.test-reports.dir}"/>
     <junit printsummary="yes" haltonfailure="yes" showoutput="true" 
            dir="${basedir}" fork="true" forkmode="perBatch"
@@ -196,6 +202,7 @@
       <classpath>
         <pathelement location="${target.classes.dir}"/>
         <pathelement location="${target.test-classes.dir}"/>
+        <pathelement 
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
       </classpath>
       <formatter type="plain"/>
       <formatter type="xml"/>

Modified: development/main/magic/bootstrap/build.properties
==============================================================================
--- development/main/magic/bootstrap/build.properties   (original)
+++ development/main/magic/bootstrap/build.properties   Sat Dec 11 23:13:45 
2004
@@ -9,3 +9,4 @@
 dpml-transit-handler.filename = dpml-transit-main-SNAPSHOT.jar
 
 
+junit-filename = junit-3.8.1.jar

Modified: development/main/magic/bootstrap/build.xml
==============================================================================
--- development/main/magic/bootstrap/build.xml  (original)
+++ development/main/magic/bootstrap/build.xml  Sat Dec 11 23:13:45 2004
@@ -41,7 +41,7 @@
       <classpath>
         <pathelement location="target/classes"/>
         <pathelement location="target/test-classes"/>
-        <pathelement location="${user.home}/.ant/lib/dpml-transit-main.jar"/>
+        <pathelement 
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
       </classpath>
       <formatter type="plain"/>
       <batchtest fork="yes" todir="target/test-reports">
@@ -60,21 +60,3 @@
   </target>
 
 </project>
-
-<!--
-<project name="dpml-transit-task" default="install" basedir="."
-xmlns:transit="antlib:net.dpml.transit"
-xmlns:x="antlib:net.dpml.magic" >
-
-<transit:init/>
-<import file="${dpml.templates}/standard.xml"/>
-
-<target name="update" depends="install">
-<mkdir dir="${user.home}/.ant/lib"/>
-<copy toDir="${user.home}/.ant/lib">
-<fileset dir="${basedir}/target/deliverables/jars"/>
-</copy>
-</target>
-
-</project>
--->
\ No newline at end of file

Modified: development/main/magic/core/build.properties
==============================================================================
--- development/main/magic/core/build.properties        (original)
+++ development/main/magic/core/build.properties        Sat Dec 11 23:13:45 
2004
@@ -11,4 +11,4 @@
 
 dpml-transit-handler.filename = dpml-transit-main-SNAPSHOT.jar
 dpml-magic-bootstrap.filename = dpml-magic-bootstrap-SNAPSHOT.jar
-junit.filename = junit-3.8.1.jar
+junit-filename = junit-3.8.1.jar

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml       (original)
+++ development/main/magic/core/build.xml       Sat Dec 11 23:13:45 2004
@@ -26,9 +26,10 @@
         <pathelement 
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
         <pathelement 
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
       </classpath>
-    </javac> 
+    </javac>
     <taskdef name="export" classname="net.dpml.magic.tasks.ExportTask">
       <classpath>
+        <pathelement 
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
         <pathelement 
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
         <pathelement 
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
         <pathelement location="target/classes"/>
@@ -57,6 +58,7 @@
            destdir="target/test-classes" 
            debug="true">
       <classpath>
+        <pathelement 
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
         <pathelement 
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
         <pathelement 
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
         <pathelement location="target/classes"/>

Modified: development/main/setup.xml
==============================================================================
--- development/main/setup.xml  (original)
+++ development/main/setup.xml  Sat Dec 11 23:13:45 2004
@@ -85,11 +85,15 @@
   </target>
 
   <target name="setup" depends="init,junit-install">
-
     <ant dir="transit/handler"/>
     <ant dir="magic/bootstrap"/>
     <ant dir="magic/core"/>
+  </target>
 
+  <target name="clean">
+    <ant dir="transit/handler" target="clean"/>
+    <ant dir="magic/bootstrap" target="clean"/>
+    <ant dir="magic/core" target="clean"/>
   </target>
 
 </project>

Modified: development/main/transit/handler/build.properties
==============================================================================
--- development/main/transit/handler/build.properties   (original)
+++ development/main/transit/handler/build.properties   Sat Dec 11 23:13:45 
2004
@@ -8,3 +8,5 @@
 
 project.test.fork = true
 
+junit-filename = junit-3.8.1.jar
+