bodewig 2004/11/12 03:08:02
Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS
src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH
ProjectHelper2.java
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Ant.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_16_BRANCH JonasDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
Tag: ANT_16_BRANCH Extension.java LibFileSet.java
Specification.java
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH JUnitTestRunner.java
src/main/org/apache/tools/ant/taskdefs/optional/ssh Tag:
ANT_16_BRANCH SSHUserInfo.java
src/main/org/apache/tools/ant/taskdefs/optional/starteam
Tag: ANT_16_BRANCH TreeBasedTask.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
Assertions.java
src/main/org/apache/tools/ant/types/selectors/modifiedselector
Tag: ANT_16_BRANCH ModifiedSelector.java
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
OutputStreamFunneler.java
Log:
merge
Revision Changes Path
No revision
No revision
1.1.2.27 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- CONTRIBUTORS 5 Nov 2004 15:03:30 -0000 1.1.2.26
+++ CONTRIBUTORS 12 Nov 2004 11:08:00 -0000 1.1.2.27
@@ -16,6 +16,7 @@
Ben Galbraith
Benoit Moussaud
Brad Clark
+Brant Langer Gurganus
Brian Deitte
Brian Felder
Bruce Atherton
No revision
No revision
1.33.2.17 +1 -1
ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.33.2.16
retrieving revision 1.33.2.17
diff -u -r1.33.2.16 -r1.33.2.17
--- ProjectHelper2.java 26 Oct 2004 14:57:26 -0000 1.33.2.16
+++ ProjectHelper2.java 12 Nov 2004 11:08:00 -0000 1.33.2.17
@@ -528,7 +528,7 @@
/**
* The main handler - it handles the <project> tag.
*
- * @see AntHandler
+ * @see org.apache.tools.ant.helper.ProjectHelper2.AntHandler
*/
public static class MainHandler extends AntHandler {
No revision
No revision
1.92.2.9 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.92.2.8
retrieving revision 1.92.2.9
diff -u -r1.92.2.8 -r1.92.2.9
--- Ant.java 28 Jun 2004 07:47:06 -0000 1.92.2.8
+++ Ant.java 12 Nov 2004 11:08:00 -0000 1.92.2.9
@@ -327,7 +327,7 @@
// the build file if this is a top level task)?
if (thisAntFile != null
&& newProject.resolveFile(newProject.getProperty("ant.file"))
- .equals(getProject().resolveFile(thisAntFile))
+ .equals(getProject().resolveFile(thisAntFile))
&& getOwningTarget() != null) {
if (getOwningTarget().getName().equals("")) {
No revision
No revision
1.11.2.5 +11 -11
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
Index: JonasDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- JonasDeploymentTool.java 9 Mar 2004 17:01:45 -0000 1.11.2.4
+++ JonasDeploymentTool.java 12 Nov 2004 11:08:01 -0000 1.11.2.5
@@ -192,7 +192,7 @@
/* -------------------- */
/**
- * Set the [EMAIL PROTECTED] #keepgenerated} flag.
+ * Sets the <code>keepgenerated</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
@@ -201,7 +201,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #additionalargs}.
+ * Sets the additional arguments.
*
* @param aString additional args.
*/
@@ -210,7 +210,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #nocompil} flag.
+ * Sets the <code>nocompil</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
@@ -219,7 +219,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #novalidation} flag.
+ * Sets the <code>novalidation</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
@@ -228,7 +228,7 @@
}
/**
- * Set the java compiler [EMAIL PROTECTED] #javac} to use.
+ * Sets the java compiler to use.
*
* @param aString the java compiler.
*/
@@ -255,7 +255,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #secpropag} flag.
+ * Sets the <code>secpropag</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
@@ -264,7 +264,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #verbose} flag.
+ * Sets the <code>verbose</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
@@ -286,7 +286,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #keepgeneric} flag.
+ * Sets the <code>keepgeneric</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
@@ -295,7 +295,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #suffix jar suffix}.
+ * Sets the jar suffix.
*
* @param aString the string to use as the suffix.
*/
@@ -304,7 +304,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #orb} to construct classpath.
+ * Sets the <code>orb</code> to construct classpath.
*
* @param aString 'RMI', 'JEREMIE', or 'DAVID'.
*/
@@ -313,7 +313,7 @@
}
/**
- * Set the [EMAIL PROTECTED] #nogenic} flag.
+ * Sets the <code>nogenic</code> flag.
*
* @param aBoolean <code>true</code> if the flag must be set.
*/
No revision
No revision
1.8.2.6 +1 -9
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
Index: Extension.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -r1.8.2.5 -r1.8.2.6
--- Extension.java 5 Nov 2004 15:03:30 -0000 1.8.2.5
+++ Extension.java 12 Nov 2004 11:08:01 -0000 1.8.2.6
@@ -38,7 +38,6 @@
public final class Extension {
/**
* Manifest Attribute Name object for EXTENSION_LIST.
- * @see Attributes.Name#EXTENSION_LIST
*/
public static final Attributes.Name EXTENSION_LIST
= new Attributes.Name("Extension-List");
@@ -58,48 +57,41 @@
/**
* Manifest Attribute Name object for EXTENSION_NAME.
- * @see Attributes.Name#EXTENSION_NAME
*/
public static final Attributes.Name EXTENSION_NAME =
new Attributes.Name("Extension-Name");
/**
* Manifest Attribute Name object for SPECIFICATION_VERSION.
- * @see Attributes.Name#SPECIFICATION_VERSION
*/
public static final Attributes.Name SPECIFICATION_VERSION
= Attributes.Name.SPECIFICATION_VERSION;
/**
* Manifest Attribute Name object for SPECIFICATION_VENDOR.
- * @see Attributes.Name#SPECIFICATION_VENDOR
*/
public static final Attributes.Name SPECIFICATION_VENDOR
= Attributes.Name.SPECIFICATION_VENDOR;
/**
* Manifest Attribute Name object for IMPLEMENTATION_VERSION.
- * @see Attributes.Name#IMPLEMENTATION_VERSION
*/
public static final Attributes.Name IMPLEMENTATION_VERSION
= Attributes.Name.IMPLEMENTATION_VERSION;
/**
* Manifest Attribute Name object for IMPLEMENTATION_VENDOR.
- * @see Attributes.Name#IMPLEMENTATION_VENDOR
*/
public static final Attributes.Name IMPLEMENTATION_VENDOR
= Attributes.Name.IMPLEMENTATION_VENDOR;
/**
* Manifest Attribute Name object for IMPLEMENTATION_URL.
- * @see Attributes.Name#IMPLEMENTATION_URL
*/
public static final Attributes.Name IMPLEMENTATION_URL
= new Attributes.Name("Implementation-URL");
/**
* Manifest Attribute Name object for IMPLEMENTATION_VENDOR_ID.
- * @see Attributes.Name#IMPLEMENTATION_VENDOR_ID
*/
public static final Attributes.Name IMPLEMENTATION_VENDOR_ID
= new Attributes.Name("Implementation-Vendor-Id");
1.3.2.5 +1 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
Index: LibFileSet.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- LibFileSet.java 9 Mar 2004 17:01:45 -0000 1.3.2.4
+++ LibFileSet.java 12 Nov 2004 11:08:01 -0000 1.3.2.5
@@ -63,7 +63,6 @@
* Defaults to false.
*
* @param includeURL the flag
- * @see #includeURL
*/
public void setIncludeUrl(boolean includeURL) {
this.includeURL = includeURL;
@@ -75,7 +74,6 @@
* Defaults to false.
*
* @param includeImpl the flag
- * @see #includeImpl
*/
public void setIncludeImpl(boolean includeImpl) {
this.includeImpl = includeImpl;
@@ -85,7 +83,6 @@
* Set the url base for fileset.
*
* @param urlBase the base url
- * @see #urlBase
*/
public void setUrlBase(String urlBase) {
this.urlBase = urlBase;
1.4.2.6 +1 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
Index: Specification.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- Specification.java 14 Apr 2004 15:42:41 -0000 1.4.2.5
+++ Specification.java 12 Nov 2004 11:08:01 -0000 1.4.2.6
@@ -39,42 +39,36 @@
public final class Specification {
/**
* Manifest Attribute Name object for SPECIFICATION_TITLE.
- * @see Attributes.Name#SPECIFICATION_TITLE
*/
public static final Attributes.Name SPECIFICATION_TITLE
= Attributes.Name.SPECIFICATION_TITLE;
/**
* Manifest Attribute Name object for SPECIFICATION_VERSION.
- * @see Attributes.Name#SPECIFICATION_VERSION
*/
public static final Attributes.Name SPECIFICATION_VERSION
= Attributes.Name.SPECIFICATION_VERSION;
/**
* Manifest Attribute Name object for SPECIFICATION_VENDOR.
- * @see Attributes.Name#SPECIFICATION_VENDOR
*/
public static final Attributes.Name SPECIFICATION_VENDOR
= Attributes.Name.SPECIFICATION_VENDOR;
/**
* Manifest Attribute Name object for IMPLEMENTATION_TITLE.
- * @see Attributes.Name#IMPLEMENTATION_TITLE
*/
public static final Attributes.Name IMPLEMENTATION_TITLE
= Attributes.Name.IMPLEMENTATION_TITLE;
/**
* Manifest Attribute Name object for IMPLEMENTATION_VERSION.
- * @see Attributes.Name#IMPLEMENTATION_VERSION
*/
public static final Attributes.Name IMPLEMENTATION_VERSION
= Attributes.Name.IMPLEMENTATION_VERSION;
/**
* Manifest Attribute Name object for IMPLEMENTATION_VENDOR.
- * @see Attributes.Name#IMPLEMENTATION_VENDOR
*/
public static final Attributes.Name IMPLEMENTATION_VENDOR
= Attributes.Name.IMPLEMENTATION_VENDOR;
No revision
No revision
1.42.2.7 +9 -9
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
retrieving revision 1.42.2.6
retrieving revision 1.42.2.7
diff -u -r1.42.2.6 -r1.42.2.7
--- JUnitTestRunner.java 16 Apr 2004 07:05:32 -0000 1.42.2.6
+++ JUnitTestRunner.java 12 Nov 2004 11:08:01 -0000 1.42.2.7
@@ -391,7 +391,7 @@
}
/**
- * @see Task#handleInput(byte[], int, int)
+ * @see org.apache.tools.ant.Task#handleInput(byte[], int, int)
*
* @since Ant 1.6
*/
@@ -521,7 +521,7 @@
int returnCode = SUCCESS;
if (multipleTests) {
try {
- java.io.BufferedReader reader =
+ java.io.BufferedReader reader =
new java.io.BufferedReader(new
java.io.FileReader(args[0]));
String testCaseName;
int code = 0;
@@ -534,19 +534,19 @@
JUnitTest t = new JUnitTest(testCaseName);
t.setTodir(new File(st.nextToken()));
t.setOutfile(st.nextToken());
- code = launch(t, haltError, stackfilter, haltFail,
+ code = launch(t, haltError, stackfilter, haltFail,
showOut, props);
errorOccured = (code == ERRORS);
failureOccured = (code != SUCCESS);
if (errorOccured || failureOccured ) {
- if ((errorOccured && haltError)
+ if ((errorOccured && haltError)
|| (failureOccured && haltFail)) {
System.exit(code);
} else {
if (code > returnCode) {
returnCode = code;
}
- System.out.println("TEST " + t.getName()
+ System.out.println("TEST " + t.getName()
+ " FAILED");
}
}
@@ -569,8 +569,8 @@
for (int i = 0; i < fromCmdLine.size(); i++) {
FormatterElement fe = (FormatterElement)
fromCmdLine.elementAt(i);
if (multipleTests && fe.getUseFile()) {
- File destFile =
- new File(test.getTodir(),
+ File destFile =
+ new File(test.getTodir(),
test.getOutfile() + fe.getExtension());
fe.setOutfile(destFile);
}
@@ -645,10 +645,10 @@
* @since Ant 1.6.2
*/
private static int launch(JUnitTest t, boolean haltError,
- boolean stackfilter, boolean haltFail,
+ boolean stackfilter, boolean haltFail,
boolean showOut, Properties props) {
t.setProperties(props);
- JUnitTestRunner runner =
+ JUnitTestRunner runner =
new JUnitTestRunner(t, haltError, stackfilter, haltFail,
showOut);
runner.forked = true;
transferFormatters(runner, t);
No revision
No revision
1.3.2.6 +12 -17
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
Index: SSHUserInfo.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- SSHUserInfo.java 9 Mar 2004 17:01:53 -0000 1.3.2.5
+++ SSHUserInfo.java 12 Nov 2004 11:08:01 -0000 1.3.2.6
@@ -42,35 +42,42 @@
}
/**
- * @see com.jcraft.jsch.UserInfo#getName()
+ * Gets the user name.
+ * @return the user name
*/
public String getName() {
return name;
}
/**
- * @see com.jcraft.jsch.UserInfo#getPassphrase(String)
+ * Gets the pass phrase of the user.
+ * @param message a message
+ * @return the passphrase
*/
public String getPassphrase(String message) {
return passphrase;
}
/**
- * @see com.jcraft.jsch.UserInfo#getPassword()
+ * Gets the user's password.
+ * @return the user's password
*/
public String getPassword() {
return password;
}
/**
- * @see com.jcraft.jsch.UserInfo#prompt(String)
+ * Prompts a string.
+ * @param str the string
+ * @return whether the string was prompted
*/
public boolean prompt(String str) {
return false;
}
/**
- * @see com.jcraft.jsch.UserInfo#retry()
+ * Indicates whether a retry was done.
+ * @return whether a retry was done
*/
public boolean retry() {
return false;
@@ -139,16 +146,10 @@
this.keyfile = keyfile;
}
- /**
- * @see com.jcraft.jsch.UserInfo#promptPassphrase(String)
- */
public boolean promptPassphrase(String message) {
return true;
}
- /**
- * @see com.jcraft.jsch.UserInfo#promptPassword(String)
- */
public boolean promptPassword(String passwordPrompt) {
//log(passwordPrompt, Project.MSG_DEBUG);
if (firstTime) {
@@ -158,17 +159,11 @@
return firstTime;
}
- /**
- * @see com.jcraft.jsch.UserInfo#promptYesNo(String)
- */
public boolean promptYesNo(String message) {
//log(prompt, Project.MSG_DEBUG);
return trustAllCertificates;
}
- /**
- * @see com.jcraft.jsch.UserInfo#showMessage(String)
- */
public void showMessage(String message) {
//log(message, Project.MSG_DEBUG);
}
No revision
No revision
1.20.2.7 +0 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
Index: TreeBasedTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -u -r1.20.2.6 -r1.20.2.7
--- TreeBasedTask.java 14 Apr 2004 15:42:41 -0000 1.20.2.6
+++ TreeBasedTask.java 12 Nov 2004 11:08:01 -0000 1.20.2.7
@@ -170,8 +170,6 @@
* @param rootLocalFolder
* the local folder that will mirror
* this.rootStarteamFolder
- *
- * @see rootLocalFolder
*/
public void setRootLocalFolder(String rootLocalFolder) {
this.rootLocalFolder = rootLocalFolder;
@@ -185,7 +183,6 @@
* or null if not specified.
*
* @return the local folder that mirrors this.rootStarteamFolder
- * @see rootLocalFolder
*/
public String getRootLocalFolder() {
return this.rootLocalFolder;
No revision
No revision
1.6.2.8 +1 -1 ant/src/main/org/apache/tools/ant/types/Assertions.java
Index: Assertions.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -r1.6.2.7 -r1.6.2.8
--- Assertions.java 20 Apr 2004 06:53:29 -0000 1.6.2.7
+++ Assertions.java 12 Nov 2004 11:08:01 -0000 1.6.2.8
@@ -206,7 +206,7 @@
/**
* add the assertions to a list in a format suitable
* for adding to a command line
- * @param commandList
+ * @param commandIterator list of commands
*/
public void applyAssertions(final ListIterator commandIterator) {
getProject().log("Applying assertions", Project.MSG_DEBUG);
No revision
No revision
1.1.2.6 +1 -1
ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
Index: ModifiedSelector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ModifiedSelector.java 9 Mar 2004 17:01:57 -0000 1.1.2.5
+++ ModifiedSelector.java 12 Nov 2004 11:08:02 -0000 1.1.2.6
@@ -471,7 +471,7 @@
* Defined in org.apache.tools.ant.types.Parameterizable.
* Overwrite implementation in superclass because only special
* parameters are valid.
- * @see #addParam(String,String).
+ * @see #addParam(String,Object).
*/
public void setParameters(Parameter[] parameters) {
if (parameters != null) {
No revision
No revision
1.1.2.2 +2 -2
ant/src/main/org/apache/tools/ant/util/OutputStreamFunneler.java
Index: OutputStreamFunneler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/OutputStreamFunneler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- OutputStreamFunneler.java 23 Jun 2004 19:30:14 -0000 1.1.2.1
+++ OutputStreamFunneler.java 12 Nov 2004 11:08:02 -0000 1.1.2.2
@@ -31,7 +31,7 @@
/**
* Default timeout.
- * @see #setTimeout()
+ * @see #setTimeout(long)
*/
public static final long DEFAULT_TIMEOUT_MILLIS = 1000;
@@ -97,7 +97,7 @@
* specified timeout value.
* @param out <CODE>OutputStream</CODE>.
* @param timeoutMillis <CODE>long</CODE>.
- * @see #setTimeout()
+ * @see #setTimeout(long)
*/
public OutputStreamFunneler(OutputStream out, long timeoutMillis) {
if (out == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
