bodewig 2002/11/15 03:33:31
Modified: docs/manual/OptionalTasks Tag: ANT_15_BRANCH icontract.html
src/main/org/apache/tools/ant/taskdefs/optional Tag:
ANT_15_BRANCH IContract.java
Log:
merge fix for PR13972 from HEAD
Revision Changes Path
No revision
No revision
1.9.2.1 +2 -2 jakarta-ant/docs/manual/OptionalTasks/icontract.html
Index: icontract.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/OptionalTasks/icontract.html,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- icontract.html 3 Feb 2002 22:09:09 -0000 1.9
+++ icontract.html 15 Nov 2002 11:33:31 -0000 1.9.2.1
@@ -50,7 +50,7 @@
<td valign="top" align="center">No</td>
</tr>
<tr>
- <td valign="top">repositorybuilddir</td>
+ <td valign="top">repbuilddir</td>
<td valign="top">Indicates where the compiled repository classes should
go.
Defaults to the value of repositorydir.</td>
<td valign="top" align="center">No</td>
@@ -159,7 +159,7 @@
</pre>
<hr>
-<p align="center">Copyright © 2001 Apache Software Foundation. All
rights
+<p align="center">Copyright © 2001-2002 Apache Software Foundation. All
rights
Reserved.</p>
</body>
No revision
No revision
1.9.2.2 +4 -4
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
Index: IContract.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- IContract.java 22 Jun 2002 23:40:21 -0000 1.9.2.1
+++ IContract.java 15 Nov 2002 11:33:31 -0000 1.9.2.2
@@ -121,7 +121,7 @@
* <td valign="top" align="center">No</td>
* </tr>
* <tr>
- * <td valign="top">repositorybuilddir</td>
+ * <td valign="top">repbuilddir</td>
* <td valign="top">Indicates where the compiled repository classes
should go.
* Defaults to the value of repositorydir.</td>
* <td valign="top" align="center">No</td>
@@ -536,7 +536,7 @@
// Prepare the directories for iContract. iContract will make
them if they
// don't exist, but for some reason I don't know, it will
complain about the REP files
// afterwards
- Mkdir mkdir = (Mkdir) project.createTask("mkdir");
+ Mkdir mkdir = (Mkdir) getProject().createTask("mkdir");
mkdir.setDir(instrumentDir);
mkdir.execute();
@@ -549,7 +549,7 @@
Path baseClasspath = createClasspath();
// Might need to add the core classes if we're not using Sun's
Javac (like Jikes)
- String compiler = project.getProperty("build.compiler");
+ String compiler = getProject().getProperty("build.compiler");
ClasspathHelper classpathHelper = new ClasspathHelper(compiler);
classpathHelper.modify(baseClasspath);
@@ -586,7 +586,7 @@
iContractClasspath.append(new Path(getProject(),
buildDir.getAbsolutePath()));
// Create a forked java process
- Java iContract = (Java) project.createTask("java");
+ Java iContract = (Java) getProject().createTask("java");
iContract.setTaskName(getTaskName());
iContract.setFork(true);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
