diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/api/JavaVersion.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/myrmidon/api/JavaVersion.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java index dbf1f5b17..4c544719e 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/api/JavaVersion.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.api; +package org.apache.myrmidon.framework; import org.apache.avalon.framework.ValuedEnum; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java index 6759f514f..ad41168a9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.ArrayList; import java.util.Iterator; -import org.apache.myrmidon.api.JavaVersion; +import org.apache.myrmidon.framework.JavaVersion; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index 71f712142..58c4a154f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.JavaVersion; +import org.apache.myrmidon.framework.JavaVersion; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java index 6759f514f..ad41168a9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.ArrayList; import java.util.Iterator; -import org.apache.myrmidon.api.JavaVersion; +import org.apache.myrmidon.framework.JavaVersion; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java index 71f712142..58c4a154f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.JavaVersion; +import org.apache.myrmidon.framework.JavaVersion; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Commandline;