Fixed circular package dependency:

* Moved antlib.vfs.FileSelector to antlib.vfs.selectors * Moved framework.Condition to framework.conditions git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271716 13f79535-47bb-0310-9956-ffa450edef68
23 years ago · 70513c95de
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java
@@ -11,7 +11,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PathUtil;

--- a/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java
@@ -10,7 +10,7 @@ package org.apache.antlib.core;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.framework.conditions.AndCondition;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * &lt;condition&gt; task as a generalization of &lt;available&gt; and
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
@@ -13,7 +13,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.AbstractContainerTask;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.myrmidon.framework.conditions.IsSetCondition;
 import org.apache.myrmidon.framework.conditions.NotCondition;

--- a/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java
@@ -10,7 +10,7 @@ package org.apache.antlib.core;
 import org.apache.aut.nativelib.Os;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Condition to check the current OS.</p>
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
@@ -9,6 +9,7 @@ package org.apache.antlib.vfile;

 import java.util.ArrayList;
 import org.apache.antlib.vfile.selectors.AndFileSelector;
 import org.apache.antlib.vfile.selectors.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.aut.vfs.FileSystemException;
 import org.apache.aut.vfs.FileType;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
@@ -9,6 +9,7 @@ package org.apache.antlib.vfile;

 import java.util.ArrayList;
 import org.apache.antlib.vfile.selectors.AndFileSelector;
 import org.apache.antlib.vfile.selectors.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java
@@ -7,7 +7,6 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
@@ -8,7 +8,6 @@
 package org.apache.antlib.vfile.selectors;

 import java.util.ArrayList;
 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java
@@ -7,11 +7,10 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.myrmidon.framework.conditions.AndCondition;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;

 /**
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java
@@ -7,7 +7,6 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.aut.vfs.FileSystemException;
 import org.apache.myrmidon.api.TaskContext;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.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.antlib.vfile;
 package org.apache.antlib.vfile.selectors;

 import org.apache.aut.vfs.FileObject;
 import org.apache.myrmidon.api.TaskContext;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
@@ -7,11 +7,10 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.aut.vfs.FileObject;
 import org.apache.antlib.vfile.FileSelector;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;

--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
@@ -7,7 +7,6 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.aut.vfs.FileSystemException;
 import org.apache.aut.vfs.FileType;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
@@ -7,7 +7,6 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.aut.vfs.FileSystemException;
 import org.apache.aut.vfs.FileType;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
@@ -7,7 +7,6 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.aut.vfs.FileSystemException;
 import org.apache.aut.vfs.FileType;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
@@ -7,7 +7,6 @@
 */
 package org.apache.antlib.vfile.selectors;

 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
--- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
@@ -8,7 +8,6 @@
 package org.apache.antlib.vfile.selectors;

 import java.util.ArrayList;
 import org.apache.antlib.vfile.FileSelector;
 import org.apache.aut.vfs.FileObject;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
@@ -22,7 +22,7 @@ import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.myrmidon.framework.conditions.AndCondition;
 import org.apache.myrmidon.framework.conditions.IsSetCondition;
 import org.apache.myrmidon.framework.conditions.NotCondition;
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
@@ -28,7 +28,7 @@ import org.apache.avalon.framework.service.Serviceable;
 import org.apache.log.Hierarchy;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.myrmidon.interfaces.deployer.Deployer;
 import org.apache.myrmidon.interfaces.deployer.DeploymentException;
 import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
@@ -13,6 +13,7 @@ import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.conditions.IsSetCondition;
 import org.apache.myrmidon.framework.conditions.NotCondition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Basic data type for holding patterns.
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
@@ -11,7 +11,6 @@ import java.util.Enumeration;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Condition;

 /**
 * &lt;and&gt; condition container. <p>
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/Condition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/Condition.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.framework;
 package org.apache.myrmidon.framework.conditions;

 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
@@ -9,7 +9,6 @@ package org.apache.myrmidon.framework.conditions;

 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;

--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
@@ -9,7 +9,6 @@ package org.apache.myrmidon.framework.conditions;

 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Condition;

 /**
 * &lt;not&gt; condition. Evaluates to true if the single condition nested into
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
@@ -11,7 +11,6 @@ import java.util.Enumeration;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Condition;

 /**
 * &lt;or&gt; condition container. <p>
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java
@@ -9,7 +9,7 @@ package org.apache.myrmidon.interfaces.model;

 import java.util.ArrayList;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Targets in build file.
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -11,7 +11,7 @@ import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.framework.conditions.AndCondition;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.tools.ant.types.EnumeratedAttribute;

 /**
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
@@ -8,7 +8,7 @@

 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Simple String comparison condition.
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -14,7 +14,7 @@ import java.net.URLConnection;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Condition to wait for a HTTP request to succeed. Its attribute(s) are: url -
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s)
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java
@@ -11,7 +11,7 @@ import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.framework.conditions.AndCondition;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;
 import org.apache.tools.ant.types.EnumeratedAttribute;

 /**
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Equals.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Equals.java
@@ -8,7 +8,7 @@

 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Simple String comparison condition.
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -14,7 +14,7 @@ import java.net.URLConnection;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Condition to wait for a HTTP request to succeed. Its attribute(s) are: url -
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Socket.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Socket.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Condition;
 import org.apache.myrmidon.framework.conditions.Condition;

 /**
 * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s)