From 1ec0e4c4e6484e6f946b095227f11a77ccdc579d Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Tue, 29 May 2001 07:41:22 +0000 Subject: [PATCH] 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 | 2 +- .../src/java/org/apache/ant/modules/basic/AntCall.java | 2 +- .../java/org/apache/ant/project/DefaultProjectEngine.java | 4 ++-- .../src/java/org/apache/ant/project/ProjectEngine.java | 2 +- .../components/builder/DefaultProjectBuilder.java | 8 ++++---- .../myrmidon/components/builder/ProjectBuilder.java | 2 +- .../myrmidon/{ => components}/model/DefaultProject.java | 2 +- .../myrmidon/{ => components}/model/DefaultTarget.java | 2 +- .../apache/myrmidon/{ => components}/model/Project.java | 4 ++-- .../apache/myrmidon/{ => components}/model/Target.java | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename proposal/myrmidon/src/java/org/apache/myrmidon/{ => components}/model/DefaultProject.java (98%) rename proposal/myrmidon/src/java/org/apache/myrmidon/{ => components}/model/DefaultTarget.java (97%) rename proposal/myrmidon/src/java/org/apache/myrmidon/{ => components}/model/Project.java (97%) rename proposal/myrmidon/src/java/org/apache/myrmidon/{ => components}/model/Target.java (95%) diff --git a/proposal/myrmidon/src/java/org/apache/ant/Main.java b/proposal/myrmidon/src/java/org/apache/ant/Main.java index 43261d344..99a897dce 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/Main.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java b/proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java index 2f8fec4f6..13a994231 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java b/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java index 303f98cf8..20a21c5bd 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java b/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java index 6e09cb625..b97b9e080 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java index 7cd096b8c..922ee0bc1 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java index 46d5e2914..f54ccf3bd 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultProject.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultProject.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java index 2885d6bf9..7792f96c4 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultProject.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultTarget.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultTarget.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultTarget.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultTarget.java index 185a49bd5..8f2662a9b 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/model/DefaultTarget.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/model/Project.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/model/Project.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java index 083ebe460..4889c328a 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/model/Project.java +++ b/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). diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/model/Target.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/myrmidon/model/Target.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java index 940707a05..30e1dc6fc 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/model/Target.java +++ b/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;