donaldp 2002/06/11 01:14:50
Modified: container/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
container/src/test/org/apache/myrmidon/components/builder/test
DefaultProjectBuilderTestCase.java
container/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java
container/src/java/org/apache/myrmidon/interfaces/oldmodel
Project.java
Added: container/src/java/org/apache/myrmidon/interfaces/oldmodel
ProjectRef.java
Removed: container/src/java/org/apache/myrmidon/interfaces/workspace
ProjectRef.java
Log:
Move ProjectRef back into model package (going round in circles is good for
your health).
Revision Changes Path
1.79 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- DefaultProjectBuilder.java 11 Jun 2002 07:12:26 -0000 1.78
+++ DefaultProjectBuilder.java 11 Jun 2002 08:14:49 -0000 1.79
@@ -30,7 +30,7 @@
import org.apache.myrmidon.interfaces.property.NameValidator;
import org.apache.myrmidon.interfaces.property.NameValidatorManager;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.workspace.ProjectRef;
+import org.apache.myrmidon.interfaces.oldmodel.ProjectRef;
/**
* Default implementation to construct project from a build file.
1.23 +2 -2
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java
Index: DefaultProjectBuilderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultProjectBuilderTestCase.java 11 Jun 2002 07:12:26 -0000
1.22
+++ DefaultProjectBuilderTestCase.java 11 Jun 2002 08:14:49 -0000
1.23
@@ -25,7 +25,7 @@
import org.apache.myrmidon.interfaces.oldmodel.Project;
import org.apache.myrmidon.interfaces.oldmodel.Target;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.workspace.ProjectRef;
+import org.apache.myrmidon.interfaces.oldmodel.ProjectRef;
/**
* Test cases for [EMAIL PROTECTED] DefaultProjectBuilder}.
1.87 +2 -2
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- DefaultWorkspace.java 11 Jun 2002 07:45:11 -0000 1.86
+++ DefaultWorkspace.java 11 Jun 2002 08:14:49 -0000 1.87
@@ -32,7 +32,7 @@
import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.interfaces.type.TypeRegistry;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.workspace.ProjectRef;
+import org.apache.myrmidon.interfaces.oldmodel.ProjectRef;
import org.apache.myrmidon.interfaces.workspace.Workspace;
/**
1.29 +3 -4
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/Project.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Project.java 11 Jun 2002 08:01:35 -0000 1.28
+++ Project.java 11 Jun 2002 08:14:50 -0000 1.29
@@ -9,7 +9,6 @@
import java.io.File;
import org.apache.myrmidon.interfaces.workspace.ProjectDescriptor;
-import org.apache.myrmidon.interfaces.workspace.ProjectRef;
/**
* Abstraction used to interact with projects.
@@ -134,9 +133,9 @@
}
/**
- * Return the array of all the [EMAIL PROTECTED] ProjectRef} objects in
project.
+ * Return the array of all the [EMAIL PROTECTED]
org.apache.myrmidon.interfaces.oldmodel.ProjectRef} objects in project.
*
- * @return the array of all the [EMAIL PROTECTED] ProjectRef} objects in
project.
+ * @return the array of all the [EMAIL PROTECTED]
org.apache.myrmidon.interfaces.oldmodel.ProjectRef} objects in project.
*/
public ProjectRef[] getProjectRefs()
{
1.3 +16 -9
jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/ProjectRef.java
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
