From da984ac4e97c8d8c3335efcab9ee74b4339b0937 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Tue, 12 Mar 2002 10:20:22 +0000 Subject: [PATCH] Move PropertyResolver and friends into own package hierarchy git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271828 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/myrmidon/components/embeddor/DefaultEmbeddor.java | 4 ++-- .../{workspace => property}/ClassicPropertyResolver.java | 4 ++-- .../{workspace => property}/DefaultPropertyResolver.java | 4 ++-- .../myrmidon/components/workspace/DefaultTaskContext.java | 2 +- .../interfaces/{workspace => property}/PropertyResolver.java | 2 +- .../org/apache/myrmidon/components/AbstractComponentTest.java | 4 ++-- .../components/workspace/ClassicPropertyResolverTest.java | 3 ++- .../components/workspace/DefaultPropertyResolverTest.java | 3 ++- .../org/apache/myrmidon/components/AbstractComponentTest.java | 4 ++-- .../components/workspace/ClassicPropertyResolverTest.java | 3 ++- .../components/workspace/DefaultPropertyResolverTest.java | 3 ++- 11 files changed, 20 insertions(+), 16 deletions(-) rename proposal/myrmidon/src/java/org/apache/myrmidon/components/{workspace => property}/ClassicPropertyResolver.java (91%) rename proposal/myrmidon/src/java/org/apache/myrmidon/components/{workspace => property}/DefaultPropertyResolver.java (98%) rename proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/{workspace => property}/PropertyResolver.java (96%) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java index d011373ad..93332c9a4 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java @@ -42,7 +42,7 @@ import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.interfaces.service.MultiSourceServiceManager; import org.apache.myrmidon.interfaces.type.TypeFactory; import org.apache.myrmidon.interfaces.type.TypeManager; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; import org.apache.myrmidon.interfaces.workspace.Workspace; import org.apache.myrmidon.listeners.ProjectListener; @@ -263,7 +263,7 @@ public class DefaultEmbeddor createComponent( Deployer.class, PREFIX + "deployer.DefaultDeployer" ); createComponent( ClassLoaderManager.class, PREFIX + "classloader.DefaultClassLoaderManager" ); createComponent( Executor.class, PREFIX + "executor.AspectAwareExecutor" ); - createComponent( PropertyResolver.class, PREFIX + "workspace.DefaultPropertyResolver" ); + createComponent( PropertyResolver.class, PREFIX + "property.DefaultPropertyResolver" ); // Setup the components for( Iterator iterator = m_components.iterator(); iterator.hasNext(); ) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ClassicPropertyResolver.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java similarity index 91% rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ClassicPropertyResolver.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java index 2b9b384c3..2e98e245b 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ClassicPropertyResolver.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java @@ -5,9 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.workspace; +package org.apache.myrmidon.components.property; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultPropertyResolver.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultPropertyResolver.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java index d75e3e805..d5259c7bb 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultPropertyResolver.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java @@ -5,14 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.workspace; +package org.apache.myrmidon.components.property; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * Base class for PropertyResolver implementations. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java index 0343eef0c..4edbeb512 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java @@ -21,7 +21,7 @@ import org.apache.avalon.framework.logger.Logger; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.interfaces.model.DefaultNameValidator; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * Default implementation of TaskContext. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/PropertyResolver.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/PropertyResolver.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java index 4da9ad1fe..2f41ecc0d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/PropertyResolver.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.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.interfaces.workspace; +package org.apache.myrmidon.interfaces.property; import org.apache.myrmidon.api.TaskException; import org.apache.avalon.framework.context.Context; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java index 7bb07c7e7..2dad31090 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java @@ -26,7 +26,7 @@ import org.apache.myrmidon.components.deployer.DefaultDeployer; import org.apache.myrmidon.components.extensions.DefaultExtensionManager; import org.apache.myrmidon.components.role.DefaultRoleManager; import org.apache.myrmidon.components.type.DefaultTypeManager; -import org.apache.myrmidon.components.workspace.DefaultPropertyResolver; +import org.apache.myrmidon.components.property.DefaultPropertyResolver; import org.apache.myrmidon.interfaces.classloader.ClassLoaderManager; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.converter.ConverterRegistry; @@ -37,7 +37,7 @@ import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; import org.apache.myrmidon.interfaces.type.TypeException; import org.apache.myrmidon.interfaces.type.TypeManager; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * A base class for tests for the default components. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java index 514b4e11e..ae5cbabdf 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java @@ -7,7 +7,8 @@ */ package org.apache.myrmidon.components.workspace; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; +import org.apache.myrmidon.components.property.ClassicPropertyResolver; /** * A test for {@link ClassicPropertyResolver} diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java index 1657b5339..e92675b83 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java @@ -14,7 +14,8 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.components.AbstractComponentTest; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.components.property.DefaultPropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * Functional tests for {@link DefaultPropertyResolver}. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java index 7bb07c7e7..2dad31090 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java @@ -26,7 +26,7 @@ import org.apache.myrmidon.components.deployer.DefaultDeployer; import org.apache.myrmidon.components.extensions.DefaultExtensionManager; import org.apache.myrmidon.components.role.DefaultRoleManager; import org.apache.myrmidon.components.type.DefaultTypeManager; -import org.apache.myrmidon.components.workspace.DefaultPropertyResolver; +import org.apache.myrmidon.components.property.DefaultPropertyResolver; import org.apache.myrmidon.interfaces.classloader.ClassLoaderManager; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.converter.ConverterRegistry; @@ -37,7 +37,7 @@ import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; import org.apache.myrmidon.interfaces.type.TypeException; import org.apache.myrmidon.interfaces.type.TypeManager; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * A base class for tests for the default components. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java index 514b4e11e..ae5cbabdf 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/ClassicPropertyResolverTest.java @@ -7,7 +7,8 @@ */ package org.apache.myrmidon.components.workspace; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; +import org.apache.myrmidon.components.property.ClassicPropertyResolver; /** * A test for {@link ClassicPropertyResolver} diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java index 1657b5339..e92675b83 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/workspace/DefaultPropertyResolverTest.java @@ -14,7 +14,8 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.components.AbstractComponentTest; -import org.apache.myrmidon.interfaces.workspace.PropertyResolver; +import org.apache.myrmidon.components.property.DefaultPropertyResolver; +import org.apache.myrmidon.interfaces.property.PropertyResolver; /** * Functional tests for {@link DefaultPropertyResolver}.