From 67c9bd23c301a807ac6d77c1e3bf27a870914e0f Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Fri, 8 Jun 2001 09:17:09 +0000
Subject: [PATCH] Update descriptors to new name.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269127 13f79535-47bb-0310-9956-ffa450edef68
---
 .../myrmidon/src/manifest/base-ant-types.xml  | 15 +++++
 .../myrmidon/src/manifest/core-ant-types.xml  | 55 +++++++++++++++++++
 proposal/myrmidon/src/manifest/taskdefs.xml   | 45 ---------------
 3 files changed, 70 insertions(+), 45 deletions(-)
 create mode 100644 proposal/myrmidon/src/manifest/base-ant-types.xml
 create mode 100644 proposal/myrmidon/src/manifest/core-ant-types.xml
 delete mode 100644 proposal/myrmidon/src/manifest/taskdefs.xml

diff --git a/proposal/myrmidon/src/manifest/base-ant-types.xml b/proposal/myrmidon/src/manifest/base-ant-types.xml
new file mode 100644
index 000000000..820befac5
--- /dev/null
+++ b/proposal/myrmidon/src/manifest/base-ant-types.xml
@@ -0,0 +1,15 @@
+<ant-lib>
+
+  <types>
+
+    <listener name="default" classname="org.apache.myrmidon.listeners.DefaultProjectListener"/>
+    <aspect name="noop" classname="org.apache.myrmidon.aspects.NoopAspectHandler"/>
+
+    <!-- basic tasks/datatypes/coverters required in most environments -->
+<!--
+    <task name="pattern" classname="org.apache.myrmidon.framework.TypeInstanceTask" />
+    <data-type name="pattern" classname="org.apache.ant.modules.basic.Pattern" />
+-->
+  </types>
+
+</ant-lib>
\ No newline at end of file
diff --git a/proposal/myrmidon/src/manifest/core-ant-types.xml b/proposal/myrmidon/src/manifest/core-ant-types.xml
new file mode 100644
index 000000000..722d867c7
--- /dev/null
+++ b/proposal/myrmidon/src/manifest/core-ant-types.xml
@@ -0,0 +1,55 @@
+<ant-lib>
+  
+  <types>
+
+    <!-- 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" />
+
+    <!-- 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" />
+
+    <task name="pattern" classname="org.apache.myrmidon.framework.TypeInstanceTask" />
+    <data-type name="pattern" classname="org.apache.ant.modules.basic.Pattern" />
+
+  </types>
+  
+  <converters>
+
+    <converter classname="org.apache.ant.modules.basic.StringToLongConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Long" />
+    <converter classname="org.apache.ant.modules.basic.StringToIntegerConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Integer" />
+    <converter classname="org.apache.ant.modules.basic.StringToShortConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Short" />
+    <converter classname="org.apache.ant.modules.basic.StringToByteConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Byte" />
+    <converter classname="org.apache.ant.modules.basic.StringToDoubleConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Double" />
+    <converter classname="org.apache.ant.modules.basic.StringToFloatConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Float" />
+    <converter classname="org.apache.ant.modules.basic.StringToClassConverter" 
+               source="java.lang.String" 
+               destination="java.lang.Class" />
+    <converter classname="org.apache.ant.modules.basic.StringToURLConverter" 
+               source="java.lang.String" 
+               destination="java.net.URL" />
+
+  </converters>
+
+</ant-lib>
\ No newline at end of file
diff --git a/proposal/myrmidon/src/manifest/taskdefs.xml b/proposal/myrmidon/src/manifest/taskdefs.xml
deleted file mode 100644
index 93686244a..000000000
--- a/proposal/myrmidon/src/manifest/taskdefs.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<tasklib>
-
-  <!-- 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" />
-
-  <!-- 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" />
-
-  <data-type 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.modules.basic.StringToIntegerConverter" 
-             source="java.lang.String" 
-             destination="java.lang.Integer" />
-  <converter classname="org.apache.ant.modules.basic.StringToShortConverter" 
-             source="java.lang.String" 
-             destination="java.lang.Short" />
-  <converter classname="org.apache.ant.modules.basic.StringToByteConverter" 
-             source="java.lang.String" 
-             destination="java.lang.Byte" />
-  <converter classname="org.apache.ant.modules.basic.StringToDoubleConverter" 
-             source="java.lang.String" 
-             destination="java.lang.Double" />
-  <converter classname="org.apache.ant.modules.basic.StringToFloatConverter" 
-             source="java.lang.String" 
-             destination="java.lang.Float" />
-  <converter classname="org.apache.ant.modules.basic.StringToClassConverter" 
-             source="java.lang.String" 
-             destination="java.lang.Class" />
-  <converter classname="org.apache.ant.modules.basic.StringToURLConverter" 
-             source="java.lang.String" 
-             destination="java.net.URL" />
-</tasklib>
\ No newline at end of file