From 1b263172ed471d2ca6f42fe5f453735be3bc8349 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Wed, 7 Feb 2001 05:40:51 +0000
Subject: [PATCH] Updated to reflect new package hierarchy

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268606 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/myrmidon/build.xml                 |  4 +-
 proposal/myrmidon/src/make/sample.xmk       |  6 +--
 proposal/myrmidon/src/manifest/taskdefs.xml | 44 ++++++++++++---------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index d98082ee4..742a989ab 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -36,6 +36,7 @@ Legal:
   <property name="build.compiler.warnings" value="true"/>
   <property name="build.compiler.pedantic" value="true"/>
   <property name="build.compiler.depend" value="true"/>
+  <property name="build.compiler.fulldepend" value="true"/>
 
   <property name="debug" value="on"/>
   <property name="optimize" value="off"/>
@@ -211,8 +212,7 @@ Legal:
   -->
   <target name="jar-core" depends="compile">
     <jar jarfile="${build.lib}/core.tsk" basedir="${build.classes}">
-      <include name="org/apache/ant/tasks/core/**" />
-      <include name="org/apache/ant/convert/core/**" />
+      <include name="org/apache/ant/modules/**" />
       <include name="TASK-LIB/*" />
     </jar>
   </target>
diff --git a/proposal/myrmidon/src/make/sample.xmk b/proposal/myrmidon/src/make/sample.xmk
index bf541fa50..a82f67f38 100644
--- a/proposal/myrmidon/src/make/sample.xmk
+++ b/proposal/myrmidon/src/make/sample.xmk
@@ -61,11 +61,11 @@ Legal:
 
     <register-tasklet lib="../../dist/lib/core.tsk" 
                       name="echo2" 
-                      classname="org.apache.ant.tasks.core.Echo" />
+                      classname="org.apache.ant.modules.basic.Echo" />
 
 <!--    
     <register-tasklib lib="../../dist/lib/core.tsk" />
-    <register-converter classname="org.apache.ant.convert.core.StringToClassConverter"
+    <register-converter classname="org.apache.ant.modules.basic.StringToClassConverter"
                         source-type="java.lang.String"
                         destination-type="java.lang.Class"
                         lib="../../dist/lib/core.tsk" />
@@ -86,7 +86,7 @@ Legal:
 
     <register-datatype lib="../../dist/lib/core.tsk" 
                        name="pattern2"
-                       classname="org.apache.ant.datatypes.Pattern" />
+                       classname="org.apache.ant.modules.basic.Pattern" />
 
     <property name="foo2">
       <pattern2 name="*.java"/>
diff --git a/proposal/myrmidon/src/manifest/taskdefs.xml b/proposal/myrmidon/src/manifest/taskdefs.xml
index 5d87b7937..e33097297 100644
--- a/proposal/myrmidon/src/manifest/taskdefs.xml
+++ b/proposal/myrmidon/src/manifest/taskdefs.xml
@@ -1,39 +1,45 @@
 <tasklib>
-  <task name="echo" classname="org.apache.ant.tasks.core.Echo" />
-  <task name="prim-test" classname="org.apache.ant.tasks.core.PrimitiveTypesTest" />
-  <task name="sub-elements-test" classname="org.apache.ant.tasks.core.SubElementTest" />
-  <task name="conf-test" classname="org.apache.ant.tasks.core.ConfigurationTest" />
-  <task name="content-test" classname="org.apache.ant.tasks.core.ContentTest" />
-  <task name="property" classname="org.apache.ant.tasks.core.Property" />
-  <task name="register-tasklet" classname="org.apache.ant.tasks.core.RegisterTasklet" />
-  <task name="register-converter" classname="org.apache.ant.tasks.core.RegisterConverter" />
-  <task name="ant-call" classname="org.apache.ant.tasks.core.AntCall" />
-  <task name="register-datatype" classname="org.apache.ant.tasks.core.RegisterDataType" />
 
-  <datatype name="pattern" classname="org.apache.ant.datatypes.Pattern" />
+  <!-- core tasks for operation -->
+  <task name="register-tasklet" classname="org.apache.ant.modules.core.RegisterTasklet" />
+  <task name="register-converter" classname="org.apache.ant.modules.core.RegisterConverter" />
+  <task name="register-datatype" classname="org.apache.ant.modules.core.RegisterDataType" />
 
-  <converter classname="org.apache.ant.convert.core.StringToLongConverter" 
+  <!-- tasks to test operation of engine -->
+  <task name="prim-test" classname="org.apache.ant.modules.test.PrimitiveTypesTest" />
+  <task name="sub-elements-test" classname="org.apache.ant.modules.test.SubElementTest" />
+  <task name="conf-test" classname="org.apache.ant.modules.test.ConfigurationTest" />
+  <task name="content-test" classname="org.apache.ant.modules.test.ContentTest" />
+
+  <!-- basic tasks/datatypes/coverters required in most environments -->
+  <task name="echo" classname="org.apache.ant.modules.basic.Echo" />
+  <task name="property" classname="org.apache.ant.modules.basic.Property" />
+  <task name="ant-call" classname="org.apache.ant.modules.basic.AntCall" />
+
+  <datatype name="pattern" classname="org.apache.ant.modules.basic.Pattern" />
+
+  <converter classname="org.apache.ant.modules.basic.StringToLongConverter" 
              source="java.lang.String" 
              destination="java.lang.Long" />
-  <converter classname="org.apache.ant.convert.core.StringToIntegerConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToIntegerConverter" 
              source="java.lang.String" 
              destination="java.lang.Integer" />
-  <converter classname="org.apache.ant.convert.core.StringToShortConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToShortConverter" 
              source="java.lang.String" 
              destination="java.lang.Short" />
-  <converter classname="org.apache.ant.convert.core.StringToByteConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToByteConverter" 
              source="java.lang.String" 
              destination="java.lang.Byte" />
-  <converter classname="org.apache.ant.convert.core.StringToDoubleConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToDoubleConverter" 
              source="java.lang.String" 
              destination="java.lang.Double" />
-  <converter classname="org.apache.ant.convert.core.StringToFloatConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToFloatConverter" 
              source="java.lang.String" 
              destination="java.lang.Float" />
-  <converter classname="org.apache.ant.convert.core.StringToClassConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToClassConverter" 
              source="java.lang.String" 
              destination="java.lang.Class" />
-  <converter classname="org.apache.ant.convert.core.StringToURLConverter" 
+  <converter classname="org.apache.ant.modules.basic.StringToURLConverter" 
              source="java.lang.String" 
              destination="java.net.URL" />
 </tasklib>
\ No newline at end of file