From 70513c95deace3ea5394895f96307c68c228d61b Mon Sep 17 00:00:00 2001 From: adammurdoch Date: Mon, 4 Mar 2002 04:23:38 +0000 Subject: [PATCH] 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 --- .../myrmidon/src/java/org/apache/antlib/core/Available.java | 2 +- .../src/java/org/apache/antlib/core/ConditionTask.java | 2 +- proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java | 2 +- .../myrmidon/src/java/org/apache/antlib/core/OsCondition.java | 2 +- .../src/java/org/apache/antlib/vfile/DefaultFileSet.java | 1 + .../src/java/org/apache/antlib/vfile/FilteredFileList.java | 1 + .../antlib/vfile/selectors/AbstractNameFileSelector.java | 1 - .../org/apache/antlib/vfile/selectors/AndFileSelector.java | 1 - .../org/apache/antlib/vfile/selectors/ConditionSelector.java | 3 +-- .../apache/antlib/vfile/selectors/ExistenceFileSelector.java | 1 - .../org/apache/antlib/vfile/{ => selectors}/FileSelector.java | 2 +- .../org/apache/antlib/vfile/selectors/FileTestCondition.java | 3 +-- .../apache/antlib/vfile/selectors/IsEmptyFolderSelector.java | 1 - .../java/org/apache/antlib/vfile/selectors/IsFileSelector.java | 1 - .../org/apache/antlib/vfile/selectors/IsFolderSelector.java | 1 - .../org/apache/antlib/vfile/selectors/NotFileSelector.java | 1 - .../java/org/apache/antlib/vfile/selectors/OrFileSelector.java | 1 - .../myrmidon/components/builder/DefaultProjectBuilder.java | 2 +- .../apache/myrmidon/components/workspace/DefaultWorkspace.java | 2 +- .../src/java/org/apache/myrmidon/framework/Pattern.java | 1 + .../org/apache/myrmidon/framework/conditions/AndCondition.java | 1 - .../apache/myrmidon/framework/{ => conditions}/Condition.java | 2 +- .../apache/myrmidon/framework/conditions/IsSetCondition.java | 1 - .../org/apache/myrmidon/framework/conditions/NotCondition.java | 1 - .../org/apache/myrmidon/framework/conditions/OrCondition.java | 1 - .../src/java/org/apache/myrmidon/interfaces/model/Target.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/WaitFor.java | 2 +- .../main/org/apache/tools/ant/taskdefs/condition/Equals.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/condition/Http.java | 2 +- .../main/org/apache/tools/ant/taskdefs/condition/Socket.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/WaitFor.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/condition/Equals.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/condition/Http.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/condition/Socket.java | 2 +- 34 files changed, 22 insertions(+), 33 deletions(-) rename proposal/myrmidon/src/java/org/apache/antlib/vfile/{ => selectors}/FileSelector.java (96%) rename proposal/myrmidon/src/java/org/apache/myrmidon/framework/{ => conditions}/Condition.java (94%) diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java index 417b1d1e5..d3390fcf4 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java index 526b92461..681dfdaa0 100644 --- 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; /** * <condition> task as a generalization of <available> and diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java b/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java index 06fdd29bd..ce92d38fb 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java index cf778acb3..bf8cdbd34 100644 --- 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.

diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java index df4b7cc08..e8cbf469b 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java index 36e82ad84..7348289ec 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java index d15892034..1219ebcfd 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java index 56a4d22f5..6dba6c235 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java index 8c013ce4e..b3e080db3 100644 --- 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; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java index 21424888f..2faf66aa5 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/FileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/antlib/vfile/FileSelector.java rename to proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java index 71c743c89..8e41fbf28 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java index 17e801be8..55f17170c 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java index 8522533fa..f169f9367 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java index 9022dbcb5..3ce89ce2d 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java index abb01348a..fdded32dd 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java index d367fa01c..0a64afcd5 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java index 4b3373e22..5348eb487 100644 --- 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; 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 d0547554e..5d0ff6419 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 @@ -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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java index 7b4a0db13..503608dcc 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java index 1002f7a29..ea6d813b2 100644 --- 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. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java index e0dc84cba..71a53651b 100644 --- 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; /** * <and> condition container.

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/Condition.java similarity index 94% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/Condition.java index 84a1ed809..0df965116 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java index ecfe1fe54..fb0bff5d2 100644 --- 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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java index 6d7572d82..cf2e5ee79 100644 --- 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; /** * <not> condition. Evaluates to true if the single condition nested into diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java index bf7ea3829..107988ed5 100644 --- 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; /** * <or> condition container.

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java index e6459e163..541a4aac7 100644 --- 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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index 72d4e0900..1fd1bc787 100644 --- 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; /** diff --git 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 index 57fcb7d2e..808fa8a4e 100644 --- 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. diff --git 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 index 5388b54a3..a4bb1ef25 100644 --- 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 - diff --git 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 index b40232237..0d3b3b399 100644 --- 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) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java index 72d4e0900..1fd1bc787 100644 --- 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; /** diff --git 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 index 57fcb7d2e..808fa8a4e 100644 --- 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. diff --git 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 index 5388b54a3..a4bb1ef25 100644 --- 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 - diff --git 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 index b40232237..0d3b3b399 100644 --- 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)