You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by eh...@apache.org on 2003/02/04 17:52:53 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce P4Fstat.java P4Integrate.java P4Resolve.java
ehatcher 2003/02/04 08:52:53
Modified: src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Fstat.java P4Integrate.java P4Resolve.java
Log:
adding category to Perforce tasks
Revision Changes Path
1.2 +9 -7 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java
Index: P4Fstat.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- P4Fstat.java 30 Jan 2003 14:42:03 -0000 1.1
+++ P4Fstat.java 4 Feb 2003 16:52:52 -0000 1.2
@@ -69,7 +69,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
-/**
+/**
* P4Fstat - find out which files are under Perforce control and which are not.
*
* <br><b>Example Usage:</b><br>
@@ -85,7 +85,9 @@
*
* @author <A HREF="mailto:miha@softhome.net">Miha</A>
* @author <A HREF="mailto:leslie.hughes@rubus.com">Les Hughes</A>
- * @author <A HREF="mailto:ashundi@tibco.com">Anli Shundi</A>
+ * @author <A HREF="mailto:ashundi@tibco.com">Anli Shundi</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Fstat extends P4Base {
@@ -103,9 +105,9 @@
private int doneFileNum = 0;
private boolean debug = false;
- private static final String EXISTING_HEADER
+ private static final String EXISTING_HEADER
= "Following files exist in perforce";
- private static final String NONEXISTING_HEADER
+ private static final String NONEXISTING_HEADER
= "Following files do not exist in perforce";
@@ -117,7 +119,7 @@
} else if (filter.equalsIgnoreCase("non-existing")) {
show = SHOW_NON_EXISTING;
} else {
- throw new BuildException("P4Fstat: ShowFilter should be one of: "
+ throw new BuildException("P4Fstat: ShowFilter should be one of: "
+ "all, existing, non-existing");
}
}
@@ -125,7 +127,7 @@
public void setChangelist(int changelist) throws BuildException {
if (changelist <= 0) {
- throw new BuildException("P4FStat: Changelist# should be a "
+ throw new BuildException("P4FStat: Changelist# should be a "
+ "positive number");
}
@@ -203,7 +205,7 @@
private void execP4Fstat(StringBuffer list) {
if (debug) {
- log("Executing fstat " + P4CmdOpts + " " + addCmd + list + "\n",
+ log("Executing fstat " + P4CmdOpts + " " + addCmd + list + "\n",
Project.MSG_INFO);
}
execP4Command("fstat " + P4CmdOpts + " " + addCmd + list, handler);
1.3 +1 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java
Index: P4Integrate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- P4Integrate.java 4 Feb 2003 13:13:38 -0000 1.2
+++ P4Integrate.java 4 Feb 2003 16:52:52 -0000 1.3
@@ -71,6 +71,7 @@
*
* @author <A HREF="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</A>
*
+ * @ant.task category="scm"
*/
public class P4Integrate extends P4Base {
1.3 +3 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java
Index: P4Resolve.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- P4Resolve.java 4 Feb 2003 13:13:38 -0000 1.2
+++ P4Resolve.java 4 Feb 2003 16:52:52 -0000 1.3
@@ -61,6 +61,9 @@
import org.apache.tools.ant.BuildException;
+/**
+ * @ant.task category="scm"
+ */
public class P4Resolve extends P4Base{
private String resolvemode = null;