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

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(); )

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ClassicPropertyResolver.java → 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;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultPropertyResolver.java → 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.

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.

proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/PropertyResolver.java → 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;

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.

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}

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}.

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.

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}

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}.