ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs ExecuteJava.java
Date Tue, 14 Aug 2001 13:16:52 GMT
conor       01/08/14 06:16:52

  Modified:    src/main/org/apache/tools/ant Tag: ANT_14_BRANCH Main.java
                        Project.java
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_14_BRANCH
                        ExecuteJava.java
  Log:
  Change method name to avoid any confusion
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.44.2.1  +4 -4      jakarta-ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.44
  retrieving revision 1.44.2.1
  diff -u -r1.44 -r1.44.2.1
  --- Main.java	2001/08/08 19:34:20	1.44
  +++ Main.java	2001/08/14 13:16:52	1.44.2.1
  @@ -132,7 +132,7 @@
        * Entry point allowing for more options from other front ends
        */
       public static void start(String[] args, Properties additionalUserProperties,
  -                             ClassLoader systemLoader) {
  +                             ClassLoader coreLoader) {
           Main m = null;
   
           try {
  @@ -151,7 +151,7 @@
           }
           
           try {
  -            m.runBuild(systemLoader);
  +            m.runBuild(coreLoader);
               System.exit(0);
           } catch (BuildException be) {
               if (m.err != System.err) {
  @@ -390,7 +390,7 @@
       /**
        * Executes the build.
        */
  -    private void runBuild(ClassLoader systemLoader) throws BuildException {
  +    private void runBuild(ClassLoader coreLoader) throws BuildException {
   
           if (!readyToRun) {
               return;
  @@ -403,7 +403,7 @@
           }
   
           final Project project = new Project();
  -        project.setSystemLoader(systemLoader);
  +        project.setCoreLoader(coreLoader);
           
           Throwable error = null;
   
  
  
  
  1.74.2.1  +6 -6      jakarta-ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.74
  retrieving revision 1.74.2.1
  diff -u -r1.74 -r1.74.2.1
  --- Project.java	2001/08/08 19:34:20	1.74
  +++ Project.java	2001/08/14 13:16:52	1.74.2.1
  @@ -112,8 +112,8 @@
   
       private Vector listeners = new Vector();
   
  -    /** The system classloader - may be null */    
  -    private ClassLoader systemLoader = null;
  +    /** The Ant core classloader - may be null if using system loader */    
  +    private ClassLoader coreLoader = null;
   
       /** Records the latest task on a thread */ 
       private Hashtable threadTasks = new Hashtable();
  @@ -216,12 +216,12 @@
           setSystemProperties();
       }
   
  -    public void setSystemLoader(ClassLoader systemLoader) {
  -        this.systemLoader = systemLoader;
  +    public void setCoreLoader(ClassLoader coreLoader) {
  +        this.coreLoader = coreLoader;
       }
       
  -    public ClassLoader getSystemLoader() {
  -        return systemLoader;
  +    public ClassLoader getCoreLoader() {
  +        return coreLoader;
       }
       
       public void addBuildListener(BuildListener listener) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.1  +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- ExecuteJava.java	2001/07/22 15:44:11	1.15
  +++ ExecuteJava.java	2001/08/14 13:16:52	1.15.2.1
  @@ -114,7 +114,7 @@
               if (classpath == null) {
                   target = Class.forName(classname);
               } else {
  -                loader = new AntClassLoader(project.getSystemLoader(), project, classpath,
false);
  +                loader = new AntClassLoader(project.getCoreLoader(), project, classpath,
false);
                   loader.setIsolated(true);
                   loader.setThreadContextLoader();
                   target = loader.forceLoadClass(classname);
  
  
  

Mime
View raw message