Model is not a user concern but a modder/embeddor concern.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269061 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/java/org/apache/ant/Main.java

@@ -46,7 +46,7 @@ import org.apache.myrmidon.components.embeddor.Embeddor;
 import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor;
 import org.apache.myrmidon.launcher.LauncherClassLoader;
 import org.apache.myrmidon.listeners.ProjectListener;
-import org.apache.myrmidon.model.Project;
+import org.apache.myrmidon.components.model.Project;
 
 /**
  * The class to kick the tires and light the fires.

proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java

@@ -9,7 +9,7 @@ package org.apache.ant.modules.basic;
 
 import java.util.ArrayList;
 import org.apache.ant.AntException;
-import org.apache.myrmidon.model.Project;
+import org.apache.myrmidon.components.model.Project;
 import org.apache.ant.project.ProjectEngine;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.DefaultTaskContext;

proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java

@@ -25,8 +25,8 @@ import org.apache.myrmidon.api.DefaultTaskContext;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.components.executor.Executor;
 import org.apache.myrmidon.listeners.ProjectListener;
-import org.apache.myrmidon.model.Project;
-import org.apache.myrmidon.model.Target;
+import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.components.model.Target;
 
 /**
  * This is the default implementation of ProjectEngine.

proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java

@@ -11,7 +11,7 @@ import org.apache.ant.AntException;
 import org.apache.avalon.framework.component.Component;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.listeners.ProjectListener;
-import org.apache.myrmidon.model.Project;
+import org.apache.myrmidon.components.model.Project;
 
 /**
  * This is the interface between ProjectEngine and rest of the system.

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java

@@ -18,10 +18,10 @@ import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 import org.apache.avalon.framework.logger.AbstractLoggable;
 import org.apache.log.Logger;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.model.DefaultProject;
-import org.apache.myrmidon.model.DefaultTarget;
-import org.apache.myrmidon.model.Project;
-import org.apache.myrmidon.model.Target;
+import org.apache.myrmidon.components.model.DefaultProject;
+import org.apache.myrmidon.components.model.DefaultTarget;
+import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.components.model.Target;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java

@@ -11,7 +11,7 @@ import java.io.File;
 import java.io.IOException;
 import org.apache.ant.AntException;
 import org.apache.avalon.framework.component.Component;
-import org.apache.myrmidon.model.Project;
+import org.apache.myrmidon.components.model.Project;
 
 /**
  * Interface implemented by components that build projects from sources.

proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultProject.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.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.myrmidon.model;
+package org.apache.myrmidon.components.model;
 
 import java.io.File;
 import java.io.IOException;

proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultTarget.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultTarget.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.myrmidon.model;
+package org.apache.myrmidon.components.model;
 
 import java.util.ArrayList;
 import org.apache.ant.util.Condition;

proposal/myrmidon/src/java/org/apache/myrmidon/model/Project.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java

@@ -5,14 +5,14 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.model;
+package org.apache.myrmidon.components.model;
 
 import java.io.File;
 import org.apache.avalon.framework.component.Component;
 
 /**
  * Abstraction used to interact with projects.
- * Implementations may choose to structure it anyway they choose. 
+ * Implementations may choose to structure it anyway they choose.
  *
  * TODO: Determine if projects should carry their own name. Breaks IOC but
  * Can be useful as project files embed own name (or should that be description).

proposal/myrmidon/src/java/org/apache/myrmidon/model/Target.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.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.myrmidon.model;
+package org.apache.myrmidon.components.model;
 
 import org.apache.ant.util.Condition;
 import org.apache.avalon.framework.component.Component;