diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
similarity index 97%
rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
index a7bc72584..94364c4b2 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.ant.modules.basic;
+package org.apache.myrmidon.libs.core;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -13,17 +13,19 @@ import org.apache.avalon.framework.component.Composable;
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.framework.AbstractContainerTask;
-import org.apache.myrmidon.framework.DataType;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.type.TypeException;
import org.apache.myrmidon.components.type.TypeFactory;
+import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.framework.AbstractContainerTask;
+import org.apache.myrmidon.framework.DataType;
/**
* This is the property "task" to declare a binding of a datatype to a name.
*
+ * TODO: Determine final format of property task.
+ *
* @author Peter Donald
*/
public class Property
diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/AntCall.java
similarity index 96%
rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/AntCall.java
index a2dd375cf..d4efd3f3b 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/AntCall.java
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.ant.modules.basic;
+package org.apache.myrmidon.libs.runtime;
import java.util.ArrayList;
import org.apache.avalon.framework.component.ComponentException;
@@ -13,14 +13,14 @@ import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.Context;
import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.DefaultTaskContext;
import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.manager.ProjectManager;
import org.apache.myrmidon.components.model.Project;
/**
- * This is abstract base class for tasklets.
+ * TODO: Determine if low cost antcalls are needed.
*
* @author Peter Donald
*/
@@ -53,7 +53,7 @@ public class AntCall
{
m_target = target;
}
-
+/*
public Property createParam()
throws Exception
{
@@ -64,7 +64,7 @@ public class AntCall
m_properties.add( property );
return property;
}
-
+*/
public void execute()
throws TaskException
{
@@ -73,19 +73,20 @@ public class AntCall
throw new TaskException( "Target attribute must be specified" );
}
+/*
final int size = m_properties.size();
for( int i = 0; i < size; i++ )
{
final Property property = (Property)m_properties.get( i );
property.execute();
}
-
+*/
getLogger().info( "Calling target " + m_target );
//This calls startProject() which is probably not wanted???
//TODO: FIXME when scoping is decided
//m_projectManager.executeProject( m_project, m_target );
- getLogger().warn( "ANTCALL NOT IMPLEMENTED - waiting for " +
+ getLogger().warn( "ANTCALL NOT IMPLEMENTED - waiting for " +
"scope rules to be decided" );
}
}
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ImportTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
similarity index 98%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ImportTask.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
index dc218bf48..0709c3498 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ImportTask.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
@@ -23,7 +23,7 @@ import org.apache.myrmidon.components.deployer.DeploymentException;
*
* @author Peter Donald
*/
-public class ImportTask
+public class Import
extends AbstractTask
implements Composable
{
diff --git a/proposal/myrmidon/src/make/sample.ant b/proposal/myrmidon/src/make/sample.ant
index a98e59f2b..f721d28ee 100644
--- a/proposal/myrmidon/src/make/sample.ant
+++ b/proposal/myrmidon/src/make/sample.ant
@@ -39,23 +39,26 @@ Legal:
-
+
+
diff --git a/proposal/myrmidon/src/manifest/core-ant-descriptor.xml b/proposal/myrmidon/src/manifest/core-ant-descriptor.xml
index 6a1c39362..4f34ebef6 100644
--- a/proposal/myrmidon/src/manifest/core-ant-descriptor.xml
+++ b/proposal/myrmidon/src/manifest/core-ant-descriptor.xml
@@ -4,8 +4,7 @@
-
-
+
diff --git a/proposal/myrmidon/src/manifest/runtime-ant-descriptor.xml b/proposal/myrmidon/src/manifest/runtime-ant-descriptor.xml
index 946c29722..8ba083b82 100644
--- a/proposal/myrmidon/src/manifest/runtime-ant-descriptor.xml
+++ b/proposal/myrmidon/src/manifest/runtime-ant-descriptor.xml
@@ -6,7 +6,8 @@
-
+
+