diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index 7f7802f28..10b4ec960 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -456,4 +456,26 @@ Legal:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proposal/myrmidon/lib/log4j-core.jar b/proposal/myrmidon/lib/log4j-core.jar
new file mode 100644
index 000000000..da6d8c2e5
Binary files /dev/null and b/proposal/myrmidon/lib/log4j-core.jar differ
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
index 4f22fb248..0200dfad6 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Fail.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.framework.Condition;
* Useful for forcing a build to fail on a certain condition.
*
* @author Peter Donald
+ * @ant:task name="fail"
*/
public class Fail
extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
index 63a8a78fc..af18dd5d4 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
@@ -21,6 +21,7 @@ import org.apache.myrmidon.framework.AbstractContainerTask;
* This task loads properties from a property file and places them in the context.
*
* @author Peter Donald
+ * @ant:task name="load-properties"
*/
public class LoadProperties
extends AbstractContainerTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
index f40aa10d4..19419fc37 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
@@ -14,6 +14,7 @@ import org.apache.myrmidon.api.TaskException;
* This is a task used to log messages in the build file.
*
* @author Peter Donald
+ * @ant:task name="log"
*/
public class Log
extends AbstractTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
index 605569f47..fa494bfa3 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java
@@ -28,6 +28,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
* TODO: Determine final format of property task.
*
* @author Peter Donald
+ * @ant:task name="property"
*/
public class Property
extends AbstractContainerTask
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
index 0467648b6..63a8ca5a4 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to boolean converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Boolean"
*/
public class StringToBooleanConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
index a09743f9d..3a0f9c7d1 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to byte converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Byte"
*/
public class StringToByteConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
index ace997e1c..38c33fbe6 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to class converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Class"
*/
public class StringToClassConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
index 1ae3b1a63..32f9e3efc 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to double converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Double"
*/
public class StringToDoubleConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
index 11b7dacb3..f70051d0c 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
@@ -20,6 +20,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to Enum converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="org.apache.avalon.framework.Enum"
*/
public class StringToEnumConverter
implements Converter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
index 1805d6c4e..f503541a7 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
@@ -20,6 +20,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to file converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.io.File"
*/
public class StringToFileConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
index 913bd4ea1..025100b14 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to float converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Float"
*/
public class StringToFloatConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
index 35af9258c..0f6f4c8eb 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to integer converter.
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Integer"
*/
public class StringToIntegerConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
index 59ab8e8c5..7304eb10c 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to long converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Long"
*/
public class StringToLongConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
index 90f5d413a..50aaedda7 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
@@ -17,6 +17,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to short converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.lang.Short"
*/
public class StringToShortConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
index f21be4756..4ed6e9d04 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
@@ -19,6 +19,7 @@ import org.apache.myrmidon.converter.ConverterException;
* String to url converter
*
* @author Peter Donald
+ * @ant:converter source="java.lang.String" destination="java.net.URL"
*/
public class StringToURLConverter
extends AbstractConverter
diff --git a/proposal/myrmidon/src/manifest/core-ant-descriptor.template b/proposal/myrmidon/src/manifest/core-ant-descriptor.template
new file mode 100644
index 000000000..450580bd1
--- /dev/null
+++ b/proposal/myrmidon/src/manifest/core-ant-descriptor.template
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ "
+ classname=""/>
+
+
+
+
+
+
+
+
+
+ "
+ destination=""/>
+
+
+
+
+
+