donaldp 02/01/20 01:56:07
Modified: proposal/myrmidon/src/java/org/apache/antlib/xml
XMLValidateTask.java XSLTProcess.java
Log:
Moved some path manipulation utilities into PathUtils
Revision Changes Path
1.13 +3 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLValidateTask.java 15 Jan 2002 09:51:07 -0000 1.12
+++ XMLValidateTask.java 20 Jan 2002 09:56:07 -0000 1.13
@@ -24,6 +24,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PathUtil;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
@@ -334,7 +335,8 @@
Class readerClass = null;
if( m_classpath != null )
{
- final ClassLoader classLoader = new URLClassLoader(
m_classpath.toURLs() );
+ final URL[] urls = PathUtil.toURLs( m_classpath );
+ final ClassLoader classLoader = new URLClassLoader( urls );
readerClass = classLoader.loadClass( m_readerClassName );
}
else
1.13 +4 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSLTProcess.java 15 Jan 2002 09:51:07 -0000 1.12
+++ XSLTProcess.java 20 Jan 2002 09:56:07 -0000 1.13
@@ -9,12 +9,14 @@
import java.io.File;
import java.net.URLClassLoader;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PathUtil;
/**
* A Task to process via XSLT a set of XML documents. This is useful for
@@ -381,7 +383,8 @@
}
else
{
- final ClassLoader classLoader = new URLClassLoader(
m_classpath.toURLs() );
+ final URL[] urls = PathUtil.toURLs( m_classpath );
+ final ClassLoader classLoader = new URLClassLoader( urls );
return classLoader.loadClass( classname );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
