bodewig 2003/01/27 05:29:03
Modified: src/main/org/apache/tools/ant/types ZipScanner.java
src/testcases/org/apache/tools/ant/taskdefs JarTest.java
Log:
ZIP-Entries always use forward slashes
Revision Changes Path
1.12 +3 -0
jakarta-ant/src/main/org/apache/tools/ant/types/ZipScanner.java
Index: ZipScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/ZipScanner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ZipScanner.java 27 Jan 2003 12:55:13 -0000 1.11
+++ ZipScanner.java 27 Jan 2003 13:29:03 -0000 1.12
@@ -258,6 +258,9 @@
return new Resource("", true, Long.MAX_VALUE, true);
}
+ // Zip-Entries always use forward slashes
+ name = name.replace(File.separatorChar, '/');
+
// first check if the archive needs to be scanned again
scanme();
if (myentries.containsKey(name)) {
1.14 +0 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JarTest.java 23 Jan 2003 11:40:13 -0000 1.13
+++ JarTest.java 27 Jan 2003 13:29:03 -0000 1.14
@@ -110,7 +110,6 @@
File jarFile = new File(getProjectDir(), tempJar);
long jarModifiedDate = jarFile.lastModified();
try {
- // give Windows a chance
Thread.currentThread().sleep(2500);
} catch (InterruptedException e) {
} // end of try-catch
@@ -140,7 +139,6 @@
private void testRecreate(String firstTarget, String secondTarget) {
executeTarget(firstTarget);
try {
- // give Windows a chance
Thread.currentThread().sleep(2500);
} catch (InterruptedException e) {
} // end of try-catch
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
