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/proposal/mutant/src/java/common/org/apache/ant/common/service DataService.java ExecService.java
Date Sun, 24 Mar 2002 13:28:32 GMT
conor       02/03/24 05:28:31

  Modified:    proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution
                        CoreExecService.java Frame.java
               proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant
                        Project.java
               proposal/mutant/src/java/common/org/apache/ant/common/model
                        Project.java
               proposal/mutant/src/java/common/org/apache/ant/common/service
                        DataService.java ExecService.java
  Log:
  Fixes to allow xdoclet to build under gump/mutant
  
  Revision  Changes    Path
  1.5       +9 -0      jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreExecService.java
  
  Index: CoreExecService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreExecService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CoreExecService.java	18 Mar 2002 02:44:24 -0000	1.4
  +++ CoreExecService.java	24 Mar 2002 13:28:31 -0000	1.5
  @@ -167,5 +167,14 @@
               frame.getEventSupport().fireTaskFinished(task, failureCause);
           }
       }
  +
  +    /**
  +     * get the name of the project associated with this execution.
  +     *
  +     * @return the project's name
  +     */
  +    public String getProjectName() {
  +        return frame.getProjectName();
  +    }
   }
   
  
  
  
  1.11      +12 -0     jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
  
  Index: Frame.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- Frame.java	18 Mar 2002 02:44:24 -0000	1.10
  +++ Frame.java	24 Mar 2002 13:28:31 -0000	1.11
  @@ -201,6 +201,18 @@
       }
   
       /**
  +     * get the name of the project associated with this frame.
  +     *
  +     * @return the project's name
  +     */
  +    public String getProjectName() {
  +        if (project != null) {
  +            return project.getName();
  +        }
  +        return null;
  +    }
  +    
  +    /**
        * Set a value in this frame or any of its imported frames.
        *
        * @param name the name of the value
  
  
  
  1.14      +14 -0     jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -w -u -r1.13 -r1.14
  --- Project.java	18 Mar 2002 02:44:25 -0000	1.13
  +++ Project.java	24 Mar 2002 13:28:31 -0000	1.14
  @@ -67,6 +67,7 @@
   import org.apache.ant.common.event.MessageLevel;
   import org.apache.ant.common.service.ComponentService;
   import org.apache.ant.common.service.DataService;
  +import org.apache.ant.common.service.ExecService;
   import org.apache.ant.common.service.FileService;
   import org.apache.ant.common.util.ExecutionException;
   import org.apache.ant.common.util.PropertyUtils;
  @@ -143,6 +144,9 @@
       /** The core's DataService instance */
       private DataService dataService;
   
  +    /** Th ecore's execution service */
  +    private ExecService execService;
  +    
       /** The core's Component Service instance */
       private ComponentService componentService;
   
  @@ -715,6 +719,7 @@
           this.context = context;
           fileService = (FileService)context.getCoreService(FileService.class);
           dataService = (DataService)context.getCoreService(DataService.class);
  +        execService = (ExecService)context.getCoreService(ExecService.class);
           componentService
                = (ComponentService)context.getCoreService(ComponentService.class);
   
  @@ -1071,6 +1076,15 @@
               BuildListener listener = (BuildListener)listeners.elementAt(i);
               listener.messageLogged(event);
           }
  +    }
  +    
  +    /**
  +     * Get the name of the project.
  +     *
  +     * @return the project name
  +     */
  +    public String getName() {
  +        return execService.getProjectName();
       }
   }
   
  
  
  
  1.6       +9 -1      jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- Project.java	18 Mar 2002 02:44:27 -0000	1.5
  +++ Project.java	24 Mar 2002 13:28:31 -0000	1.6
  @@ -192,6 +192,14 @@
           return base;
       }
   
  +    /**
  +     * Get the name of the project element
  +     *
  +     * @return the project's name
  +     */
  +    public String getName() {
  +        return name;
  +    }
   
       /**
        * Get the targets in this project.
  
  
  
  1.5       +0 -1      jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/service/DataService.java
  
  Index: DataService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/service/DataService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- DataService.java	18 Mar 2002 02:44:27 -0000	1.4
  +++ DataService.java	24 Mar 2002 13:28:31 -0000	1.5
  @@ -137,6 +137,5 @@
        *      name.
        */
       Map getAllProperties();
  -
   }
   
  
  
  
  1.4       +8 -0      jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/service/ExecService.java
  
  Index: ExecService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/service/ExecService.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- ExecService.java	18 Mar 2002 02:44:27 -0000	1.3
  +++ ExecService.java	24 Mar 2002 13:28:31 -0000	1.4
  @@ -106,5 +106,13 @@
        * @exception ExecutionException if there is a problem in execution.
        */
       void executeTask(Task task) throws ExecutionException;
  +    
  +    /**
  +     * get the name of the project associated with this execution.
  +     *
  +     * @return the project's name
  +     */
  +    String getProjectName();
  +
   }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message