* 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-ffa450edef68master
| @@ -11,7 +11,7 @@ import java.net.URL; | |||||
| import java.net.URLClassLoader; | import java.net.URLClassLoader; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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.Path; | ||||
| import org.apache.tools.ant.types.PathUtil; | import org.apache.tools.ant.types.PathUtil; | ||||
| @@ -10,7 +10,7 @@ package org.apache.antlib.core; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.AbstractTask; | import org.apache.myrmidon.api.AbstractTask; | ||||
| import org.apache.myrmidon.framework.conditions.AndCondition; | 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 | * <condition> task as a generalization of <available> and | ||||
| @@ -13,7 +13,7 @@ import org.apache.avalon.excalibur.i18n.Resources; | |||||
| import org.apache.avalon.framework.configuration.Configuration; | import org.apache.avalon.framework.configuration.Configuration; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.framework.AbstractContainerTask; | 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.IsSetCondition; | ||||
| import org.apache.myrmidon.framework.conditions.NotCondition; | import org.apache.myrmidon.framework.conditions.NotCondition; | ||||
| @@ -10,7 +10,7 @@ package org.apache.antlib.core; | |||||
| import org.apache.aut.nativelib.Os; | import org.apache.aut.nativelib.Os; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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> | * Condition to check the current OS.</p> | ||||
| @@ -9,6 +9,7 @@ package org.apache.antlib.vfile; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.antlib.vfile.selectors.AndFileSelector; | 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.FileObject; | ||||
| import org.apache.aut.vfs.FileSystemException; | import org.apache.aut.vfs.FileSystemException; | ||||
| import org.apache.aut.vfs.FileType; | import org.apache.aut.vfs.FileType; | ||||
| @@ -9,6 +9,7 @@ package org.apache.antlib.vfile; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.antlib.vfile.selectors.AndFileSelector; | 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.FileObject; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| @@ -7,7 +7,6 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.avalon.excalibur.i18n.ResourceManager; | import org.apache.avalon.excalibur.i18n.ResourceManager; | ||||
| import org.apache.avalon.excalibur.i18n.Resources; | import org.apache.avalon.excalibur.i18n.Resources; | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| @@ -7,11 +7,10 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | 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.framework.conditions.AndCondition; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| /** | /** | ||||
| @@ -7,7 +7,6 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.aut.vfs.FileSystemException; | import org.apache.aut.vfs.FileSystemException; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| @@ -5,7 +5,7 @@ | |||||
| * version 1.1, a copy of which has been included with this distribution in | * version 1.1, a copy of which has been included with this distribution in | ||||
| * the LICENSE.txt file. | * the LICENSE.txt file. | ||||
| */ | */ | ||||
| package org.apache.antlib.vfile; | |||||
| package org.apache.antlib.vfile.selectors; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| @@ -7,11 +7,10 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | 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.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.aut.vfs.FileObject; | 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.ResourceManager; | ||||
| import org.apache.avalon.excalibur.i18n.Resources; | import org.apache.avalon.excalibur.i18n.Resources; | ||||
| @@ -7,7 +7,6 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.aut.vfs.FileSystemException; | import org.apache.aut.vfs.FileSystemException; | ||||
| import org.apache.aut.vfs.FileType; | import org.apache.aut.vfs.FileType; | ||||
| @@ -7,7 +7,6 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.aut.vfs.FileSystemException; | import org.apache.aut.vfs.FileSystemException; | ||||
| import org.apache.aut.vfs.FileType; | import org.apache.aut.vfs.FileType; | ||||
| @@ -7,7 +7,6 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.aut.vfs.FileSystemException; | import org.apache.aut.vfs.FileSystemException; | ||||
| import org.apache.aut.vfs.FileType; | import org.apache.aut.vfs.FileType; | ||||
| @@ -7,7 +7,6 @@ | |||||
| */ | */ | ||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| @@ -8,7 +8,6 @@ | |||||
| package org.apache.antlib.vfile.selectors; | package org.apache.antlib.vfile.selectors; | ||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.antlib.vfile.FileSelector; | |||||
| import org.apache.aut.vfs.FileObject; | import org.apache.aut.vfs.FileObject; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| @@ -22,7 +22,7 @@ import org.apache.avalon.framework.configuration.Configuration; | |||||
| import org.apache.avalon.framework.configuration.ConfigurationException; | import org.apache.avalon.framework.configuration.ConfigurationException; | ||||
| import org.apache.avalon.framework.configuration.SAXConfigurationHandler; | import org.apache.avalon.framework.configuration.SAXConfigurationHandler; | ||||
| import org.apache.avalon.framework.logger.AbstractLogEnabled; | 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.AndCondition; | ||||
| import org.apache.myrmidon.framework.conditions.IsSetCondition; | import org.apache.myrmidon.framework.conditions.IsSetCondition; | ||||
| import org.apache.myrmidon.framework.conditions.NotCondition; | import org.apache.myrmidon.framework.conditions.NotCondition; | ||||
| @@ -28,7 +28,7 @@ import org.apache.avalon.framework.service.Serviceable; | |||||
| import org.apache.log.Hierarchy; | import org.apache.log.Hierarchy; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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.Deployer; | ||||
| import org.apache.myrmidon.interfaces.deployer.DeploymentException; | import org.apache.myrmidon.interfaces.deployer.DeploymentException; | ||||
| import org.apache.myrmidon.interfaces.deployer.TypeDeployer; | import org.apache.myrmidon.interfaces.deployer.TypeDeployer; | ||||
| @@ -13,6 +13,7 @@ import org.apache.myrmidon.api.TaskContext; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.framework.conditions.IsSetCondition; | import org.apache.myrmidon.framework.conditions.IsSetCondition; | ||||
| import org.apache.myrmidon.framework.conditions.NotCondition; | import org.apache.myrmidon.framework.conditions.NotCondition; | ||||
| import org.apache.myrmidon.framework.conditions.Condition; | |||||
| /** | /** | ||||
| * Basic data type for holding patterns. | * Basic data type for holding patterns. | ||||
| @@ -11,7 +11,6 @@ import java.util.Enumeration; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.framework.Condition; | |||||
| /** | /** | ||||
| * <and> condition container. <p> | * <and> condition container. <p> | ||||
| @@ -5,7 +5,7 @@ | |||||
| * version 1.1, a copy of which has been included with this distribution in | * version 1.1, a copy of which has been included with this distribution in | ||||
| * the LICENSE.txt file. | * 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.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| @@ -9,7 +9,6 @@ package org.apache.myrmidon.framework.conditions; | |||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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.ResourceManager; | ||||
| import org.apache.avalon.excalibur.i18n.Resources; | import org.apache.avalon.excalibur.i18n.Resources; | ||||
| @@ -9,7 +9,6 @@ package org.apache.myrmidon.framework.conditions; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.framework.Condition; | |||||
| /** | /** | ||||
| * <not> condition. Evaluates to true if the single condition nested into | * <not> condition. Evaluates to true if the single condition nested into | ||||
| @@ -11,7 +11,6 @@ import java.util.Enumeration; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.framework.Condition; | |||||
| /** | /** | ||||
| * <or> condition container. <p> | * <or> condition container. <p> | ||||
| @@ -9,7 +9,7 @@ package org.apache.myrmidon.interfaces.model; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import org.apache.avalon.framework.configuration.Configuration; | import org.apache.avalon.framework.configuration.Configuration; | ||||
| import org.apache.myrmidon.framework.Condition; | |||||
| import org.apache.myrmidon.framework.conditions.Condition; | |||||
| /** | /** | ||||
| * Targets in build file. | * Targets in build file. | ||||
| @@ -11,7 +11,7 @@ import java.util.Hashtable; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.AbstractTask; | import org.apache.myrmidon.api.AbstractTask; | ||||
| import org.apache.myrmidon.framework.conditions.AndCondition; | 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; | import org.apache.tools.ant.types.EnumeratedAttribute; | ||||
| /** | /** | ||||
| @@ -8,7 +8,7 @@ | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.framework.Condition; | |||||
| import org.apache.myrmidon.framework.conditions.Condition; | |||||
| /** | /** | ||||
| * Simple String comparison condition. | * Simple String comparison condition. | ||||
| @@ -14,7 +14,7 @@ import java.net.URLConnection; | |||||
| import org.apache.avalon.framework.logger.AbstractLogEnabled; | import org.apache.avalon.framework.logger.AbstractLogEnabled; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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 - | * Condition to wait for a HTTP request to succeed. Its attribute(s) are: url - | ||||
| @@ -11,7 +11,7 @@ import java.io.IOException; | |||||
| import org.apache.avalon.framework.logger.AbstractLogEnabled; | import org.apache.avalon.framework.logger.AbstractLogEnabled; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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) | * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s) | ||||
| @@ -11,7 +11,7 @@ import java.util.Hashtable; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.AbstractTask; | import org.apache.myrmidon.api.AbstractTask; | ||||
| import org.apache.myrmidon.framework.conditions.AndCondition; | 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; | import org.apache.tools.ant.types.EnumeratedAttribute; | ||||
| /** | /** | ||||
| @@ -8,7 +8,7 @@ | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.framework.Condition; | |||||
| import org.apache.myrmidon.framework.conditions.Condition; | |||||
| /** | /** | ||||
| * Simple String comparison condition. | * Simple String comparison condition. | ||||
| @@ -14,7 +14,7 @@ import java.net.URLConnection; | |||||
| import org.apache.avalon.framework.logger.AbstractLogEnabled; | import org.apache.avalon.framework.logger.AbstractLogEnabled; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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 - | * Condition to wait for a HTTP request to succeed. Its attribute(s) are: url - | ||||
| @@ -11,7 +11,7 @@ import java.io.IOException; | |||||
| import org.apache.avalon.framework.logger.AbstractLogEnabled; | import org.apache.avalon.framework.logger.AbstractLogEnabled; | ||||
| import org.apache.myrmidon.api.TaskContext; | import org.apache.myrmidon.api.TaskContext; | ||||
| import org.apache.myrmidon.api.TaskException; | 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) | * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s) | ||||