bodewig 2002/12/03 06:53:43
Modified: docs Tag: ANT_15_BRANCH index.html
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_15_BRANCH ConcatTest.java
xdocs Tag: ANT_15_BRANCH index.xml
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.234.2.6 +6 -3 jakarta-ant/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/index.html,v
retrieving revision 1.234.2.5
retrieving revision 1.234.2.6
diff -u -r1.234.2.5 -r1.234.2.6
--- index.html 28 Nov 2002 09:42:42 -0000 1.234.2.5
+++ index.html 3 Dec 2002 14:53:41 -0000 1.234.2.6
@@ -187,11 +187,14 @@
</p>
<ul>
<li><a href="http://www.apache.org/dist/ant/binaries/";>
- Download the binary release</a></li>
+ Download the binary release</a>
+ [<a href="http://www.apache.org/dyn/closer.cgi/ant/binaries/";>from
a mirror</a>]</li>
<li><a href="http://www.apache.org/dist/ant/source/";>
- Download the source release</a></li>
+ Download the source release</a>
+ [<a href="http://www.apache.org/dyn/closer.cgi/ant/source/";>from a
mirror</a>]</li>
<li><a href="http://www.apache.org/dist/ant/binaries/rpms/";>
- Download source or binary RPMs</a></li>
+ Download source or binary RPMs</a>
+ [<a
href="http://www.apache.org/dyn/closer.cgi/ant/binaries/rpms/";>from a
mirror</a>]</li>
</ul>
</blockquote>
</td></tr>
No revision
No revision
1.1.2.2 +3 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java
Index: ConcatTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ConcatTest.java 8 Nov 2002 13:20:10 -0000 1.1.2.1
+++ ConcatTest.java 3 Dec 2002 14:53:42 -0000 1.1.2.2
@@ -162,8 +162,9 @@
}
public void test6() {
- expectLogContaining("test6",
- "src/etc/testcases/taskdefs/thisfiledoesnotexist
does not exist.");
+ String filename = "src/etc/testcases/taskdefs/thisfiledoesnotexist"
+ .replace('/', File.separatorChar);
+ expectLogContaining("test6", filename +" does not exist.");
}
}
No revision
No revision
1.20.2.6 +6 -3 jakarta-ant/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/xdocs/index.xml,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- index.xml 28 Nov 2002 09:42:42 -0000 1.20.2.5
+++ index.xml 3 Dec 2002 14:53:42 -0000 1.20.2.6
@@ -83,11 +83,14 @@
</p>
<ul>
<li><a href="http://www.apache.org/dist/ant/binaries/";>
- Download the binary release</a></li>
+ Download the binary release</a>
+ [<a href="http://www.apache.org/dyn/closer.cgi/ant/binaries/";>from
a mirror</a>]</li>
<li><a href="http://www.apache.org/dist/ant/source/";>
- Download the source release</a></li>
+ Download the source release</a>
+ [<a href="http://www.apache.org/dyn/closer.cgi/ant/source/";>from a
mirror</a>]</li>
<li><a href="http://www.apache.org/dist/ant/binaries/rpms/";>
- Download source or binary RPMs</a></li>
+ Download source or binary RPMs</a>
+ [<a
href="http://www.apache.org/dyn/closer.cgi/ant/binaries/rpms/";>from a
mirror</a>]</li>
</ul>
</section>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
