bodewig 2004/11/05 07:14:25
Modified: src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
XMLCatalog.java
src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka
Tag: ANT_16_BRANCH XMLReportTest.java
Log:
merge
Revision Changes Path
No revision
No revision
1.32.2.7 +1 -1 ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.32.2.6
retrieving revision 1.32.2.7
diff -u -r1.32.2.6 -r1.32.2.7
--- XMLCatalog.java 9 Mar 2004 17:01:55 -0000 1.32.2.6
+++ XMLCatalog.java 5 Nov 2004 15:14:25 -0000 1.32.2.7
@@ -679,7 +679,7 @@
}
if (url != null) {
- String fileName = url.getFile();
+ String fileName = fileUtils.fromURI(url.toString());
if (fileName != null) {
log("fileName " + fileName, Project.MSG_DEBUG);
File resFile = new File(fileName);
No revision
No revision
1.3.2.5 +5 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java
Index: XMLReportTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReportTest.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- XMLReportTest.java 9 Mar 2004 17:02:07 -0000 1.3.2.4
+++ XMLReportTest.java 5 Nov 2004 15:14:25 -0000 1.3.2.5
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.FileUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -36,6 +37,9 @@
* Ensure that reference classpath feature is working fine...
*/
public class XMLReportTest extends TestCase {
+ /** helper for some File/URL connversions */
+ private static FileUtils fileUtils = FileUtils.newFileUtils();
+
public XMLReportTest(String s) {
super(s);
}
@@ -45,7 +49,7 @@
if (url == null) {
throw new FileNotFoundException("Unable to load '" + name + "'
from classpath");
}
- return new File(url.getFile());
+ return new File(fileUtils.fromURI(url.toString()));
}
public void testCreateDocument() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
