diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/test/ConfigurationTest.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ConfigurationTest.java
similarity index 94%
rename from proposal/myrmidon/src/java/org/apache/ant/modules/test/ConfigurationTest.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ConfigurationTest.java
index dd36f8dea..74bc412d4 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/test/ConfigurationTest.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ConfigurationTest.java
@@ -5,20 +5,20 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.ant.modules.test;
+package org.apache.myrmidon.libs.selftest;
-import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
/**
* This is to test self interpretation of configuration.
*
* @author Peter Donald
*/
-public class ConfigurationTest
+public class ConfigurationTest
extends AbstractTask
implements Configurable
{
@@ -28,7 +28,7 @@ public class ConfigurationTest
throws ConfigurationException
{
String message = configuration.getAttribute( "message" );
-
+
Object object = null;
try { object = getContext().resolveValue( message ); }
diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/test/ContentTest.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ContentTest.java
similarity index 92%
rename from proposal/myrmidon/src/java/org/apache/ant/modules/test/ContentTest.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ContentTest.java
index 81f5ec8c9..6daf69a7f 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/test/ContentTest.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/ContentTest.java
@@ -5,17 +5,17 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.ant.modules.test;
+package org.apache.myrmidon.libs.selftest;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
/**
* This is to test whether content is added.
*
* @author Peter Donald
*/
-public class ContentTest
+public class ContentTest
extends AbstractTask
{
public void addContent( final Integer value )
diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/test/PrimitiveTypesTest.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/PrimitiveTypesTest.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/ant/modules/test/PrimitiveTypesTest.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/PrimitiveTypesTest.java
index fb4964964..576e5e21f 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/test/PrimitiveTypesTest.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/PrimitiveTypesTest.java
@@ -5,24 +5,24 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.ant.modules.test;
+package org.apache.myrmidon.libs.selftest;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
/**
* Test conversion of all the primitive types.
*
* @author Peter Donald
*/
-public class PrimitiveTypesTest
+public class PrimitiveTypesTest
extends AbstractTask
{
public void setInteger( final Integer value )
{
getLogger().warn( "setInteger( " + value + " );" );
}
-
+
public void setInteger2( final int value )
{
getLogger().warn( "setInteger2( " + value + " );" );
@@ -32,7 +32,7 @@ public class PrimitiveTypesTest
{
getLogger().warn( "setShort( " + value + " );" );
}
-
+
public void setShort2( final short value )
{
getLogger().warn( "setShort2( " + value + " );" );
@@ -42,7 +42,7 @@ public class PrimitiveTypesTest
{
getLogger().warn( "setByte( " + value + " );" );
}
-
+
public void setByte2( final byte value )
{
getLogger().warn( "setByte2( " + value + " );" );
@@ -52,27 +52,27 @@ public class PrimitiveTypesTest
{
getLogger().warn( "setLong( " + value + " );" );
}
-
+
public void setLong2( final long value )
{
getLogger().warn( "setLong2( " + value + " );" );
}
-
+
public void setFloat( final Float value )
{
getLogger().warn( "setFloat( " + value + " );" );
}
-
+
public void setFloat2( final float value )
{
getLogger().warn( "setFloat2( " + value + " );" );
}
-
+
public void setDouble( final Double value )
{
getLogger().warn( "setDouble( " + value + " );" );
}
-
+
public void setDouble2( final double value )
{
getLogger().warn( "setDouble2( " + value + " );" );
diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/test/SubElementTest.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/SubElementTest.java
similarity index 92%
rename from proposal/myrmidon/src/java/org/apache/ant/modules/test/SubElementTest.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/SubElementTest.java
index e21a837ed..c42c155d3 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/test/SubElementTest.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/selftest/SubElementTest.java
@@ -5,17 +5,17 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.ant.modules.test;
+package org.apache.myrmidon.libs.selftest;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
/**
* Test sub-elements addition.
- *
+ *
* @author Peter Donald
*/
-public class SubElementTest
+public class SubElementTest
extends AbstractTask
{
public static final class Beep