Fixes to allow xdoclet to build under gump/mutant

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272012 13f79535-47bb-0310-9956-ffa450edef68

proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreExecService.java

@@ -167,5 +167,14 @@ public class CoreExecService implements ExecService {
             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();
+    }
 }
 

proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java

@@ -200,6 +200,18 @@ public class Frame implements DemuxOutputReceiver {
         setMagicProperties();
     }
 
+    /**
+     * 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.
      *

proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java

@@ -67,6 +67,7 @@ import org.apache.ant.common.antlib.AntLibFactory;
 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 @@ public class Project implements org.apache.ant.common.event.BuildListener {
     /** 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 @@ public class Project implements org.apache.ant.common.event.BuildListener {
         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);
 
@@ -1072,5 +1077,14 @@ public class Project implements org.apache.ant.common.event.BuildListener {
             listener.messageLogged(event);
         }
     }
+    
+    /**
+     * Get the name of the project.
+     *
+     * @return the project name
+     */
+    public String getName() {
+        return execService.getProjectName();
+    }
 }
 

proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java

@@ -192,7 +192,15 @@ public class Project extends ModelElement {
         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.
      *

proposal/mutant/src/java/common/org/apache/ant/common/service/DataService.java

@@ -137,6 +137,5 @@ public interface DataService {
      *      name.
      */
     Map getAllProperties();
-
 }
 

proposal/mutant/src/java/common/org/apache/ant/common/service/ExecService.java

@@ -106,5 +106,13 @@ public interface ExecService {
      * @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();
+
 }