costin 2002/12/28 21:53:38
Modified: src/main/org/apache/tools/ant/taskdefs Classloader.java
Log:
Few fixes, AntClassLoader uses parentFirst, Classloader was using reverse.
Make them consistent
Revision Changes Path
1.3 +19 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Classloader.java
Index: Classloader.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Classloader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Classloader.java 24 Dec 2002 18:09:39 -0000 1.2
+++ Classloader.java 29 Dec 2002 05:53:38 -0000 1.3
@@ -114,7 +114,7 @@
private String name=null;
private Path classpath;
private boolean reset=false;
- private boolean reverse=false;
+ private boolean parentFirst=true;
private String parentName=null;
public Classloader() {
@@ -139,9 +139,12 @@
this.reset=b;
}
- // TODO
public void setReverse(boolean b ) {
- this.reverse=b;
+ this.parentFirst= ! b;
+ }
+
+ public void setParentFirst(boolean b ) {
+ this.parentFirst= b;
}
// TODO: add exceptions for delegation or reverse
@@ -211,7 +214,7 @@
AntClassLoader acl=(AntClassLoader)obj;
if( acl==null ) {
- // Construct a class loader
+ // Construct a new class loader
Object parent=null;
if( parentName != null ) {
parent=project.getReference(parentName);
@@ -219,13 +222,24 @@
parent=null;
}
}
+ // TODO: allow user to request the system or no parent
if( parent==null ) {
parent=this.getClass().getClassLoader();
}
+ if( name==null ) {
+ // The core loader must be reverse
+ //reverse=true;
+ }
+ project.log("Setting parent loader " + name + " " +
+ parent + " " + parentFirst, Project.MSG_DEBUG);
+
+ // The param is "parentFirst"
acl=new AntClassLoader( (ClassLoader)parent,
- project, classpath, reverse );
+ project, classpath, parentFirst );
+
project.addReference( loaderName, acl );
+
if( name==null ) {
// This allows the core loader to load optional tasks
// without delegating
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
