woolfel 2005/09/01 17:58:06
Modified: src/core/org/apache/jmeter Tag: rel-2-1 NewDriver.java
Added: src/core/org/apache/jmeter Tag: rel-2-1
DynamicClassLoader.java
Log:
checking in the stuff for JUnit sampler, since HEAD is now jdk1.5. the
changes are minor
and should not affect things
peter
Revision Changes Path
No revision
No revision
1.8.2.1 +15 -6 jakarta-jmeter/src/core/org/apache/jmeter/NewDriver.java
Index: NewDriver.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/NewDriver.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- NewDriver.java 12 Jul 2005 20:50:38 -0000 1.8
+++ NewDriver.java 2 Sep 2005 00:58:06 -0000 1.8.2.1
@@ -24,7 +24,6 @@
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
@@ -35,7 +34,7 @@
*/
public final class NewDriver {
/** The class loader to use for loading JMeter classes. */
- private static URLClassLoader loader;
+ private static DynamicClassLoader loader;
/** The directory JMeter is installed in. */
private static String jmDir;
@@ -65,7 +64,8 @@
StringBuffer classpath = new StringBuffer();
File[] libDirs = new File[] { new File(jmDir + File.separator +
"lib"),
- new File(jmDir + File.separator + "lib" +
File.separator + "ext") };
+ new File(jmDir + File.separator + "lib" +
File.separator + "ext"),
+ new File(jmDir + File.separator + "lib" + File.separator +
"junit")};
for (int a = 0; a < libDirs.length; a++) {
File[] libJars = libDirs[a].listFiles(new
FilenameFilter() {
public boolean accept(File dir, String name) {
@@ -99,7 +99,7 @@
}
System.setProperty("java.class.path",
System.getProperty("java.class.path") + classpath.toString());
- loader = new URLClassLoader((URL[]) jars.toArray(new URL[0]));
+ loader = new DynamicClassLoader((URL[]) jars.toArray(new
URL[0]));
}
@@ -109,6 +109,15 @@
private NewDriver() {
}
+ public static void addURL(String url) {
+ File furl = new File(url);
+ try {
+ loader.addURL(furl.toURL());
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
/**
* Get the directory where JMeter is installed. This is the absolute
path
* name.
No revision
Index: NewDriver.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/NewDriver.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- NewDriver.java 12 Jul 2005 20:50:38 -0000 1.8
+++ NewDriver.java 2 Sep 2005 00:58:06 -0000 1.8.2.1
@@ -24,7 +24,6 @@
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
@@ -35,7 +34,7 @@
*/
public final class NewDriver {
/** The class loader to use for loading JMeter classes. */
- private static URLClassLoader loader;
+ private static DynamicClassLoader loader;
/** The directory JMeter is installed in. */
private static String jmDir;
@@ -65,7 +64,8 @@
StringBuffer classpath = new StringBuffer();
File[] libDirs = new File[] { new File(jmDir + File.separator +
"lib"),
- new File(jmDir + File.separator + "lib" +
File.separator + "ext") };
+ new File(jmDir + File.separator + "lib" +
File.separator + "ext"),
+ new File(jmDir + File.separator + "lib" + File.separator +
"junit")};
for (int a = 0; a < libDirs.length; a++) {
File[] libJars = libDirs[a].listFiles(new
FilenameFilter() {
public boolean accept(File dir, String name) {
@@ -99,7 +99,7 @@
}
System.setProperty("java.class.path",
System.getProperty("java.class.path") + classpath.toString());
- loader = new URLClassLoader((URL[]) jars.toArray(new URL[0]));
+ loader = new DynamicClassLoader((URL[]) jars.toArray(new
URL[0]));
}
@@ -109,6 +109,15 @@
private NewDriver() {
}
+ public static void addURL(String url) {
+ File furl = new File(url);
+ try {
+ loader.addURL(furl.toURL());
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
/**
* Get the directory where JMeter is installed. This is the absolute
path
* name.
No revision
Index: NewDriver.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/NewDriver.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- NewDriver.java 12 Jul 2005 20:50:38 -0000 1.8
+++ NewDriver.java 2 Sep 2005 00:58:06 -0000 1.8.2.1
@@ -24,7 +24,6 @@
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
@@ -35,7 +34,7 @@
*/
public final class NewDriver {
/** The class loader to use for loading JMeter classes. */
- private static URLClassLoader loader;
+ private static DynamicClassLoader loader;
/** The directory JMeter is installed in. */
private static String jmDir;
@@ -65,7 +64,8 @@
StringBuffer classpath = new StringBuffer();
File[] libDirs = new File[] { new File(jmDir + File.separator +
"lib"),
- new File(jmDir + File.separator + "lib" +
File.separator + "ext") };
+ new File(jmDir + File.separator + "lib" +
File.separator + "ext"),
+ new File(jmDir + File.separator + "lib" + File.separator +
"junit")};
for (int a = 0; a < libDirs.length; a++) {
File[] libJars = libDirs[a].listFiles(new
FilenameFilter() {
public boolean accept(File dir, String name) {
@@ -99,7 +99,7 @@
}
System.setProperty("java.class.path",
System.getProperty("java.class.path") + classpath.toString());
- loader = new URLClassLoader((URL[]) jars.toArray(new URL[0]));
+ loader = new DynamicClassLoader((URL[]) jars.toArray(new
URL[0]));
}
@@ -109,6 +109,15 @@
private NewDriver() {
}
+ public static void addURL(String url) {
+ File furl = new File(url);
+ try {
+ loader.addURL(furl.toURL());
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
/**
* Get the directory where JMeter is installed. This is the absolute
path
* name.
1.4.2.1 +0 -0
jakarta-jmeter/src/core/org/apache/jmeter/DynamicClassLoader.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
