DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Fri Dec 24 10:12:38 2004
New Revision: 1283

Removed:
   development/laboratory/ant/testing/
Modified:
   development/laboratory/ant/index.xml
   development/laboratory/ant/main/build.xml
   development/laboratory/ant/main/src/main/net/dpml/ant/AntPlugin.java
Log:
update package so that it is working relative to current transit/merlin

Modified: development/laboratory/ant/index.xml
==============================================================================
--- development/laboratory/ant/index.xml        (original)
+++ development/laboratory/ant/index.xml        Fri Dec 24 10:12:38 2004
@@ -30,11 +30,13 @@
       <type>jar</type>
     </info>
     <dependencies>
+      <include key="dpml-magic-bootstrap"/>
       <include key="dpml-transit-plugin"/>
       <include key="ant"/>
       <include key="ant-launcher"/>
       <include key="ant-junit"/>
       <include key="commons-cli"/>
+      <include key="tools"/>
     </dependencies>
   </project>
 
@@ -42,7 +44,7 @@
     <info>
       <group>sun</group>
       <name>tools</name>
-      <version>1.4.0</version>
+      <version>1.4.2</version>
       <type>jar</type>
     </info>
   </resource>

Modified: development/laboratory/ant/main/build.xml
==============================================================================
--- development/laboratory/ant/main/build.xml   (original)
+++ development/laboratory/ant/main/build.xml   Fri Dec 24 10:12:38 2004
@@ -17,8 +17,8 @@
 
   <target name="bin" depends="prepare">
     <mkdir dir="${dpml.home}/bin"/>
-    <copy todir="${dpml.home}/bin">
-      <fileset dir="target/bin"/>
+    <copy todir="${dpml.home}/bin" overwrite="true">
+      <fileset dir="${basedir}/target/bin"/>
     </copy>
     <chmod file="${dpml.home}/bin/magic" perm="755"/>
   </target>

Modified: development/laboratory/ant/main/src/main/net/dpml/ant/AntPlugin.java
==============================================================================
--- development/laboratory/ant/main/src/main/net/dpml/ant/AntPlugin.java      
  (original)
+++ development/laboratory/ant/main/src/main/net/dpml/ant/AntPlugin.java      
  Fri Dec 24 10:12:38 2004
@@ -19,12 +19,17 @@
 package net.dpml.ant;
 
 import java.io.File;
-import java.util.Vector;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.net.URI;
+import java.util.Vector;
 
 import net.dpml.transit.Transit;
 
+import net.dpml.magic.bootstrap.TransitComponentHelper;
+import net.dpml.magic.bootstrap.Map;
+import net.dpml.magic.bootstrap.MainTask;
+
 import org.apache.tools.ant.Main;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
@@ -136,7 +141,7 @@
         //System.setOut(new PrintStream(new DemuxOutputStream(project, 
false)));
         //System.setErr(new PrintStream(new DemuxOutputStream(project, 
true)));
 
-        //setupTransitComponentHelper( project );
+        setupTransitComponentHelper( project );
         //setupTransitProperties( project );
 
         try
@@ -186,15 +191,13 @@
         }
     }
 
-   /*
-    private void setupTransitComponentHelper( Project project )
+    private void setupTransitComponentHelper( Project project ) 
     {
-        ComponentHelper componentHelper = new TransitComponentHelper();
-        componentHelper.setProject( project );
-        componentHelper.initDefaultDefinitions();
-        project.addReference( "ant.ComponentHelper", componentHelper );
+        MainTask task = new MainTask();
+        task.setProject( project );
+        task.init();
+        task.execute();
     }
-    */
 
     private ProjectHelper setupTransitProjectHelper( Project project )
     {
@@ -207,11 +210,9 @@
     private void setupTransitProperties( Project project )
     {
         File home = Transit.HOME;
-        File templates = new File( home, "templates" );
         File docs = new File( home, "docs" );
         File cache = new File( home, "main" );
         project.setNewProperty( "dpml.home", home.getAbsolutePath() );
-        project.setNewProperty( "dpml.templates", 
templates.getAbsolutePath() );
         project.setNewProperty( "dpml.docs", docs.getAbsolutePath() );
         project.setNewProperty( "dpml.cache", cache.getAbsolutePath() );
     }