conor 2003/07/14 06:42:34
Modified: src/main/org/apache/tools/ant AntClassLoader.java
src/main/org/apache/tools/ant/filters/util
ChainReaderHelper.java
src/main/org/apache/tools/ant/taskdefs Available.java
Definer.java ExecuteJava.java XSLTProcess.java
src/main/org/apache/tools/ant/taskdefs/optional
XMLValidateTask.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
FormatterElement.java JUnitTestRunner.java
src/main/org/apache/tools/ant/taskdefs/rmic WLRmic.java
src/main/org/apache/tools/ant/types Mapper.java
src/main/org/apache/tools/ant/types/selectors
ExtendSelector.java
Log:
Remove use of InitializeClass now that we are JDK 1.2+
Revision Changes Path
1.71 +2 -0 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -w -u -r1.70 -r1.71
--- AntClassLoader.java 6 Jul 2003 09:57:34 -0000 1.70
+++ AntClassLoader.java 14 Jul 2003 13:42:31 -0000 1.71
@@ -536,6 +536,8 @@
*
* @param theClass The class to initialize.
* Must not be <code>null</code>.
+ *
+ * @deprecated use Class.forName instead.
*/
public static void initializeClass(Class theClass) {
// ***HACK*** We ask the VM to create an instance
1.15 +1 -2
ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
Index: ChainReaderHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
--- ChainReaderHelper.java 17 Jun 2003 15:49:00 -0000 1.14
+++ ChainReaderHelper.java 14 Jul 2003 13:42:32 -0000 1.15
@@ -174,8 +174,7 @@
} else {
AntClassLoader al
= project.createClassLoader(classpath);
- clazz = al.loadClass(className);
- AntClassLoader.initializeClass(clazz);
+ clazz = Class.forName(className, true, al);
}
if (clazz != null) {
if
(!FilterReader.class.isAssignableFrom(clazz)) {
1.55 +1 -2 ant/src/main/org/apache/tools/ant/taskdefs/Available.java
Index: Available.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -w -u -r1.54 -r1.55
--- Available.java 10 Feb 2003 14:13:34 -0000 1.54
+++ Available.java 14 Jul 2003 13:42:32 -0000 1.55
@@ -486,12 +486,11 @@
// Can return null to represent the bootstrap class loader.
// see API docs of Class.getClassLoader.
if (l != null) {
- requiredClass = l.loadClass(classname);
+ requiredClass = Class.forName(classname, true, l);
} else {
requiredClass = Class.forName(classname);
}
}
- AntClassLoader.initializeClass(requiredClass);
return true;
} catch (ClassNotFoundException e) {
log("class \"" + classname + "\" was not found",
1.36 +3 -6 ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
Index: Definer.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -u -r1.35 -r1.36
--- Definer.java 5 Jul 2003 14:34:12 -0000 1.35
+++ Definer.java 14 Jul 2003 13:42:32 -0000 1.36
@@ -513,18 +513,15 @@
try {
try {
if (onError != OnError.IGNORE) {
- cl = al.loadClass(classname);
- AntClassLoader.initializeClass(cl);
+ cl = Class.forName(classname, true, al);
}
if (adapter != null) {
- adapterClass = al.loadClass(adapter);
- AntClassLoader.initializeClass(adapterClass);
+ adapterClass = Class.forName(adapter, true, al);
}
if (adaptTo != null) {
- adaptToClass = al.loadClass(adaptTo);
- AntClassLoader.initializeClass(adaptToClass);
+ adaptToClass = Class.forName(adaptTo, true, al);
}
AntTypeDefinition def = new AntTypeDefinition();
1.32 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -u -r1.31 -r1.32
--- ExecuteJava.java 7 Mar 2003 11:23:01 -0000 1.31
+++ ExecuteJava.java 14 Jul 2003 13:42:32 -0000 1.32
@@ -138,8 +138,8 @@
loader.addJavaLibraries();
loader.setIsolated(true);
loader.setThreadContextLoader();
- target = loader.forceLoadClass(classname);
- AntClassLoader.initializeClass(target);
+ loader.forceLoadClass(classname);
+ target = Class.forName(classname, true, loader);
}
main = target.getMethod("main", param);
if (main == null) {
1.66 +2 -3
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -w -u -r1.65 -r1.66
--- XSLTProcess.java 6 Jul 2003 09:57:37 -0000 1.65
+++ XSLTProcess.java 14 Jul 2003 13:42:32 -0000 1.66
@@ -421,8 +421,7 @@
return Class.forName(classname);
} else {
AntClassLoader al = getProject().createClassLoader(classpath);
- Class c = al.loadClass(classname);
- AntClassLoader.initializeClass(c);
+ Class c = Class.forName(classname, true, al);
return c;
}
}
1.34 +2 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -u -r1.33 -r1.34
--- XMLValidateTask.java 10 Feb 2003 14:13:45 -0000 1.33
+++ XMLValidateTask.java 14 Jul 2003 13:42:33 -0000 1.34
@@ -235,7 +235,7 @@
* Add an attribute nested element. This is used for setting arbitrary
* features of the SAX parser.
* Valid attributes
- * <a
href=http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";>include</a>
+ * <a
href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description";>include</a>
* @since ant1.6
*/
public Attribute createAttribute() {
@@ -323,8 +323,7 @@
if (classpath != null) {
AntClassLoader loader
= getProject().createClassLoader(classpath);
- readerClass = loader.loadClass(readerClassName);
- AntClassLoader.initializeClass(readerClass);
+ readerClass = Class.forName(readerClassName, true,
loader);
} else {
readerClass = Class.forName(readerClassName);
}
1.14 +11 -12
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
Index: FormatterElement.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -u -r1.13 -r1.14
--- FormatterElement.java 28 May 2003 13:12:03 -0000 1.13
+++ FormatterElement.java 14 Jul 2003 13:42:33 -0000 1.14
@@ -235,8 +235,7 @@
if (loader == null) {
f = Class.forName(classname);
} else {
- f = loader.loadClass(classname);
- AntClassLoader.initializeClass(f);
+ f = Class.forName(classname, true, loader);
}
} catch (ClassNotFoundException e) {
throw new BuildException(e);
1.36 +38 -39
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -u -r1.35 -r1.36
--- JUnitTestRunner.java 18 Apr 2003 23:40:26 -0000 1.35
+++ JUnitTestRunner.java 14 Jul 2003 13:42:33 -0000 1.36
@@ -234,8 +234,7 @@
if (loader == null) {
testClass = Class.forName(test.getName());
} else {
- testClass = loader.loadClass(test.getName());
- AntClassLoader.initializeClass(testClass);
+ testClass = Class.forName(test.getName(), true, loader);
}
Method suiteMethod = null;
1.15 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
Index: WLRmic.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
--- WLRmic.java 10 Feb 2003 14:14:29 -0000 1.14
+++ WLRmic.java 14 Jul 2003 13:42:34 -0000 1.15
@@ -81,8 +81,7 @@
} else {
loader
=
getRmic().getProject().createClassLoader(getRmic().getClasspath());
- c = loader.loadClass("weblogic.rmic");
- AntClassLoader.initializeClass(c);
+ c = Class.forName("weblogic.rmic", true, loader);
}
Method doRmic = c.getMethod("main",
new Class [] { String[].class });
1.20 +1 -2 ant/src/main/org/apache/tools/ant/types/Mapper.java
Index: Mapper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Mapper.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
--- Mapper.java 16 Jun 2003 09:28:28 -0000 1.19
+++ Mapper.java 14 Jul 2003 13:42:34 -0000 1.20
@@ -199,8 +199,7 @@
c = Class.forName(classname);
} else {
AntClassLoader al =
getProject().createClassLoader(classpath);
- c = al.loadClass(classname);
- AntClassLoader.initializeClass(c);
+ c = Class.forName(classname, true, al);
}
FileNameMapper m = (FileNameMapper) c.newInstance();
1.10 +1 -2
ant/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
Index: ExtendSelector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- ExtendSelector.java 4 Jul 2003 23:18:49 -0000 1.9
+++ ExtendSelector.java 14 Jul 2003 13:42:34 -0000 1.10
@@ -104,8 +104,7 @@
} else {
AntClassLoader al
= getProject().createClassLoader(classpath);
- c = al.loadClass(classname);
- AntClassLoader.initializeClass(c);
+ c = Class.forName(classname, true, al);
}
dynselector = (FileSelector) c.newInstance();
final Project project = getProject();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
