Return-Path:
null
, indicating that no description is
* available.
- *
+ *
*/
public void setDescription(String desc) {
description = desc;
@@ -159,7 +159,7 @@
/**
* Returns the description of the current action.
- *
+ *
* @return the description of the current action, or null
if
* no description is available.
*/
@@ -176,10 +176,10 @@
public void init() throws BuildException {}
/**
- * Called by the project to let the task do its work. This method may be
- * called more than once, if the task is invoked more than once.
- * For example,
- * if target1 and target2 both depend on target3, then running
+ * Called by the project to let the task do its work. This method may be
+ * called more than once, if the task is invoked more than once.
+ * For example,
+ * if target1 and target2 both depend on target3, then running
* "ant target1 target2" will run all tasks in target3 twice.
*
* @exception BuildException if something goes wrong with the build
@@ -188,11 +188,11 @@
/**
* Returns the file/location where this task was defined.
- *
- * @return the file/location where this task was defined.
+ *
+ * @return the file/location where this task was defined.
* Should not return null
. Location.UNKNOWN_LOCATION
* is used for unknown locations.
- *
+ *
* @see Location#UNKNOWN_LOCATION
*/
public Location getLocation() {
@@ -201,11 +201,11 @@
/**
* Sets the file/location where this task was defined.
- *
+ *
* @param location The file/location where this task was defined.
* Should not be null
- use
* Location.UNKNOWN_LOCATION if the location isn't known.
- *
+ *
* @see Location#UNKNOWN_LOCATION
*/
public void setLocation(Location location) {
@@ -214,7 +214,7 @@
/**
* Returns the wrapper used for runtime configuration.
- *
+ *
* @return the wrapper used for runtime configuration. This
* method will generate a new wrapper (and cache it)
* if one isn't set already.
@@ -232,7 +232,7 @@
* This method should be used only by the ProjectHelper and ant internals.
* It is public to allow helper plugins to operate on tasks, normal tasks
* should never use it.
- *
+ *
* @param wrapper The wrapper to be used for runtime configuration.
* May be null
, in which case the next call
* to getRuntimeConfigurableWrapper will generate a new
@@ -248,7 +248,7 @@
// unless I've missed something.
/**
* Configures this task - if it hasn't been done already.
- * If the task has been invalidated, it is replaced with an
+ * If the task has been invalidated, it is replaced with an
* UnknownElement task which uses the new definition in the project.
*
* @exception BuildException if the task cannot be configured.
@@ -256,56 +256,56 @@
public void maybeConfigure() throws BuildException {
if (!invalid) {
if (wrapper != null) {
- wrapper.maybeConfigure(project);
+ wrapper.maybeConfigure(getProject());
}
} else {
getReplacement();
}
}
- /**
+ /**
* Handles a line of output by logging it with the INFO priority.
- *
+ *
* @param line The line of output to log. Should not be null
.
*/
protected void handleOutput(String line) {
log(line, Project.MSG_INFO);
}
-
- /**
+
+ /**
* Handles an error line by logging it with the INFO priority.
- *
+ *
* @param line The error line to log. Should not be null
.
*/
protected void handleErrorOutput(String line) {
log(line, Project.MSG_ERR);
}
-
- /**
- * Logs a message with the default (INFO) priority.
- *
+
+ /**
+ * Logs a message with the default (INFO) priority.
+ *
* @param msg The message to be logged. Should not be null
.
- */
- public void log(String msg) {
- log(msg, Project.MSG_INFO);
- }
-
- /**
+ */
+ public void log(String msg) {
+ log(msg, Project.MSG_INFO);
+ }
+
+ /**
* Logs a mesage with the given priority. This delegates
* the actual logging to the project.
- *
+ *
* @param msg The message to be logged. Should not be null
.
- * @param msgLevel The message priority at which this message is to
+ * @param msgLevel The message priority at which this message is to
* be logged.
- */
- public void log(String msg, int msgLevel) {
- project.log(this, msg, msgLevel);
- }
-
+ */
+ public void log(String msg, int msgLevel) {
+ getProject().log(this, msg, msgLevel);
+ }
+
/**
* Performs this task if it's still valid, or gets a replacement
* version and performs that otherwise.
- *
+ *
* Performing a task consists of firing a task started event,
* configuring the task, executing it, and then firing task finished
* event. If a runtime exception is thrown, the task finished event
@@ -314,10 +314,10 @@
public final void perform() {
if (!invalid) {
try {
- project.fireTaskStarted(this);
+ getProject().fireTaskStarted(this);
maybeConfigure();
execute();
- project.fireTaskFinished(this, null);
+ getProject().fireTaskFinished(this, null);
} catch (RuntimeException exc) {
if (exc instanceof BuildException) {
BuildException be = (BuildException) exc;
@@ -325,7 +325,7 @@
be.setLocation(getLocation());
}
}
- project.fireTaskFinished(this, exc);
+ getProject().fireTaskFinished(this, exc);
throw exc;
}
} else {
@@ -367,7 +367,7 @@
private UnknownElement getReplacement() {
if (replacement == null) {
replacement = new UnknownElement(taskType);
- replacement.setProject(project);
+ replacement.setProject(getProject());
replacement.setTaskType(taskType);
replacement.setTaskName(taskName);
replacement.setLocation(location);
@@ -393,7 +393,7 @@
while (enum.hasMoreElements()) {
RuntimeConfigurable childWrapper =
(RuntimeConfigurable) enum.nextElement();
- UnknownElement childElement =
+ UnknownElement childElement =
new UnknownElement(childWrapper.getElementTag());
parentElement.addChild(childElement);
childElement.setRuntimeConfigurableWrapper(childWrapper);
1.18 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TaskAdapter.java 12 Apr 2002 13:26:50 -0000 1.17
+++ TaskAdapter.java 23 Jul 2002 07:54:47 -0000 1.18
@@ -122,7 +122,7 @@
setProjectM =
c.getMethod("setProject", new Class[] {Project.class});
if (setProjectM != null) {
- setProjectM.invoke(proxy, new Object[] {project});
+ setProjectM.invoke(proxy, new Object[] {getProject()});
}
} catch (NoSuchMethodException e) {
// ignore this if the class being used as a task does not have
1.28 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/UnknownElement.java
Index: UnknownElement.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/UnknownElement.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- UnknownElement.java 22 Jun 2002 23:38:30 -0000 1.27
+++ UnknownElement.java 23 Jul 2002 07:54:47 -0000 1.28
@@ -121,7 +121,7 @@
handleChildren(realThing, wrapper);
- wrapper.maybeConfigure(project);
+ wrapper.maybeConfigure(getProject());
}
/**
@@ -209,7 +209,7 @@
realChild = makeTask(child, childWrapper, false);
((TaskContainer) parent).addTask((Task) realChild);
} else {
- realChild = ih.createElement(project, parent, child.getTag());
+ realChild = ih.createElement(getProject(), parent, child.getTag());
}
childWrapper.setProxy(realChild);
@@ -238,7 +238,7 @@
protected Object makeObject(UnknownElement ue, RuntimeConfigurable w) {
Object o = makeTask(ue, w, true);
if (o == null) {
- o = project.createDataType(ue.getTag());
+ o = getProject().createDataType(ue.getTag());
}
if (o == null) {
throw getNotFoundException("task or type", ue.getTag());
@@ -263,7 +263,7 @@
*/
protected Task makeTask(UnknownElement ue, RuntimeConfigurable w,
boolean onTopLevel) {
- Task task = project.createTask(ue.getTag());
+ Task task = getProject().createTask(ue.getTag());
if (task == null && !onTopLevel) {
throw getNotFoundException("task", ue.getTag());
}
1.15 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractCvsTask.java 22 Jun 2002 23:38:31 -0000 1.14
+++ AbstractCvsTask.java 23 Jul 2002 07:54:47 -0000 1.15
@@ -309,9 +309,9 @@
//
Execute exe = new Execute(getExecuteStreamHandler(), null);
- exe.setAntRun(project);
+ exe.setAntRun(getProject());
if (dest == null) {
- dest = project.getBaseDir();
+ dest = getProject().getBaseDir();
}
if (!dest.exists()) {
1.63 +10 -10 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Ant.java 16 Jul 2002 13:06:45 -0000 1.62
+++ Ant.java 23 Jul 2002 07:54:47 -0000 1.63
@@ -152,7 +152,7 @@
newProject = new Project();
newProject.setJavaVersionProperty();
newProject.addTaskDefinition("property",
- (Class) project.getTaskDefinitions()
+ (Class) getProject().getTaskDefinitions()
.get("property"));
}
@@ -208,7 +208,7 @@
private void initializeProject() {
newProject.setInputHandler(getProject().getInputHandler());
- Vector listeners = project.getBuildListeners();
+ Vector listeners = getProject().getBuildListeners();
final int count = listeners.size();
for (int i = 0; i < count; i++) {
newProject.addBuildListener((BuildListener) listeners.elementAt(i));
@@ -233,7 +233,7 @@
}
}
- Hashtable taskdefs = project.getTaskDefinitions();
+ Hashtable taskdefs = getProject().getTaskDefinitions();
Enumeration et = taskdefs.keys();
while (et.hasMoreElements()) {
String taskName = (String) et.nextElement();
@@ -245,7 +245,7 @@
newProject.addTaskDefinition(taskName, taskClass);
}
- Hashtable typedefs = project.getDataTypeDefinitions();
+ Hashtable typedefs = getProject().getDataTypeDefinitions();
Enumeration e = typedefs.keys();
while (e.hasMoreElements()) {
String typeName = (String) e.nextElement();
@@ -322,7 +322,7 @@
}
if ((dir == null) && (inheritAll)) {
- dir = project.getBaseDir();
+ dir = getProject().getBaseDir();
}
initializeProject();
@@ -334,7 +334,7 @@
dir.getAbsolutePath());
}
} else {
- dir = project.getBaseDir();
+ dir = getProject().getBaseDir();
}
overrideProperties();
@@ -358,8 +358,8 @@
// Are we trying to call the target in which we are defined (or
// the build file if this is a top level task)?
- if (newProject.getBaseDir().equals(project.getBaseDir()) &&
- newProject.getProperty("ant.file").equals(project.getProperty("ant.file"))
+ if (newProject.getBaseDir().equals(getProject().getBaseDir()) &&
+ newProject.getProperty("ant.file").equals(getProject().getProperty("ant.file"))
&& getOwningTarget() != null
&& (getOwningTarget().getName().equals("") ||
getOwningTarget().getName().equals(target))) {
@@ -411,7 +411,7 @@
* requested.
*/
private void addReferences() throws BuildException {
- Hashtable thisReferences = (Hashtable) project.getReferences().clone();
+ Hashtable thisReferences = (Hashtable) getProject().getReferences().clone();
Hashtable newReferences = newProject.getReferences();
Enumeration e;
if (references.size() > 0) {
@@ -460,7 +460,7 @@
* keep our fingers crossed.
org.xml.sax.Parser
.
* if className is an implementation of org.xml.sax.Parser
, {@link #setLenient(boolean)},
* will be ignored.
- *
if not set, the default {@link #DEFAULT_XML_READER_CLASSNAME} will be used. + *
if not set, the default will be used.
* @see org.xml.sax.XMLReader
* @see org.xml.sax.Parser
*/
@@ -190,7 +187,7 @@
*/
public Path createClasspath() {
if (this.classpath == null) {
- this.classpath = new Path(project);
+ this.classpath = new Path(getProject());
}
return this.classpath.createPath();
}
@@ -226,7 +223,7 @@
public void init() throws BuildException {
super.init();
- xmlCatalog.setProject(project);
+ xmlCatalog.setProject(getProject());
}
/**
@@ -270,11 +267,11 @@
for (int i = 0; i < filesets.size(); i++) {
FileSet fs = (FileSet) filesets.elementAt(i);
- DirectoryScanner ds = fs.getDirectoryScanner(project);
+ DirectoryScanner ds = fs.getDirectoryScanner(getProject());
String[] files = ds.getIncludedFiles();
for (int j = 0; j < files.length ; j++) {
- File srcFile = new File(fs.getDir(project), files[j]);
+ File srcFile = new File(fs.getDir(getProject()), files[j]);
doValidate(srcFile);
fileProcessed++;
}
@@ -301,7 +298,7 @@
try {
// load the parser class
if (classpath != null) {
- AntClassLoader loader = new AntClassLoader(project, classpath);
+ AntClassLoader loader = new AntClassLoader(getProject(), classpath);
readerClass = loader.loadClass(readerClassName);
AntClassLoader.initializeClass(readerClass);
} else {
1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
Index: Continuus.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Continuus.java 22 Jun 2002 23:38:35 -0000 1.7
+++ Continuus.java 23 Jul 2002 07:54:52 -0000 1.8
@@ -103,7 +103,7 @@
* @param dir the directory containing the ccm executable
*/
public final void setCcmDir(String dir) {
- ccmDir = project.translatePath(dir);
+ ccmDir = getProject().translatePath(dir);
}
/**
1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClearCase.java 22 Jun 2002 23:38:35 -0000 1.7
+++ ClearCase.java 23 Jul 2002 07:54:52 -0000 1.8
@@ -87,7 +87,7 @@
* @param dir the directory containing the cleartool executable
*/
public final void setClearToolDir(String dir) {
- m_ClearToolDir = project.translatePath(dir);
+ m_ClearToolDir = getProject().translatePath(dir);
}
/**
1.30 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
Index: Depend.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Depend.java 9 Jul 2002 21:06:03 -0000 1.29
+++ Depend.java 23 Jul 2002 07:54:52 -0000 1.30
@@ -179,7 +179,7 @@
*/
public Path createClasspath() {
if (dependClasspath == null) {
- dependClasspath = new Path(project);
+ dependClasspath = new Path(getProject());
}
return dependClasspath.createPath();
}
@@ -588,7 +588,7 @@
private void determineOutOfDateClasses() {
outOfDateClasses = new Hashtable();
for (int i = 0; i < srcPathList.length; i++) {
- File srcDir = (File) project.resolveFile(srcPathList[i]);
+ File srcDir = (File) getProject().resolveFile(srcPathList[i]);
if (srcDir.exists()) {
DirectoryScanner ds = this.getDirectoryScanner(srcDir);
String[] files = ds.getIncludedFiles();
1.27 +3 -11 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CSharp.java 9 Jul 2002 21:06:04 -0000 1.26
+++ CSharp.java 23 Jul 2002 07:54:52 -0000 1.27
@@ -316,12 +316,6 @@
private File srcDir;
/**
- * destination directory (null means use the source directory) NB: this is
- * currently not used
- */
- private File destDir;
-
- /**
* type of target. Should be one of exe|library|module|winexe|(null)
* default is exe; the actual value (if not null) is fed to the command
* line.
@@ -389,7 +383,7 @@
public void setReferenceFiles(Path path) {
//demand create pathlist
if (referenceFiles == null) {
- referenceFiles = new Path(this.project);
+ referenceFiles = new Path(this.getProject());
}
referenceFiles.append(path);
}
@@ -734,7 +728,7 @@
*@param dirName The new DestDir value
*/
public void setDestDir(File dirName) {
- this.destDir = dirName;
+ log( "DestDir currently unused", Project.MSG_WARN );
}
@@ -1021,7 +1015,6 @@
targetType = null;
win32icon = null;
srcDir = null;
- destDir = null;
mainClass = null;
unsafe = false;
warnLevel = 3;
@@ -1069,7 +1062,7 @@
public void execute()
throws BuildException {
if (srcDir == null) {
- srcDir = project.resolveFile(".");
+ srcDir = getProject().resolveFile(".");
}
log("CSC working from source directory " + srcDir, Project.MSG_VERBOSE);
validate();
@@ -1113,7 +1106,6 @@
DirectoryScanner scanner = super.getDirectoryScanner(srcDir);
String[] dependencies = scanner.getIncludedFiles();
log("compiling " + dependencies.length + " file" + ((dependencies.length == 1) ? "" : "s"));
- String baseDir = scanner.getBasedir().toString();
File base = scanner.getBasedir();
//add to the command
for (int i = 0; i < dependencies.length; i++) {
1.20 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
Index: Ilasm.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Ilasm.java 9 Jul 2002 21:06:04 -0000 1.19
+++ Ilasm.java 23 Jul 2002 07:54:52 -0000 1.20
@@ -492,7 +492,7 @@
public void execute()
throws BuildException {
if (srcDir == null) {
- srcDir = project.resolveFile(".");
+ srcDir = getProject().resolveFile(".");
}
//get dependencies list.
1.11 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BorlandGenerateClient.java 22 Jun 2002 23:38:36 -0000 1.10
+++ BorlandGenerateClient.java 23 Jul 2002 07:54:52 -0000 1.11
@@ -146,7 +146,7 @@
*/
public Path createClasspath() {
if (this.classpath == null) {
- this.classpath = new Path(project);
+ this.classpath = new Path(getProject());
}
return this.classpath.createPath();
}
1.17 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
Index: DDCreator.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DDCreator.java 9 Jul 2002 21:06:04 -0000 1.16
+++ DDCreator.java 23 Jul 2002 07:54:52 -0000 1.17
@@ -125,14 +125,14 @@
}
String systemClassPath = System.getProperty("java.class.path");
- String execClassPath = project.translatePath(systemClassPath + ":" + classpath);
- Java ddCreatorTask = (Java) project.createTask("java");
+ String execClassPath = getProject().translatePath(systemClassPath + ":" + classpath);
+ Java ddCreatorTask = (Java) getProject().createTask("java");
ddCreatorTask.setTaskName(getTaskName());
ddCreatorTask.setFork(true);
ddCreatorTask.setClassname("org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper");
Commandline.Argument arguments = ddCreatorTask.createArg();
arguments.setLine(args);
- ddCreatorTask.setClasspath(new Path(project, execClassPath));
+ ddCreatorTask.setClasspath(new Path(getProject(), execClassPath));
if (ddCreatorTask.executeJava() != 0) {
throw new BuildException("Execution of ddcreator helper failed");
}
@@ -165,6 +165,6 @@
* @param s the classpath to use for the ddcreator tool.
*/
public void setClasspath(String s) {
- this.classpath = project.translatePath(s);
+ this.classpath = getProject().translatePath(s);
}
}
1.37 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
Index: EjbJar.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- EjbJar.java 9 Jul 2002 21:06:04 -0000 1.36
+++ EjbJar.java 23 Jul 2002 07:54:52 -0000 1.37
@@ -336,7 +336,7 @@
*/
public Path createClasspath() {
if (config.classpath == null) {
- config.classpath = new Path(project);
+ config.classpath = new Path(getProject());
}
return config.classpath.createPath();
}
1.21 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
Index: Ejbc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Ejbc.java 9 Jul 2002 21:06:04 -0000 1.20
+++ Ejbc.java 23 Jul 2002 07:54:52 -0000 1.21
@@ -131,14 +131,14 @@
}
String systemClassPath = System.getProperty("java.class.path");
- String execClassPath = project.translatePath(systemClassPath + ":" + classpath +
+ String execClassPath = getProject().translatePath(systemClassPath + ":" + classpath +
":" + generatedFilesDirectory);
// get all the files in the descriptor directory
DirectoryScanner ds = super.getDirectoryScanner(descriptorDirectory);
String[] files = ds.getIncludedFiles();
- Java helperTask = (Java) project.createTask("java");
+ Java helperTask = (Java) getProject().createTask("java");
helperTask.setTaskName(getTaskName());
helperTask.setFork(true);
helperTask.setClassname("org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper");
@@ -155,7 +155,7 @@
Commandline.Argument arguments = helperTask.createArg();
arguments.setLine(args);
- helperTask.setClasspath(new Path(project, execClassPath));
+ helperTask.setClasspath(new Path(getProject(), execClassPath));
if (helperTask.executeJava() != 0) {
throw new BuildException("Execution of ejbc helper failed");
}
@@ -210,7 +210,7 @@
* Set the classpath to be used for this compilation.
*/
public void setClasspath(String s) {
- this.classpath = project.translatePath(s);
+ this.classpath = getProject().translatePath(s);
}
/**
1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
Index: IPlanetEjbcTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IPlanetEjbcTask.java 9 Jul 2002 21:06:05 -0000 1.7
+++ IPlanetEjbcTask.java 23 Jul 2002 07:54:52 -0000 1.8
@@ -184,7 +184,7 @@
*/
public Path createClasspath() {
if (classpath == null) {
- classpath = new Path(project);
+ classpath = new Path(getProject());
}
return classpath.createPath();
}
1.21 +6 -6 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
Index: WLRun.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WLRun.java 9 Jul 2002 21:06:05 -0000 1.20
+++ WLRun.java 23 Jul 2002 07:54:52 -0000 1.21
@@ -149,7 +149,7 @@
*/
public Path createClasspath() {
if (classpath == null) {
- classpath = new Path(project);
+ classpath = new Path(getProject());
}
return classpath.createPath();
}
@@ -159,7 +159,7 @@
*/
public Path createWLClasspath() {
if (weblogicClasspath == null) {
- weblogicClasspath = new Path(project);
+ weblogicClasspath = new Path(getProject());
}
return weblogicClasspath.createPath();
}
@@ -200,7 +200,7 @@
// If an explicit securityPolicy file was specified, it maybe an
// absolute path. Use the project to resolve it.
if (this.securityPolicy != null && !securityPolicyFile.exists()) {
- securityPolicyFile = project.resolveFile(securityPolicy);
+ securityPolicyFile = getProject().resolveFile(securityPolicy);
}
// If we still can't find it, complain
if (!securityPolicyFile.exists()) {
@@ -229,7 +229,7 @@
throw new BuildException("You must supply a management password to start the server");
}
- Java weblogicServer = (Java) project.createTask("java");
+ Java weblogicServer = (Java) getProject().createTask("java");
weblogicServer.setTaskName(getTaskName());
weblogicServer.setFork(true);
weblogicServer.setDir(weblogicSystemHome);
@@ -275,7 +275,7 @@
propertiesFile = new File(weblogicSystemHome, weblogicPropertiesFile);
if (!propertiesFile.exists()) {
// OK, properties file may be absolute
- propertiesFile = project.resolveFile(weblogicPropertiesFile);
+ propertiesFile = getProject().resolveFile(weblogicPropertiesFile);
if (!propertiesFile.exists()) {
throw new BuildException("Properties file " + weblogicPropertiesFile +
" not found in weblogic home " + weblogicSystemHome +
@@ -283,7 +283,7 @@
}
}
- Java weblogicServer = (Java) project.createTask("java");
+ Java weblogicServer = (Java) getProject().createTask("java");
weblogicServer.setTaskName(getTaskName());
weblogicServer.setFork(true);
weblogicServer.setClassname(weblogicMainClass);
1.13 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
Index: WLStop.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WLStop.java 9 Jul 2002 21:06:05 -0000 1.12
+++ WLStop.java 23 Jul 2002 07:54:53 -0000 1.13
@@ -117,7 +117,7 @@
throw new BuildException("The url of the weblogic server must be provided.");
}
- Java weblogicAdmin = (Java) project.createTask("java");
+ Java weblogicAdmin = (Java) getProject().createTask("java");
weblogicAdmin.setFork(true);
weblogicAdmin.setClassname("weblogic.Admin");
String args;
@@ -152,7 +152,7 @@
*/
public Path createClasspath() {
if (classpath == null) {
- classpath = new Path(project);
+ classpath = new Path(getProject());
}
return classpath.createPath();
}
1.14 +1 -7 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
Index: Translate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Translate.java 9 Jul 2002 21:06:06 -0000 1.13
+++ Translate.java 23 Jul 2002 07:54:53 -0000 1.14
@@ -132,10 +132,6 @@
*/
private Hashtable resourceMap = new Hashtable();
/**
- * Generated locale based on user attributes
- */
- private Locale locale;
- /**
* Used to resolve file names.
*/
private FileUtils fileUtils = FileUtils.newFileUtils();
@@ -286,8 +282,6 @@
bundleCountry = Locale.getDefault().getCountry();
}
- locale = new Locale(bundleLanguage, bundleCountry);
-
if (bundleVariant == null) {
Locale l = new Locale(bundleLanguage, bundleCountry);
bundleVariant = l.getVariant();
@@ -488,7 +482,7 @@
private void translate() throws BuildException {
for (int i = 0; i < filesets.size(); i++) {
FileSet fs = (FileSet) filesets.elementAt(i);
- DirectoryScanner ds = fs.getDirectoryScanner(project);
+ DirectoryScanner ds = fs.getDirectoryScanner(getProject());
String[] srcFiles = ds.getIncludedFiles();
for (int j = 0; j < srcFiles.length; j++) {
try {
1.16 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
Index: VAJImport.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VAJImport.java 9 Jul 2002 21:06:06 -0000 1.15
+++ VAJImport.java 23 Jul 2002 07:54:53 -0000 1.16
@@ -194,7 +194,7 @@
* Workspace.
*/
protected void importFileset(FileSet fileset) {
- DirectoryScanner ds = fileset.getDirectoryScanner(this.project);
+ DirectoryScanner ds = fileset.getDirectoryScanner(this.getProject());
if (ds.getIncludedFiles().length == 0) {
return;
}
1.15 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JJTree.java 9 Jul 2002 21:06:07 -0000 1.14
+++ JJTree.java 23 Jul 2002 07:54:53 -0000 1.15
@@ -237,12 +237,12 @@
targetName.substring(0, targetName.indexOf(".jjt")) + ".jj");
if (javaFile.exists()
&& target.lastModified() < javaFile.lastModified()) {
- project.log("Target is already built - skipping (" + target + ")");
+ getProject().log("Target is already built - skipping (" + target + ")");
return;
}
cmdl.createArgument().setValue(target.getAbsolutePath());
- final Path classpath = cmdl.createClasspath(project);
+ final Path classpath = cmdl.createClasspath(getProject());
final File javaccJar = JavaCC.getArchiveFile(javaccHome);
classpath.createPathElement().setPath(javaccJar.getAbsolutePath());
classpath.addJavaRuntime();
1.18 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JavaCC.java 9 Jul 2002 21:06:07 -0000 1.17
+++ JavaCC.java 23 Jul 2002 07:54:53 -0000 1.18
@@ -309,7 +309,7 @@
}
cmdl.createArgument().setValue(target.getAbsolutePath());
- final Path classpath = cmdl.createClasspath(project);
+ final Path classpath = cmdl.createClasspath(getProject());
final File javaccJar = JavaCC.getArchiveFile(javaccHome);
classpath.createPathElement().setPath(javaccJar.getAbsolutePath());
classpath.addJavaRuntime();
1.14 +3 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JDependTask.java 9 Jul 2002 21:06:07 -0000 1.13
+++ JDependTask.java 23 Jul 2002 07:54:53 -0000 1.14
@@ -170,7 +170,7 @@
*/
public Path createSourcespath() {
if (_sourcesPath == null) {
- _sourcesPath = new Path(project);
+ _sourcesPath = new Path(getProject());
}
return _sourcesPath.createPath();
}
@@ -214,7 +214,7 @@
*/
public Path createClasspath() {
if (_compileClasspath == null) {
- _compileClasspath = new Path(project);
+ _compileClasspath = new Path(getProject());
}
return _compileClasspath.createPath();
}
@@ -284,7 +284,6 @@
// execute the test and get the return code
int exitValue = JDependTask.ERRORS;
- boolean wasKilled = false;
if (!getFork()) {
exitValue = executeInVM(commandline);
} else {
@@ -417,7 +416,7 @@
execute.setCommandline(commandline.getCommandline());
if (getDir() != null) {
execute.setWorkingDirectory(getDir());
- execute.setAntRun(project);
+ execute.setAntRun(getProject());
}
if (getOutputFile() != null) {
1.21 +4 -12 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JspC.java 9 Jul 2002 21:06:07 -0000 1.20
+++ JspC.java 23 Jul 2002 07:54:54 -0000 1.21
@@ -134,13 +134,6 @@
protected boolean failOnError = true;
/**
- * -uribase <dir> The uri directory compilations should be relative to
- * (Default is "/")
- */
-
- private File uribase;
-
- /**
* -uriroot <dir> The root directory that uri files should be resolved
* against,
*/
@@ -258,7 +251,7 @@
* @param uribase The new Uribase value
*/
public void setUribase(File uribase) {
- this.uribase = uribase;
+ log( "Uribase is currently an unused parameter", Project.MSG_WARN);
}
public File getUribase() {
@@ -297,7 +290,7 @@
*/
public Path createClasspath() {
if (classpath == null) {
- classpath = new Path(project);
+ classpath = new Path(getProject());
}
return classpath.createPath();
}
@@ -336,7 +329,7 @@
*/
public Path createCompilerclasspath() {
if (compilerClasspath == null) {
- compilerClasspath = new Path(project);
+ compilerClasspath = new Path(getProject());
}
return compilerClasspath.createPath();
}
@@ -445,7 +438,7 @@
resetFileLists();
int filecount = 0;
for (int i = 0; i < list.length; i++) {
- File srcDir = (File) project.resolveFile(list[i]);
+ File srcDir = (File) getProject().resolveFile(list[i]);
if (!srcDir.exists()) {
throw new BuildException("srcdir \"" + srcDir.getPath() +
"\" does not exist!", location);
@@ -599,7 +592,6 @@
}
String javaFileName = mangler.mapJspToJavaName(srcFile);
// String srcFileDir=srcFile.getParent();
- String packageNameIn = srcFile.getAbsolutePath();
return new File(dest, javaFileName);
}
1.10 +5 -8 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
Index: WLJspc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WLJspc.java 9 Jul 2002 21:06:07 -0000 1.9
+++ WLJspc.java 23 Jul 2002 07:54:54 -0000 1.10
@@ -143,16 +143,14 @@
}
- String systemClassPath = System.getProperty("java.class.path");
-
- pathToPackage
+ pathToPackage
= this.destinationPackage.replace('.', File.separatorChar);
// get all the files in the sourceDirectory
DirectoryScanner ds = super.getDirectoryScanner(sourceDirectory);
//use the systemclasspath as well, to include the ant jar
if (compileClasspath == null) {
- compileClasspath = new Path(project);
+ compileClasspath = new Path(getProject());
}
compileClasspath.append(Path.systemClasspath);
@@ -162,7 +160,7 @@
// Therefore, takes loads of time
// Can pass directories at a time (*.jsp) but easily runs out of memory on hefty dirs
// (even on a Sun)
- Java helperTask = (Java) project.createTask("java");
+ Java helperTask = (Java) getProject().createTask("java");
helperTask.setFork(true);
helperTask.setClassname("weblogic.jspc");
helperTask.setTaskName(getTaskName());
@@ -245,7 +243,7 @@
*/
public Path createClasspath() {
if (compileClasspath == null) {
- compileClasspath = new Path(project);
+ compileClasspath = new Path(getProject());
}
return compileClasspath;
}
@@ -297,8 +295,7 @@
// Can be written better... this is too hacky!
jspFile = new File(files[i]);
parents = jspFile.getParent();
- int loc = 0;
-
+
if ((parents != null) && (!("").equals(parents))) {
parents = this.replaceString(parents, File.separator, "_/");
pack = pathToPackage + File.separator + "_" + parents;
1.46 +13 -13 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- JUnitTask.java 9 Jul 2002 21:06:08 -0000 1.45
+++ JUnitTask.java 23 Jul 2002 07:54:54 -0000 1.46
@@ -406,7 +406,7 @@
* @since Ant 1.2
*/
public Path createClasspath() {
- return commandline.createClasspath(project).createPath();
+ return commandline.createClasspath(getProject()).createPath();
}
/**
@@ -451,7 +451,7 @@
* @since Ant 1.2
*/
public BatchTest createBatchTest() {
- BatchTest test = new BatchTest(project);
+ BatchTest test = new BatchTest(getProject());
batchTests.addElement(test);
return test;
}
@@ -523,7 +523,7 @@
Enumeration list = getIndividualTests();
while (list.hasMoreElements()) {
JUnitTest test = (JUnitTest) list.nextElement();
- if (test.shouldRun(project)) {
+ if (test.shouldRun(getProject())) {
execute(test);
}
}
@@ -537,7 +537,7 @@
// set the default values if not specified
//@todo should be moved to the test class instead.
if (test.getTodir() == null) {
- test.setTodir(project.resolveFile("."));
+ test.setTodir(getProject().resolveFile("."));
}
if (test.getOutfile() == null) {
@@ -571,10 +571,10 @@
log("TEST " + test.getName() + " FAILED"
+ (wasKilled ? " (timeout)" : ""), Project.MSG_ERR);
if (errorOccurredHere && test.getErrorProperty() != null) {
- project.setNewProperty(test.getErrorProperty(), "true");
+ getProject().setNewProperty(test.getErrorProperty(), "true");
}
if (failureOccurredHere && test.getFailureProperty() != null) {
- project.setNewProperty(test.getFailureProperty(), "true");
+ getProject().setNewProperty(test.getFailureProperty(), "true");
}
}
}
@@ -635,10 +635,10 @@
// forked test
File propsFile =
FileUtils.newFileUtils().createTempFile("junit", ".properties",
- project.getBaseDir());
+ getProject().getBaseDir());
cmd.createArgument().setValue("propsfile="
+ propsFile.getAbsolutePath());
- Hashtable p = project.getProperties();
+ Hashtable p = getProject().getProperties();
Properties props = new Properties();
for (Enumeration enum = p.keys(); enum.hasMoreElements();) {
Object key = enum.nextElement();
@@ -659,7 +659,7 @@
Project.MSG_WARN),
watchdog);
execute.setCommandline(cmd.getCommandline());
- execute.setAntRun(project);
+ execute.setAntRun(getProject());
if (dir != null) {
execute.setWorkingDirectory(dir);
}
@@ -734,7 +734,7 @@
*/
private int executeInVM(JUnitTest arg) throws BuildException {
JUnitTest test = (JUnitTest) arg.clone();
- test.setProperties(project.getProperties());
+ test.setProperties(getProject().getProperties());
if (dir != null) {
log("dir attribute ignored if running in the same VM",
Project.MSG_WARN);
@@ -765,7 +765,7 @@
classpath.append(antRuntimeClasses);
}
- cl = new AntClassLoader(null, project, classpath, false);
+ cl = new AntClassLoader(null, getProject(), classpath, false);
log("Using CLASSPATH " + cl.getClasspath(),
Project.MSG_VERBOSE);
@@ -882,7 +882,7 @@
String filename = test.getOutfile() + fe.getExtension();
File destFile = new File(test.getTodir(), filename);
String absFilename = destFile.getAbsolutePath();
- return project.resolveFile(absFilename);
+ return getProject().resolveFile(absFilename);
}
return null;
}
1.19 +3 -3 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLResultAggregator.java 9 Jul 2002 21:06:08 -0000 1.18
+++ XMLResultAggregator.java 23 Jul 2002 07:54:54 -0000 1.19
@@ -187,7 +187,7 @@
toFile = DEFAULT_FILENAME;
}
if (toDir == null){
- toDir = project.resolveFile(DEFAULT_DIR);
+ toDir = getProject().resolveFile(DEFAULT_DIR);
}
return new File(toDir, toFile);
}
@@ -202,14 +202,14 @@
final int size = filesets.size();
for (int i = 0; i < size; i++) {
FileSet fs = (FileSet) filesets.elementAt(i);
- DirectoryScanner ds = fs.getDirectoryScanner(project);
+ DirectoryScanner ds = fs.getDirectoryScanner(getProject());
ds.scan();
String[] f = ds.getIncludedFiles();
for (int j = 0; j < f.length; j++) {
String pathname = f[j];
if (pathname.endsWith(".xml")) {
File file = new File(ds.getBasedir(), pathname);
- file = project.resolveFile(file.getPath());
+ file = getProject().resolveFile(file.getPath());
v.addElement(file);
}
}
1.9 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractMetamataTask.java 9 Jul 2002 21:06:08 -0000 1.8
+++ AbstractMetamataTask.java 23 Jul 2002 07:54:54 -0000 1.9
@@ -144,7 +144,7 @@
*/
public Path createClasspath() {
if (classPath == null) {
- classPath = new Path(project);
+ classPath = new Path(getProject());
}
return classPath;
}
@@ -155,7 +155,7 @@
*/
public Path createSourcepath() {
if (sourcePath == null) {
- sourcePath = new Path(project);
+ sourcePath = new Path(getProject());
}
return sourcePath;
}
@@ -212,7 +212,7 @@
// set the classpath as the jar file
File jar = getMetamataJar(metamataHome);
- final Path classPath = cmdl.createClasspath(project);
+ final Path classPath = cmdl.createClasspath(getProject());
classPath.createPathElement().setLocation(jar);
// set the metamata.home property
@@ -332,7 +332,7 @@
Hashtable files = new Hashtable();
for (int i = 0; i < fileSets.size(); i++) {
FileSet fs = (FileSet) fileSets.elementAt(i);
- DirectoryScanner ds = fs.getDirectoryScanner(project);
+ DirectoryScanner ds = fs.getDirectoryScanner(getProject());
ds.scan();
String[] f = ds.getIncludedFiles();
log(i + ") Adding " + f.length + " files from directory " + ds.getBasedir(), Project.MSG_VERBOSE);
1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
Index: MMetrics.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MMetrics.java 9 Jul 2002 21:06:08 -0000 1.6
+++ MMetrics.java 23 Jul 2002 07:54:54 -0000 1.7
@@ -161,7 +161,7 @@
*/
public Path createPath() {
if (path == null) {
- path = new Path(project);
+ path = new Path(getProject());
}
return path;
1.14 +5 -5 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MParse.java 9 Jul 2002 21:06:08 -0000 1.13
+++ MParse.java 23 Jul 2002 07:54:54 -0000 1.14
@@ -144,7 +144,7 @@
// set the classpath as the jar files
File[] jars = getMetamataLibs();
- final Path classPath = cmdl.createClasspath(project);
+ final Path classPath = cmdl.createClasspath(getProject());
for (int i = 0; i < jars.length; i++){
classPath.createPathElement().setLocation(jars[i]);
}
@@ -175,7 +175,7 @@
pathname = pathname.substring(0, pos) + ".java";
File javaFile = new File(pathname);
if (javaFile.exists() && target.lastModified() < javaFile.lastModified()) {
- project.log("Target is already build - skipping (" + target + ")");
+ getProject().log("Target is already build - skipping (" + target + ")");
return;
}
@@ -203,7 +203,7 @@
name = "__jj" + name.substring(0, pos) + ".sunjj";
final File sunjj = new File(target.getParent(), name);
if (sunjj.exists()) {
- project.log("Removing stale file: " + sunjj.getName());
+ getProject().log("Removing stale file: " + sunjj.getName());
sunjj.delete();
}
}
@@ -236,7 +236,7 @@
if (metamataHome == null || !metamataHome.exists()){
throw new BuildException("'metamatahome' must point to Metamata home directory.");
}
- metamataHome = project.resolveFile(metamataHome.getPath());
+ metamataHome = getProject().resolveFile(metamataHome.getPath());
// check that the needed jar exists.
File[] jars = getMetamataLibs();
@@ -252,7 +252,7 @@
|| !target.getName().endsWith(".jj")) {
throw new BuildException("Invalid target: " + target);
}
- target = project.resolveFile(target.getPath());
+ target = getProject().resolveFile(target.getPath());
}
/**
1.25 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Index: FTP.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- FTP.java 9 Jul 2002 21:06:08 -0000 1.24
+++ FTP.java 23 Jul 2002 07:54:54 -0000 1.25
@@ -471,10 +471,10 @@
FileScanner ds;
if (action == SEND_FILES) {
- ds = fs.getDirectoryScanner(project);
+ ds = fs.getDirectoryScanner(getProject());
} else {
ds = new FTPDirectoryScanner(ftp);
- fs.setupDirectoryScanner(ds, project);
+ fs.setupDirectoryScanner(ds, getProject());
ds.scan();
}
@@ -704,7 +704,7 @@
try {
// XXX - why not simply new File(dir, filename)?
- File file = project.resolveFile(new File(dir, filename).getPath());
+ File file = getProject().resolveFile(new File(dir, filename).getPath());
if (newerOnly && isUpToDate(ftp, file, resolveFile(filename))) {
return;
@@ -790,7 +790,7 @@
OutputStream outstream = null;
try {
- File file = project.resolveFile(new File(dir, filename).getPath());
+ File file = getProject().resolveFile(new File(dir, filename).getPath());
if (newerOnly && isUpToDate(ftp, file, resolveFile(filename))) {
return;
1.9 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
Index: P4Add.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- P4Add.java 9 Jul 2002 21:06:09 -0000 1.8
+++ P4Add.java 23 Jul 2002 07:54:55 -0000 1.9
@@ -134,7 +134,7 @@
for (int i = 0; i < filesets.size(); i++) {
FileSet fs = (FileSet) filesets.elementAt(i);
- DirectoryScanner ds = fs.getDirectoryScanner(project);
+ DirectoryScanner ds = fs.getDirectoryScanner(getProject());
//File fromDir = fs.getDir(project);
String[] srcFiles = ds.getIncludedFiles();
1.17 +4 -12 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- P4Base.java 9 Jul 2002 21:06:09 -0000 1.16
+++ P4Base.java 23 Jul 2002 07:54:55 -0000 1.17
@@ -165,13 +165,13 @@
//Get default P4 settings from environment - Mark would have done something cool with
//introspection here.....:-)
String tmpprop;
- if ((tmpprop = project.getProperty("p4.port")) != null) {
+ if ((tmpprop = getProject().getProperty("p4.port")) != null) {
setPort(tmpprop);
}
- if ((tmpprop = project.getProperty("p4.client")) != null) {
+ if ((tmpprop = getProject().getProperty("p4.client")) != null) {
setClient(tmpprop);
}
- if ((tmpprop = project.getProperty("p4.user")) != null) {
+ if ((tmpprop = getProject().getProperty("p4.user")) != null) {
setUser(tmpprop);
}
}
@@ -182,7 +182,6 @@
/** Execute P4 command assembled by subclasses.
@param command The command to run
- @param p4input Input to be fed to command on stdin
@param handler A P4Handler to process any input and output
*/
protected void execP4Command(String command, P4Handler handler) throws BuildException {
@@ -203,13 +202,6 @@
}
commandline.createArgument().setLine(command);
-
- String[] cmdline = commandline.getCommandline();
- String cmdl = "";
- for (int i = 0; i < cmdline.length; i++) {
- cmdl += cmdline[i] + " ";
- }
-
log(commandline.describeCommand(), Project.MSG_VERBOSE);
if (handler == null) {
@@ -218,7 +210,7 @@
Execute exe = new Execute(handler, null);
- exe.setAntRun(project);
+ exe.setAntRun(getProject());
exe.setCommandline(commandline.getCommandline());
1.13 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
Index: P4Change.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- P4Change.java 9 Jul 2002 21:06:09 -0000 1.12
+++ P4Change.java 23 Jul 2002 07:54:55 -0000 1.13
@@ -87,7 +87,7 @@
if (emptyChangeList == null) {
emptyChangeList = getEmptyChangeList();
}
- final Project myProj = project;
+ final Project myProj = getProject();
P4Handler handler = new P4HandlerAdapter() {
public void process(String line) {
1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
Index: P4Counter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- P4Counter.java 9 Jul 2002 21:06:09 -0000 1.7
+++ P4Counter.java 23 Jul 2002 07:54:55 -0000 1.8
@@ -139,7 +139,7 @@
}
if (shouldSetProperty) {
- final Project myProj = project;
+ final Project myProj = getProject();
P4Handler handler = new P4HandlerAdapter() {
public void process(String line) {
1.12 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CovMerge.java 9 Jul 2002 21:06:11 -0000 1.11
+++ CovMerge.java 23 Jul 2002 07:54:55 -0000 1.12
@@ -184,7 +184,7 @@
for (int j = 0; j < f.length; j++) {
String pathname = f[j];
File file = new File(ds.getBasedir(), pathname);
- file = project.resolveFile(file.getPath());
+ file = getProject().resolveFile(file.getPath());
v.addElement(file);
}
}
@@ -210,7 +210,7 @@
pw.println(snapshots[i].getAbsolutePath());
}
// last file is the output snapshot
- pw.println(project.resolveFile(tofile.getPath()));
+ pw.println(getProject().resolveFile(tofile.getPath()));
pw.flush();
} catch (IOException e) {
throw new BuildException("I/O error while writing to " + file, e);
1.13 +6 -6 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
Index: CovReport.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CovReport.java 9 Jul 2002 21:06:12 -0000 1.12
+++ CovReport.java 23 Jul 2002 07:54:55 -0000 1.13
@@ -228,7 +228,7 @@
*/
public Path createSourcepath() {
if (sourcePath == null) {
- sourcePath = new Path(project);
+ sourcePath = new Path(getProject());
}
return sourcePath.createPath();
}
@@ -253,7 +253,7 @@
*/
public Path createCoveragepath() {
if (coveragePath == null) {
- coveragePath = new Path(project);
+ coveragePath = new Path(getProject());
}
return coveragePath.createPath();
}
@@ -342,12 +342,12 @@
if (filters != null) {
v.addElement("-filters=" + filters);
}
- v.addElement("-output=" + project.resolveFile(tofile.getPath()));
- v.addElement("-snapshot=" + project.resolveFile(snapshot.getPath()));
+ v.addElement("-output=" + getProject().resolveFile(tofile.getPath()));
+ v.addElement("-snapshot=" + getProject().resolveFile(snapshot.getPath()));
// as a default -sourcepath use . in JProbe, so use project .
if (sourcePath == null) {
- sourcePath = new Path(project);
- sourcePath.createPath().setLocation(project.resolveFile("."));
+ sourcePath = new Path(getProject());
+ sourcePath.createPath().setLocation(getProject().resolveFile("."));
}
v.addElement("-sourcepath=" + sourcePath);
1.12 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Coverage.java 9 Jul 2002 21:06:12 -0000 1.11
+++ Coverage.java 23 Jul 2002 07:54:55 -0000 1.12
@@ -297,7 +297,7 @@
* classpath to run the files.
*/
public Path createClasspath() {
- return cmdlJava.createClasspath(project).createPath();
+ return cmdlJava.createClasspath(getProject()).createPath();
}
/**
@@ -370,14 +370,14 @@
if (snapshotDir == null) {
snapshotDir = new File(".");
}
- snapshotDir = project.resolveFile(snapshotDir.getPath());
+ snapshotDir = getProject().resolveFile(snapshotDir.getPath());
if (!snapshotDir.isDirectory() || !snapshotDir.exists()) {
throw new BuildException("Snapshot directory does not exists :" + snapshotDir);
}
if (workingDir == null) {
workingDir = new File(".");
}
- workingDir = project.resolveFile(workingDir.getPath());
+ workingDir = getProject().resolveFile(workingDir.getPath());
// check for info, do your best to select the java executable.
// JProbe 3.0 fails if there is no javaexe option. So
@@ -409,7 +409,7 @@
params.addElement("-jp_vm=" + vm);
}
if (javaExe != null) {
- params.addElement("-jp_java_exe=" + project.resolveFile(javaExe.getPath()));
+ params.addElement("-jp_java_exe=" + getProject().resolveFile(javaExe.getPath()));
}
params.addElement("-jp_working_dir=" + workingDir.getPath());
params.addElement("-jp_snapshot_dir=" + snapshotDir.getPath());
1.7 +5 -5 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
Index: SOS.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SOS.java 9 Jul 2002 21:06:12 -0000 1.6
+++ SOS.java 23 Jul 2002 07:54:55 -0000 1.7
@@ -455,10 +455,10 @@
*/
public String getLocalPath() {
if (localPath == null) {
- return project.getBaseDir().getAbsolutePath();
+ return getProject().getBaseDir().getAbsolutePath();
} else {
// make sure localDir exists, create it if it doesn't
- File dir = project.resolveFile(localPath);
+ File dir = getProject().resolveFile(localPath);
if (!dir.exists()) {
boolean done = dir.mkdirs();
if (!done) {
@@ -466,7 +466,7 @@
"successful for an unknown reason";
throw new BuildException(msg, location);
}
- project.log("Created dir: " + dir.getAbsolutePath());
+ getProject().log("Created dir: " + dir.getAbsolutePath());
}
return dir.getAbsolutePath();
}
@@ -486,8 +486,8 @@
Project.MSG_INFO,
Project.MSG_WARN));
- exe.setAntRun(project);
- exe.setWorkingDirectory(project.getBaseDir());
+ exe.setAntRun(getProject());
+ exe.setWorkingDirectory(getProject().getBaseDir());
exe.setCommandline(cmd.getCommandline());
return exe.execute();
} catch (java.io.IOException e) {
1.21 +3 -3 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MSVSS.java 9 Jul 2002 21:06:14 -0000 1.20
+++ MSVSS.java 23 Jul 2002 07:54:55 -0000 1.21
@@ -122,7 +122,7 @@
}
/**
- * @return the appropriate login command if the 'login' attribute was specified, otherwise an empty string
+ * the appropriate login command if the 'login' attribute was specified, otherwise an empty string
*/
public void getLoginCommand(Commandline cmd) {
if (m_vssLogin == null) {
@@ -187,8 +187,8 @@
exe.setEnvironment(newEnv);
}
- exe.setAntRun(project);
- exe.setWorkingDirectory(project.getBaseDir());
+ exe.setAntRun(getProject());
+ exe.setWorkingDirectory(getProject().getBaseDir());
exe.setCommandline(cmd.getCommandline());
return exe.execute();
} catch (java.io.IOException e) {
1.10 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
Index: MSVSSCHECKIN.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MSVSSCHECKIN.java 9 Jul 2002 21:06:14 -0000 1.9
+++ MSVSSCHECKIN.java 23 Jul 2002 07:54:55 -0000 1.10
@@ -138,7 +138,7 @@
return;
} else {
// make sure m_LocalDir exists, create it if it doesn't
- File dir = project.resolveFile(m_LocalPath);
+ File dir = getProject().resolveFile(m_LocalPath);
if (!dir.exists()) {
boolean done = dir.mkdirs();
if (!done) {
@@ -147,7 +147,7 @@
+ "succesful for an unknown reason";
throw new BuildException(msg, location);
}
- project.log("Created dir: " + dir.getAbsolutePath());
+ getProject().log("Created dir: " + dir.getAbsolutePath());
}
cmd.createArgument().setValue(FLAG_OVERRIDE_WORKING_DIR
@@ -164,7 +164,7 @@
}
/**
- * @return the 'recursive' command if the attribute was 'true', otherwise an empty string
+ * the 'recursive' command if the attribute was 'true', otherwise an empty string
*/
public void getRecursiveCommand(Commandline cmd) {
if (!m_Recursive) {
@@ -182,7 +182,7 @@
}
/**
- * @return the 'make writable' command if the attribute was 'true', otherwise an empty string
+ * the 'make writable' command if the attribute was 'true', otherwise an empty string
*/
public void getWritableCommand(Commandline cmd) {
if (!m_Writable) {
1.10 +3 -3 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
Index: MSVSSCHECKOUT.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MSVSSCHECKOUT.java 9 Jul 2002 21:06:14 -0000 1.9
+++ MSVSSCHECKOUT.java 23 Jul 2002 07:54:55 -0000 1.10
@@ -138,7 +138,7 @@
return;
} else {
// make sure m_LocalDir exists, create it if it doesn't
- File dir = project.resolveFile(m_LocalPath);
+ File dir = getProject().resolveFile(m_LocalPath);
if (!dir.exists()) {
boolean done = dir.mkdirs();
if (!done) {
@@ -146,7 +146,7 @@
"succesful for an unknown reason";
throw new BuildException(msg, location);
}
- project.log("Created dir: " + dir.getAbsolutePath());
+ getProject().log("Created dir: " + dir.getAbsolutePath());
}
cmd.createArgument().setValue(FLAG_OVERRIDE_WORKING_DIR + m_LocalPath);
@@ -162,7 +162,7 @@
}
/**
- * @return the 'recursive' command if the attribute was 'true', otherwise an empty string
+ * the 'recursive' command if the attribute was 'true', otherwise an empty string
*/
public void getRecursiveCommand(Commandline cmd) {
if (!m_Recursive) {
1.19 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
Index: MSVSSGET.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MSVSSGET.java 9 Jul 2002 21:06:14 -0000 1.18
+++ MSVSSGET.java 23 Jul 2002 07:54:55 -0000 1.19
@@ -205,7 +205,7 @@
return;
} else {
// make sure m_LocalDir exists, create it if it doesn't
- File dir = project.resolveFile(m_LocalPath);
+ File dir = getProject().resolveFile(m_LocalPath);
if (!dir.exists()) {
boolean done = dir.mkdirs();
if (!done) {
@@ -213,7 +213,7 @@
"successful for an unknown reason";
throw new BuildException(msg, location);
}
- project.log("Created dir: " + dir.getAbsolutePath());
+ getProject().log("Created dir: " + dir.getAbsolutePath());
}
cmd.createArgument().setValue(FLAG_OVERRIDE_WORKING_DIR + m_LocalPath);
@@ -229,7 +229,7 @@
}
/**
- * @return the 'recursive' command if the attribute was 'true', otherwise an empty string
+ * the 'recursive' command if the attribute was 'true', otherwise an empty string
*/
public void getRecursiveCommand(Commandline cmd) {
if (!m_Recursive) {
@@ -260,7 +260,7 @@
}
/**
- * @return the 'make writable' command if the attribute was 'true', otherwise an empty string
+ * the 'make writable' command if the attribute was 'true', otherwise an empty string
*/
public void getWritableCommand(Commandline cmd) {
if (!m_Writable) {
1.8 +4 -4 jakarta-ant/src/main/org/apache/tools/ant/types/Description.java
Index: Description.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Description.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Description.java 7 Mar 2002 16:10:39 -0000 1.7
+++ Description.java 23 Jul 2002 07:54:56 -0000 1.8
@@ -77,11 +77,11 @@
* Adds descriptive text to the project.
*/
public void addText(String text) {
- String currentDescription = project.getDescription();
+ String currentDescription = getProject().getDescription();
if (currentDescription == null) {
- project.setDescription(text);
+ getProject().setDescription(text);
} else {
- project.setDescription(currentDescription + text);
+ getProject().setDescription(currentDescription + text);
}
}
}
1.13 +7 -11 jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLCatalog.java 9 Jul 2002 21:06:14 -0000 1.12
+++ XMLCatalog.java 23 Jul 2002 07:54:56 -0000 1.13
@@ -349,7 +349,7 @@
log("resolveEntity: '" + publicId + "': '" + systemId + "'",
Project.MSG_DEBUG);
- InputSource inputSource = resolveEntityImpl(publicId, systemId);
+ InputSource inputSource = resolveEntityImpl(publicId );
if (inputSource == null) {
log("No matching catalog entry found, parser will use: '" +
@@ -478,11 +478,9 @@
*/
private String removeFragment(String uri) {
String result = uri;
- String fragment = null;
int hashPos = uri.indexOf("#");
if (hashPos >= 0) {
result = uri.substring(0, hashPos);
- fragment = uri.substring(hashPos+1);
}
return result;
}
@@ -502,7 +500,7 @@
// location attribute. This is resolved using the appropriate
// base.
//
- File resFile = project.resolveFile(uri);
+ File resFile = getProject().resolveFile(uri);
InputSource source = null;
if (resFile.exists() && resFile.canRead()) {
@@ -537,9 +535,9 @@
AntClassLoader loader = null;
if (classpath != null) {
- loader = new AntClassLoader(project, classpath);
+ loader = new AntClassLoader(getProject(), classpath);
} else {
- loader = new AntClassLoader(project, Path.systemClasspath);
+ loader = new AntClassLoader(getProject(), Path.systemClasspath);
}
//
@@ -606,8 +604,7 @@
/**
* Implements the guts of the resolveEntity() lookup strategy.
*/
- private InputSource resolveEntityImpl(String publicId,
- String systemId) {
+ private InputSource resolveEntityImpl(String publicId) {
InputSource result = null;
@@ -636,8 +633,7 @@
/**
* Implements the guts of the resolve() lookup strategy.
*/
- private SAXSource resolveImpl(String href, String base)
- throws TransformerException {
+ private SAXSource resolveImpl(String href, String base) {
SAXSource result = null;
InputSource source = null;
1.4 +1 -2 jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
Index: DependSelector.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/DependSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DependSelector.java 9 Jul 2002 21:06:14 -0000 1.3
+++ DependSelector.java 23 Jul 2002 07:54:56 -0000 1.4
@@ -56,7 +56,6 @@
import java.io.File;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Mapper;
import org.apache.tools.ant.util.IdentityMapper;
import org.apache.tools.ant.util.FileNameMapper;
@@ -132,7 +131,7 @@
if (mapperElement != null) {
throw new BuildException("Cannot define more than one mapper");
}
- mapperElement = new Mapper(project);
+ mapperElement = new Mapper(getProject());
return mapperElement;
}
1.4 +1 -2 jakarta-ant/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
Index: PresentSelector.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PresentSelector.java 9 Jul 2002 21:06:14 -0000 1.3
+++ PresentSelector.java 23 Jul 2002 07:54:56 -0000 1.4
@@ -56,7 +56,6 @@
import java.io.File;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Mapper;
import org.apache.tools.ant.util.IdentityMapper;
import org.apache.tools.ant.util.FileNameMapper;
@@ -123,7 +122,7 @@
if (mapperElement != null) {
throw new BuildException("Cannot define more than one mapper");
}
- mapperElement = new Mapper(project);
+ mapperElement = new Mapper(getProject());
return mapperElement;
}
1.3 +1 -1 jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DynamicTask.java
Index: DynamicTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DynamicTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicTask.java 7 May 2002 11:08:33 -0000 1.2
+++ DynamicTask.java 23 Jul 2002 07:54:56 -0000 1.3
@@ -63,7 +63,7 @@
}
public void setDynamicAttribute(String name, String value) {
- project.setNewProperty(name, value);
+ getProject().setNewProperty(name, value);
}
public Object createDynamicElement(String name) {
--
To unsubscribe, e-mail: