adammurdoch 02/03/03 20:23:38
Modified: proposal/myrmidon/src/java/org/apache/antlib/core
Available.java ConditionTask.java IfTask.java
OsCondition.java
proposal/myrmidon/src/java/org/apache/antlib/vfile
DefaultFileSet.java FilteredFileList.java
proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors
AbstractNameFileSelector.java AndFileSelector.java
ConditionSelector.java ExistenceFileSelector.java
FileTestCondition.java IsEmptyFolderSelector.java
IsFileSelector.java IsFolderSelector.java
NotFileSelector.java OrFileSelector.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework
Pattern.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions
AndCondition.java IsSetCondition.java
NotCondition.java OrCondition.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model
Target.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
WaitFor.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition
Equals.java Http.java Socket.java
Added: proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors
FileSelector.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions
Condition.java
Removed: proposal/myrmidon/src/java/org/apache/antlib/vfile
FileSelector.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework
Condition.java
Log:
Fixed circular package dependency:
* Moved antlib.vfs.FileSelector to antlib.vfs.selectors
* Moved framework.Condition to framework.conditions
Revision Changes Path
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java
Index: Available.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Available.java 3 Mar 2002 02:19:11 -0000 1.1
+++ Available.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -11,7 +11,7 @@
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;
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java
Index: ConditionTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/ConditionTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConditionTask.java 3 Mar 2002 02:19:11 -0000 1.1
+++ ConditionTask.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -10,7 +10,7 @@
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
@@ -22,7 +22,7 @@
* This task does not extend Task to take advantage of ConditionBase.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @ant:task name="condition"
*/
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java
Index: IfTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IfTask.java 3 Mar 2002 06:43:50 -0000 1.5
+++ IfTask.java 4 Mar 2002 04:23:37 -0000 1.6
@@ -13,7 +13,7 @@
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;
@@ -22,7 +22,7 @@
* then it will execute the inner tasks, else it won't.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.5 $ $Date: 2002/03/03 06:43:50 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/04 04:23:37 $
* @ant:task name="if"
*/
public class IfTask
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java
Index: OsCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/OsCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OsCondition.java 3 Mar 2002 02:19:11 -0000 1.1
+++ OsCondition.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -10,13 +10,13 @@
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>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @ant:type type="condition" name="os"
*/
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java
Index: DefaultFileSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultFileSet.java 1 Mar 2002 08:54:19 -0000 1.3
+++ DefaultFileSet.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -9,6 +9,7 @@
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;
1.5 +2 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java
Index: FilteredFileList.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/FilteredFileList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilteredFileList.java 3 Mar 2002 02:28:17 -0000 1.4
+++ FilteredFileList.java 4 Mar 2002 04:23:37 -0000 1.5
@@ -9,6 +9,7 @@
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;
@@ -17,7 +18,7 @@
* A file-list which filters another.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.4 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:data-type name="filtered-path"
* @ant:type type="v-path" name="filtered-path"
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java
Index: AbstractNameFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractNameFileSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ AbstractNameFileSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -23,7 +22,7 @@
* An abstract file selector that selects files based on name.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*/
public abstract class AbstractNameFileSelector
implements FileSelector
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java
Index: AndFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AndFileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AndFileSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ AndFileSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -18,7 +17,7 @@
* lazy evaluation. Returns true when no nested elements are supplied.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="and"
*/
1.2 +2 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java
Index: ConditionSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ConditionSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConditionSelector.java 3 Mar 2002 02:28:17 -0000 1.1
+++ ConditionSelector.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -7,18 +7,17 @@
*/
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 file selector that evaluates a set of nested [EMAIL PROTECTED]
Condition} elements.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="condition"
*/
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java
Index: ExistenceFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/ExistenceFileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExistenceFileSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ ExistenceFileSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -17,7 +16,7 @@
* A file selector that only selects files that exist.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="exists"
*/
1.2 +2 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java
Index: FileTestCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileTestCondition.java 3 Mar 2002 02:28:17 -0000 1.1
+++ FileTestCondition.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -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;
@@ -19,7 +18,7 @@
* A condition that applies a set of file selectors to a file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="condition" name="file-test"
*/
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java
Index: IsEmptyFolderSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsEmptyFolderSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IsEmptyFolderSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ IsEmptyFolderSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -18,7 +17,7 @@
* A file selector that selects empty directories.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="is-empty-folder"
*/
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java
Index: IsFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IsFileSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ IsFileSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -18,7 +17,7 @@
* A file selector which only selects files, not folders.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="is-file"
*/
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java
Index: IsFolderSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/IsFolderSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IsFolderSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ IsFolderSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -18,7 +17,7 @@
* A file selector which only selects folders, not files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="is-folder"
*/
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java
Index: NotFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NotFileSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ NotFileSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -18,7 +17,7 @@
* A file selector that negates a nested file selector.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="not"
*/
1.4 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java
Index: OrFileSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/OrFileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OrFileSelector.java 3 Mar 2002 02:28:17 -0000 1.3
+++ OrFileSelector.java 4 Mar 2002 04:23:37 -0000 1.4
@@ -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;
@@ -18,7 +17,7 @@
* lazy evaluation. Returns true when no nested elements are supplied.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/03 02:28:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="v-file-selector" name="or"
*/
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileSelector.java
Index: FileSelector.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.antlib.vfile.selectors;
import org.apache.aut.vfs.FileObject;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.DataType;
/**
* Accepts files as part of a set.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:role shorthand="v-file-selector"
*/
public interface FileSelector
{
/**
* Accepts a file.
*
* @param path The virtual path associated with the file. May be null
* if such a path is not available.
* @param file The file to select.
* @param context The context to perform the selection in.
*/
boolean accept( FileObject file, String path, TaskContext context )
throws TaskException;
}
1.36 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DefaultProjectBuilder.java 3 Mar 2002 02:19:10 -0000 1.35
+++ DefaultProjectBuilder.java 4 Mar 2002 04:23:37 -0000 1.36
@@ -22,7 +22,7 @@
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;
@@ -36,7 +36,7 @@
* Default implementation to construct project from a build file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.35 $ $Date: 2002/03/03 02:19:10 $
+ * @version $Revision: 1.36 $ $Date: 2002/03/04 04:23:37 $
* @ant:type type="project-builder" name="xml"
* @ant:type type="project-builder" name="ant"
*/
1.29 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultWorkspace.java 3 Mar 2002 02:19:10 -0000 1.28
+++ DefaultWorkspace.java 4 Mar 2002 04:23:37 -0000 1.29
@@ -28,7 +28,7 @@
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;
@@ -45,7 +45,7 @@
* This is the default implementation of Workspace.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.28 $ $Date: 2002/03/03 02:19:10 $
+ * @version $Revision: 1.29 $ $Date: 2002/03/04 04:23:37 $
*/
public class DefaultWorkspace
extends AbstractLogEnabled
1.18 +2 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Pattern.java 3 Mar 2002 02:19:10 -0000 1.17
+++ Pattern.java 4 Mar 2002 04:23:37 -0000 1.18
@@ -13,12 +13,13 @@
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.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.17 $ $Date: 2002/03/03 02:19:10 $
+ * @version $Revision: 1.18 $ $Date: 2002/03/04 04:23:37 $
* @ant:data-type name="pattern"
*/
public class Pattern
1.2 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java
Index: AndCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/AndCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AndCondition.java 3 Mar 2002 02:19:11 -0000 1.1
+++ AndCondition.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -11,7 +11,6 @@
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. <p>
@@ -20,7 +19,7 @@
* false. An empty and condition returns true.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @ant:type type="condition" name="and"
*/
1.2 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
Index: IsSetCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IsSetCondition.java 3 Mar 2002 02:19:11 -0000 1.1
+++ IsSetCondition.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -9,7 +9,6 @@
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;
@@ -20,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/03 02:19:11 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:type type="condition" name="is-set"
*/
1.2 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
Index: NotCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotCondition.java 3 Mar 2002 02:19:11 -0000 1.1
+++ NotCondition.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -9,14 +9,13 @@
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
* it is false and vice versa.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @ant:type type="condition" name="not"
*/
1.2 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java
Index: OrCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/OrCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OrCondition.java 3 Mar 2002 02:19:11 -0000 1.1
+++ OrCondition.java 4 Mar 2002 04:23:37 -0000 1.2
@@ -11,7 +11,6 @@
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. <p>
@@ -20,7 +19,7 @@
* true. An empty container evaluates to true</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @ant:type type="condition" name="or"
*/
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/Condition.java
Index: Condition.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.framework.conditions;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
/**
* Class representing a condition.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/03/04 04:23:37 $
*
* @ant:role shorthand="condition"
*/
public interface Condition
{
/**
* Evaluates this condition.
*
* @param context
* The context to evaluate the condition in.
*/
boolean evaluate( final TaskContext context )
throws TaskException;
}
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java
Index: Target.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Target.java 7 Feb 2002 13:01:20 -0000 1.5
+++ Target.java 4 Mar 2002 04:23:38 -0000 1.6
@@ -9,13 +9,13 @@
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.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.5 $ $Date: 2002/02/07 13:01:20 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/04 04:23:38 $
*/
public class Target
{
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
Index: WaitFor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WaitFor.java 3 Mar 2002 02:19:10 -0000 1.7
+++ WaitFor.java 4 Mar 2002 04:23:38 -0000 1.8
@@ -11,7 +11,7 @@
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;
/**
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
Index: Equals.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Equals.java 3 Mar 2002 02:19:10 -0000 1.4
+++ Equals.java 4 Mar 2002 04:23:38 -0000 1.5
@@ -8,13 +8,13 @@
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.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
* @ant:type type="condition" nam="equals"
*/
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
Index: Http.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Http.java 3 Mar 2002 07:09:30 -0000 1.7
+++ Http.java 4 Mar 2002 04:23:38 -0000 1.8
@@ -14,7 +14,7 @@
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 -
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
Index: Socket.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Socket.java 3 Mar 2002 07:09:30 -0000 1.7
+++ Socket.java 4 Mar 2002 04:23:38 -0000 1.8
@@ -11,7 +11,7 @@
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)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
