donaldp 02/01/20 01:54:08
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
ExecuteJava.java Property.java Rmic.java
SQLExec.java
Log:
Moved toURL from Path to PathUtils
Revision Changes Path
1.10 +2 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExecuteJava.java 12 Jan 2002 04:57:14 -0000 1.9
+++ ExecuteJava.java 20 Jan 2002 09:54:08 -0000 1.10
@@ -15,6 +15,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.SysProperties;
+import org.apache.tools.ant.types.PathUtil;
/*
* @author [EMAIL PROTECTED]
@@ -63,7 +64,7 @@
}
else
{
- final URL[] urls = m_classpath.toURLs();
+ final URL[] urls = PathUtil.toURLs( m_classpath );
final URLClassLoader classLoader = new URLClassLoader( urls
);
target = classLoader.loadClass( classname );
}
1.26 +2 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Property.java 17 Jan 2002 08:04:54 -0000 1.25
+++ Property.java 20 Jan 2002 09:54:08 -0000 1.26
@@ -17,6 +17,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PathUtil;
/**
* Will set a Project property. Used to be a hack in ProjectHelper Will not
@@ -128,7 +129,7 @@
if( m_classpath != null )
{
- final URL[] urls = m_classpath.toURLs();
+ final URL[] urls = PathUtil.toURLs( m_classpath );
classLoader = new URLClassLoader( urls );
}
else
1.25 +4 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Rmic.java 20 Jan 2002 02:36:20 -0000 1.24
+++ Rmic.java 20 Jan 2002 09:54:08 -0000 1.25
@@ -10,6 +10,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URLClassLoader;
+import java.net.URL;
import java.rmi.Remote;
import java.util.ArrayList;
import org.apache.avalon.excalibur.io.FileUtil;
@@ -20,6 +21,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.mappers.FileNameMapper;
import org.apache.tools.ant.types.SourceFileScanner;
+import org.apache.tools.ant.types.PathUtil;
/**
* Task to compile RMI stubs and skeletons. This task can take the following
@@ -484,7 +486,8 @@
adapter.setRmic( this );
Path classpath = adapter.getClasspath();
- loader = new URLClassLoader( classpath.toURLs() );
+ final URL[] urls = PathUtil.toURLs( classpath );
+ loader = new URLClassLoader( urls );
// scan base dirs to build up compile lists only if a
// specific classname is not given
1.21 +4 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SQLExec.java 17 Jan 2002 08:04:54 -0000 1.20
+++ SQLExec.java 20 Jan 2002 09:54:08 -0000 1.21
@@ -19,6 +19,7 @@
import java.io.Reader;
import java.io.StringReader;
import java.net.URLClassLoader;
+import java.net.URL;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.Driver;
@@ -37,6 +38,7 @@
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PathUtil;
/**
* Reads in a text file containing SQL statements seperated with semicolons
and
@@ -428,7 +430,8 @@
{
getLogger().debug( "Loading " + driver + " using
AntClassLoader with classpath " + classpath );
- final ClassLoader classLoader = new URLClassLoader(
classpath.toURLs() );
+ final URL[] urls = PathUtil.toURLs( classpath );
+ final ClassLoader classLoader = new URLClassLoader( urls );
dc = classLoader.loadClass( driver );
}
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
