ehatcher 2003/02/04 07:45:22
Modified: src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Add.java P4Base.java P4Change.java P4Counter.java
P4Delete.java P4Edit.java P4Have.java P4Label.java
P4Reopen.java P4Revert.java P4Submit.java
P4Sync.java
Log:
adding category to Perforce tasks
Revision Changes Path
1.11 +5 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
Index: P4Add.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- P4Add.java 25 Jul 2002 15:21:18 -0000 1.10
+++ P4Add.java 4 Feb 2003 15:45:21 -0000 1.11
@@ -51,7 +51,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-/*
+/*
* Portions of this software are based upon public domain software
* originally written at the National Center for Supercomputing Applications,
* University of Illinois, Urbana-Champaign.
@@ -79,6 +79,8 @@
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
* @author <A HREF="mailto:[EMAIL PROTECTED]">Anli Shundi</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Add extends P4Base {
@@ -89,11 +91,11 @@
/**
* positive integer specifying the maximum length
- * of the commandline when calling Perforce to add the files.
+ * of the commandline when calling Perforce to add the files.
* Defaults to 450, higher values mean faster execution,
* but also possible failures.
*/
-
+
public void setCommandlength(int len) throws BuildException {
if (len <= 0) {
throw new BuildException("P4Add: Commandlength should be a
positive number");
1.21 +3 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- P4Base.java 28 Jan 2003 14:15:56 -0000 1.20
+++ P4Base.java 4 Feb 2003 15:45:21 -0000 1.21
@@ -108,7 +108,7 @@
protected String P4CmdOpts = "";
//Setters called by Ant
-
+
/**
* The p4d server and port to connect to;
* optional, default "perforce:1666"
@@ -152,13 +152,13 @@
/**
* Set extra command options; only used on some
* of the Perforce tasks.
- */
+ */
public void setCmdopts(String P4CmdOpts) {
this.P4CmdOpts = P4CmdOpts;
}
/**
- * whether to stop the build (true, default)
+ * whether to stop the build (true, default)
* or keep going if an error is returned from the p4 command
*/
public void setFailonerror(boolean fail) {
1.14 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
Index: P4Change.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- P4Change.java 23 Jul 2002 07:54:55 -0000 1.13
+++ P4Change.java 4 Feb 2003 15:45:21 -0000 1.14
@@ -62,17 +62,18 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-/**
+/**
* Requests a new changelist from the Perforce server.
* P4Change creates a new changelist in perforce. P4Change sets the property
* ${p4.change} with the new changelist number. This should then be passed
into
* p4edit and p4submit.
- *
+ *
*
* @see P4Edit
* @see P4Submit
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
*
+ * @ant.task category="scm"
*/
public class P4Change extends P4Base {
1.9 +4 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
Index: P4Counter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- P4Counter.java 23 Jul 2002 07:54:55 -0000 1.8
+++ P4Counter.java 4 Feb 2003 15:45:21 -0000 1.9
@@ -62,7 +62,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-/**
+/**
* Obtains or sets the value of a counter.
*
* <p> When used in its base form
@@ -77,10 +77,12 @@
* The user performing this task must have Perforce "review"
permissions
* as defined by Perforce protections in order for this task to succeed.
</P>
-
+
* Example Usage:<br>
* <p4counter name="${p4.counter}" property=${p4.change}"/>
* @author <a href="mailto:[EMAIL PROTECTED]">Kirk Wylie</a>
+ *
+ * @ant.task category="scm"
*/
public class P4Counter extends P4Base {
1.7 +3 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java
Index: P4Delete.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- P4Delete.java 9 Jul 2002 21:06:09 -0000 1.6
+++ P4Delete.java 4 Feb 2003 15:45:21 -0000 1.7
@@ -66,6 +66,8 @@
* (See also [EMAIL PROTECTED] P4Edit P4Edit})?<br>
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Mike Roberts</A>, <A
HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Delete extends P4Base {
@@ -74,7 +76,7 @@
/**
* An existing changelist number for the deletion; optional
* but strongly recommended.
- */
+ */
public void setChange(String change) {
this.change = change;
}
1.11 +6 -4
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java
Index: P4Edit.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- P4Edit.java 9 Jul 2002 21:06:09 -0000 1.10
+++ P4Edit.java 4 Feb 2003 15:45:21 -0000 1.11
@@ -61,17 +61,19 @@
import org.apache.tools.ant.BuildException;
-/**
- * Open file(s) for edit.
+/**
+ * Open file(s) for edit.
* P4Change should be used to obtain a new changelist for P4Edit as,
- * although P4Edit can open files to the default change,
+ * although P4Edit can open files to the default change,
* P4Submit cannot yet submit to it.
* Example Usage:<br>
* <p4edit change="${p4.change}" view="//depot/project/foo.txt" />
- *
+ *
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
*
* @todo Should call reopen if file is already open in one of our
changelists perhaps?
+ *
+ * @ant.task category="scm"
*/
public class P4Edit extends P4Base {
1.9 +2 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java
Index: P4Have.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- P4Have.java 9 Jul 2002 21:06:10 -0000 1.8
+++ P4Have.java 4 Feb 2003 15:45:21 -0000 1.9
@@ -67,6 +67,8 @@
* P4Have simply dumps the current file version info into
* the Ant log (or stdout).
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Have extends P4Base {
1.15 +5 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java
Index: P4Label.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- P4Label.java 30 Jan 2003 09:09:54 -0000 1.14
+++ P4Label.java 4 Feb 2003 15:45:21 -0000 1.15
@@ -77,6 +77,8 @@
* </pre>
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Label extends P4Base {
@@ -120,7 +122,7 @@
}
if (desc == null || desc.length() < 1) {
- log("Label Description not set, assuming 'AntLabel'",
+ log("Label Description not set, assuming 'AntLabel'",
Project.MSG_WARN);
desc = "AntLabel";
}
@@ -130,7 +132,7 @@
}
if (name == null || name.length() < 1) {
- SimpleDateFormat formatter
+ SimpleDateFormat formatter
= new SimpleDateFormat("yyyy.MM.dd-hh:mm");
Date now = new Date();
name = "AntLabel-" + formatter.format(now);
@@ -162,7 +164,7 @@
});
- log("Created Label " + name + " (" + desc + ") with view:\n" +
P4View,
+ log("Created Label " + name + " (" + desc + ") with view:\n" +
P4View,
Project.MSG_INFO);
//Now lock if required
1.9 +3 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java
Index: P4Reopen.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- P4Reopen.java 9 Jul 2002 21:06:10 -0000 1.8
+++ P4Reopen.java 4 Feb 2003 15:45:21 -0000 1.9
@@ -61,10 +61,12 @@
import org.apache.tools.ant.BuildException;
-/*
+/**
* Reopen Perforce checkout files between changelists.
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Reopen extends P4Base {
1.9 +2 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java
Index: P4Revert.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- P4Revert.java 9 Jul 2002 21:06:10 -0000 1.8
+++ P4Revert.java 4 Feb 2003 15:45:21 -0000 1.9
@@ -65,6 +65,8 @@
* Revert Perforce open files or files in a changelist
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Revert extends P4Base {
1.13 +1 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java
Index: P4Submit.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- P4Submit.java 4 Feb 2003 13:13:38 -0000 1.12
+++ P4Submit.java 4 Feb 2003 15:45:21 -0000 1.13
@@ -74,6 +74,7 @@
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
*
+ * @ant.task category="scm"
*/
public class P4Submit extends P4Base {
1.10 +2 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java
Index: P4Sync.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- P4Sync.java 9 Jul 2002 21:06:10 -0000 1.9
+++ P4Sync.java 4 Feb 2003 15:45:21 -0000 1.10
@@ -79,6 +79,8 @@
* @todo Add decent label error handling for non-exsitant labels
*
* @author <A HREF="mailto:[EMAIL PROTECTED]">Les Hughes</A>
+ *
+ * @ant.task category="scm"
*/
public class P4Sync extends P4Base {
