diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java index 0c759289d..b2ee761bb 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -96,7 +96,7 @@ public class Available { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } @@ -106,7 +106,7 @@ public class Available { if( this.filepath == null ) { - this.filepath = new Path( getProject() ); + this.filepath = new Path(); } return this.filepath.createPath(); } @@ -129,7 +129,6 @@ public class Available if( classpath != null ) { - classpath.setProject( getProject() ); this.loader = new AntClassLoader( getProject(), classpath ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index b6282598f..88fd3bcfa 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -122,7 +122,7 @@ public class ExecuteOn extends ExecTask { throw new TaskException( "Cannot define more than one mapper" ); } - mapperElement = new Mapper( getProject() ); + mapperElement = new Mapper(); return mapperElement; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java index 025a2eadb..55f912115 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -658,7 +658,7 @@ public class Javac extends MatchingTask { if( bootclasspath == null ) { - bootclasspath = new Path( getProject() ); + bootclasspath = new Path(); } return bootclasspath.createPath(); } @@ -673,7 +673,7 @@ public class Javac extends MatchingTask { if( compileClasspath == null ) { - compileClasspath = new Path( getProject() ); + compileClasspath = new Path(); } return compileClasspath.createPath(); } @@ -701,7 +701,7 @@ public class Javac extends MatchingTask { if( extdirs == null ) { - extdirs = new Path( getProject() ); + extdirs = new Path(); } return extdirs.createPath(); } @@ -716,7 +716,7 @@ public class Javac extends MatchingTask { if( src == null ) { - src = new Path( getProject() ); + src = new Path(); } return src.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index 9c3cf9758..9f261d338 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -146,7 +146,7 @@ public class PathConvert extends Task if( path == null ) { - path = new Path( getProject() ); + path = new Path(); } return path.createPath(); } @@ -162,7 +162,7 @@ public class PathConvert extends Task // If we are a reference, the create a Path from the reference if( isReference() ) { - path = new Path( getProject() ).createPath(); + path = new Path().createPath(); Object obj = refid.getReferencedObject( getProject() ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java index 58f74c258..190d44dd6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -131,7 +131,7 @@ public class Property extends Task { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index a667f18de..2fb48faa8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -369,7 +369,7 @@ public class SQLExec extends Task { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index e21414632..cb5aee12d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -96,7 +96,7 @@ public class UpToDate extends MatchingTask implements Condition { throw new TaskException( "Cannot define more than one mapper" ); } - mapperElement = new Mapper( getProject() ); + mapperElement = new Mapper(); return mapperElement; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java index 3fffbdb03..e8bc69cdc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java @@ -44,7 +44,7 @@ public class Gcj extends DefaultCompilerAdapter throws TaskException { Commandline cmd = new Commandline(); - Path classpath = new Path( m_project ); + Path classpath = new Path(); // gcj doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java index d6c3983d6..4e762faf1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -42,7 +42,7 @@ public class Jikes { getLogger().debug( "Using jikes compiler" ); - Path classpath = new Path( m_project ); + Path classpath = new Path(); // Jikes doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. @@ -77,7 +77,7 @@ public class Jikes String jikesPath = System.getProperty( "jikes.class.path" ); if( jikesPath != null ) { - classpath.append( new Path( m_project, jikesPath ) ); + classpath.append( new Path( jikesPath ) ); } Commandline cmd = new Commandline(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java index 1d84210cb..1313c8d20 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java @@ -29,7 +29,7 @@ public class Jvc extends DefaultCompilerAdapter { getLogger().debug( "Using jvc compiler" ); - Path classpath = new Path( m_project ); + Path classpath = new Path(); // jvc doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java index 34761ad92..e4fcc74ed 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java @@ -84,7 +84,7 @@ public class Kjc extends DefaultCompilerAdapter // generate the clsspath cmd.createArgument().setValue( "-classpath" ); - Path cp = new Path( m_project ); + Path cp = new Path(); // kjc don't have bootclasspath option. if( m_bootclasspath != null ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java index f3b4aca73..3cec09b34 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java @@ -199,11 +199,6 @@ public abstract class ConditionBase extends ProjectComponent { throw new NoSuchElementException(); } - - if( o instanceof ProjectComponent ) - { - ( (ProjectComponent)o ).setProject( getProject() ); - } return o; } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java index d43e25a53..ba4ce8246 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java @@ -75,7 +75,7 @@ public class DocletInfo { if( m_path == null ) { - m_path = new Path( null ); + m_path = new Path(); } return m_path.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index c7aa61bff..03f6c63ff 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -674,7 +674,7 @@ public class IContract extends MatchingTask { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath; } @@ -738,29 +738,29 @@ public class IContract extends MatchingTask // Create the classpath required to compile the sourcefiles BEFORE instrumentation Path beforeInstrumentationClasspath = ( (Path)baseClasspath.clone() ); - beforeInstrumentationClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); + beforeInstrumentationClasspath.append( new Path( srcDir.getAbsolutePath() ) ); // Create the classpath required to compile the sourcefiles AFTER instrumentation Path afterInstrumentationClasspath = ( (Path)baseClasspath.clone() ); - afterInstrumentationClasspath.append( new Path( getProject(), instrumentDir.getAbsolutePath() ) ); - afterInstrumentationClasspath.append( new Path( getProject(), repositoryDir.getAbsolutePath() ) ); - afterInstrumentationClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); - afterInstrumentationClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( instrumentDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( repositoryDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( srcDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( buildDir.getAbsolutePath() ) ); // Create the classpath required to automatically compile the repository files Path repositoryClasspath = ( (Path)baseClasspath.clone() ); - repositoryClasspath.append( new Path( getProject(), instrumentDir.getAbsolutePath() ) ); - repositoryClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); - repositoryClasspath.append( new Path( getProject(), repositoryDir.getAbsolutePath() ) ); - repositoryClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( instrumentDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( srcDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( repositoryDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( buildDir.getAbsolutePath() ) ); // Create the classpath required for iContract itself Path iContractClasspath = ( (Path)baseClasspath.clone() ); - iContractClasspath.append( new Path( getProject(), System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); - iContractClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); - iContractClasspath.append( new Path( getProject(), repositoryDir.getAbsolutePath() ) ); - iContractClasspath.append( new Path( getProject(), instrumentDir.getAbsolutePath() ) ); - iContractClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); + iContractClasspath.append( new Path( srcDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( repositoryDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( instrumentDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) ); // Create a forked java process Java iContract = (Java)getProject().createTask( "java" ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index f4c293d59..7cf182dcc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -206,7 +206,7 @@ public class Javah extends Task { if( bootclasspath == null ) { - bootclasspath = new Path( getProject() ); + bootclasspath = new Path(); } return bootclasspath.createPath(); } @@ -222,7 +222,7 @@ public class Javah extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index 899cee73a..9abdee1f1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -101,7 +101,7 @@ public class Native2Ascii extends MatchingTask { throw new TaskException( "Cannot define more than one mapper" ); } - mapper = new Mapper( getProject() ); + mapper = new Mapper(); return mapper; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java index 339ecdfd9..13a44b7ff 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -197,7 +197,8 @@ public class ReplaceRegExp extends Task } else if( file != null ) { - final String message = "The following file is missing: '" + file.getAbsolutePath() + "'"; + final String message = + "The following file is missing: '" + file.getAbsolutePath() + "'"; getLogger().error( message ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index a0b95ff1a..aa77b8932 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -184,7 +184,7 @@ public class Depend extends MatchingTask { if( dependClasspath == null ) { - dependClasspath = new Path( getProject() ); + dependClasspath = new Path(); } return dependClasspath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index dd0d9793c..de4eef133 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -422,7 +422,7 @@ public class CSharp { //demand create pathlist if( _referenceFiles == null ) - _referenceFiles = new Path( this.getProject() ); + _referenceFiles = new Path(); _referenceFiles.append( path ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index f2d1bf3ed..2c28dad23 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -274,17 +274,18 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec */ protected void addVendorFiles( Hashtable ejbFiles, String ddPrefix ) { - - File borlandDD = new File( getConfig().descriptorDir, ddPrefix + BAS_DD ); + final File borlandDD = new File( getConfig().descriptorDir, ddPrefix + BAS_DD ); if( borlandDD.exists() ) { - getLogger().debug( "Borland specific file found " + borlandDD ); + final String message = "Borland specific file found " + borlandDD; + getLogger().debug( message ); ejbFiles.put( META_DIR + BAS_DD, borlandDD ); } else { - log( "Unable to locate borland deployment descriptor. It was expected to be in " + - borlandDD.getPath(), Project.MSG_WARN ); + final String message = "Unable to locate borland deployment descriptor. " + + "It was expected to be in " + borlandDD.getPath(); + getLogger().warn( message ); return; } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 714d685c5..1f88f706a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -97,7 +97,7 @@ public class BorlandGenerateClient extends Task { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index ef6af70c9..f76d3ac5a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -124,7 +124,7 @@ public class DDCreator extends MatchingTask ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" ); Argument arguments = ddCreatorTask.createArg(); arguments.setLine( args ); - ddCreatorTask.setClasspath( new Path( getProject(), execClassPath ) ); + ddCreatorTask.setClasspath( new Path( execClassPath ) ); if( ddCreatorTask.executeJava() != 0 ) { throw new TaskException( "Execution of ddcreator helper failed" ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index d6e3c63c4..8745f7779 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -254,7 +254,7 @@ public class EjbJar extends MatchingTask { if( config.classpath == null ) { - config.classpath = new Path( getProject() ); + config.classpath = new Path(); } return config.classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 4af926e86..8e69f1456 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -183,7 +183,7 @@ public class Ejbc extends MatchingTask Argument arguments = helperTask.createArg(); arguments.setLine( args ); - helperTask.setClasspath( new Path( getProject(), execClassPath ) ); + helperTask.setClasspath( new Path( execClassPath ) ); if( helperTask.executeJava() != 0 ) { throw new TaskException( "Execution of ejbc helper failed" ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index f41199d45..cdf0afba4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -198,7 +198,7 @@ public class GenericDeploymentTool { if( classpath == null ) { - classpath = new Path( task.getProject() ); + classpath = new Path(); } return classpath.createPath(); } @@ -672,11 +672,6 @@ public class GenericDeploymentTool */ } - protected void log( String message, int level ) - { - getTask().log( message, level ); - } - /** * This method checks the timestamp on each file listed in the * ejbFiles and compares them to the timestamp on the jarFile diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java index f79306664..cfab74a72 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java @@ -176,7 +176,7 @@ public class IPlanetEjbcTask extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java index 6fc8a2151..d723942ba 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java @@ -237,7 +237,7 @@ public class WLRun extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } @@ -251,7 +251,7 @@ public class WLRun extends Task { if( weblogicClasspath == null ) { - weblogicClasspath = new Path( getProject() ); + weblogicClasspath = new Path(); } return weblogicClasspath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java index 6976cab2a..9ac1fc643 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java @@ -120,7 +120,7 @@ public class WLStop extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 44c01e4ae..074d9ac69 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -296,7 +296,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { if( wlClasspath == null ) { - wlClasspath = new Path( getTask().getProject() ); + wlClasspath = new Path(); } return wlClasspath.createPath(); } @@ -323,7 +323,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool protected ClassLoader getClassLoaderFromJar( File classjar ) throws IOException, TaskException { - Path lookupPath = new Path( getTask().getProject() ); + Path lookupPath = new Path(); lookupPath.setLocation( classjar ); Path classpath = getCombinedClasspath(); @@ -740,7 +740,6 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool * @param sourceJar java.io.File representing the source (EJB1.1) jarfile. * @param destJar java.io.File representing the destination, WebLogic * jarfile. - * @param publicId Description of Parameter */ private void buildWeblogicJar( File sourceJar, File destJar, String publicId ) throws TaskException diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 9a8f6de05..57959512c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -376,7 +376,7 @@ public class WebsphereDeploymentTool { if( wasClasspath == null ) { - wasClasspath = new Path( getTask().getProject() ); + wasClasspath = new Path(); } return wasClasspath.createPath(); } @@ -403,7 +403,7 @@ public class WebsphereDeploymentTool protected ClassLoader getClassLoaderFromJar( File classjar ) throws IOException, TaskException { - Path lookupPath = new Path( getTask().getProject() ); + Path lookupPath = new Path(); lookupPath.setLocation( classjar ); Path classpath = getCombinedClasspath(); if( classpath != null ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java new file mode 100644 index 000000000..07322397a --- /dev/null +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ +package org.apache.tools.ant.taskdefs.optional.ide; + +/** + * Adaption of VAJLocalUtil to Task context. + */ +class VAJLocalToolUtil + extends VAJLocalUtil +{ + private VAJTask m_task; + + public VAJLocalToolUtil( final VAJTask task ) + { + m_task = task; + } + + public void log( final String msg, final int level ) + { + m_task.log( msg, level ); + } +} diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index 0ff76723f..d36c9cd54 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -28,7 +28,8 @@ import org.apache.tools.ant.DirectoryScanner; * * @author Wolf Siberski, TUI Infotec GmbH */ -abstract class VAJLocalUtil implements VAJUtil +abstract class VAJLocalUtil + implements VAJUtil { // singleton containing the VAJ workspace private static Workspace workspace; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java index 0a7d56a82..362ad0ef9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java @@ -46,7 +46,7 @@ public class VAJTask extends Task { if( remoteServer == null ) { - util = new VAJLocalToolUtil(); + util = new VAJLocalToolUtil( this ); } else { @@ -56,16 +56,4 @@ public class VAJTask extends Task return util; } - /** - * Adaption of VAJLocalUtil to Task context. - * - * @author RT - */ - class VAJLocalToolUtil extends VAJLocalUtil - { - public void log( String msg, int level ) - { - VAJTask.this.log( msg, level ); - } - } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 90186ed0c..14f54541c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -14,16 +14,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.util.StringUtils; /** * Abstract base class to provide common services for the VAJ tool API servlets * * @author Wolf Siberski, based on servlets written by Glenn McAllister */ -public abstract class VAJToolsServlet extends HttpServlet +public abstract class VAJToolsServlet + extends HttpServlet { - // constants for servlet param names public final static String DIR_PARAM = "dir"; public final static String INCLUDE_PARAM = "include"; @@ -197,10 +196,9 @@ public abstract class VAJToolsServlet extends HttpServlet /** * Adaptation of VAJUtil for servlet context. - * - * @author RT */ - class VAJLocalServletUtil extends VAJLocalUtil + class VAJLocalServletUtil + extends VAJLocalUtil { public void log( String msg, int level ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index 6f32d7660..58b57984a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java @@ -118,7 +118,7 @@ public class JlinkTask extends MatchingTask { if( this.addfiles == null ) { - this.addfiles = new Path( getProject() ); + this.addfiles = new Path(); } return this.addfiles.createPath(); } @@ -134,7 +134,7 @@ public class JlinkTask extends MatchingTask { if( this.mergefiles == null ) { - this.mergefiles = new Path( getProject() ); + this.mergefiles = new Path(); } return this.mergefiles.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index bd9f9d7d2..67445874b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -314,7 +314,7 @@ public class JspC extends MatchingTask throws TaskException { if( classpath == null ) - classpath = new Path( getProject() ); + classpath = new Path(); return classpath.createPath(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 4aa3473cb..205b13f48 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -126,7 +126,7 @@ public class WLJspc extends MatchingTask { if( compileClasspath == null ) { - compileClasspath = new Path( getProject() ); + compileClasspath = new Path(); } return compileClasspath; } @@ -160,7 +160,7 @@ public class WLJspc extends MatchingTask //use the systemclasspath as well, to include the ant jar if( compileClasspath == null ) { - compileClasspath = new Path( getProject() ); + compileClasspath = new Path(); } compileClasspath.append( Path.systemClasspath ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index e9e073498..30b40cc46 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -158,7 +158,7 @@ public abstract class AbstractMetamataTask extends Task { if( classPath == null ) { - classPath = new Path( getProject() ); + classPath = new Path(); } return classPath; } @@ -182,7 +182,7 @@ public abstract class AbstractMetamataTask extends Task { if( sourcePath == null ) { - sourcePath = new Path( getProject() ); + sourcePath = new Path(); } return sourcePath; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index bffb7c1b2..a976e1c73 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -187,7 +187,7 @@ public abstract class DefaultRmicAdapter { // add dest dir to classpath so that previously compiled and // untouched classes are on classpath - Path classpath = new Path( attributes.getProject() ); + Path classpath = new Path(); classpath.setLocation( attributes.getBase() ); // Combine the build classpath with the system classpath, in an diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java index 795f3ba7a..215bc04d8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -228,7 +228,7 @@ public class CommandlineJava implements Cloneable { if( classpath == null ) { - classpath = new Path( p ); + classpath = new Path(); } return classpath; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java index 4cdd0cea2..1810ae5b4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java @@ -38,7 +38,6 @@ public class FileList extends DataType { this.dir = filelist.dir; this.filenames = filelist.filenames; - setProject( filelist.getProject() ); } public void setDir( File dir ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java index b0bb0cd4e..6bc143424 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java @@ -50,7 +50,6 @@ public class FileSet this.additionalPatterns = fileset.additionalPatterns; this.useDefaultExcludes = fileset.useDefaultExcludes; this.isCaseSensitive = fileset.isCaseSensitive; - setProject( getProject() ); } /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java index 1a0d6a603..55117e3ac 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java @@ -62,7 +62,7 @@ public class Path { try { - return new Path( null, System.getProperty( "java.class.path" ) ); + return new Path( System.getProperty( "java.class.path" ) ); } catch( final TaskException te ) { @@ -73,20 +73,16 @@ public class Path /** * Invoked by IntrospectionHelper for setXXX(Path p) attribute * setters. - * - * @param p Description of Parameter - * @param path Description of Parameter */ - public Path( Project p, String path ) + public Path( final String path ) throws TaskException { - this( p ); + this(); createPathElement().setPath( path ); } - public Path( Project project ) + public Path() { - setProject( project ); elements = new ArrayList(); } @@ -113,10 +109,6 @@ public class Path /** * Splits a PATH (with : or ; as separators) into its parts. - * - * @param project Description of Parameter - * @param source Description of Parameter - * @return Description of the Returned Value */ public String[] translatePath( Project project, String source ) { @@ -298,7 +290,7 @@ public class Path String extProp = System.getProperty( "java.ext.dirs" ); if( extProp != null ) { - extdirs = new Path( getProject(), extProp ); + extdirs = new Path( extProp ); } else { @@ -363,38 +355,32 @@ public class Path } else if( Project.getJavaVersion() == Project.JAVA_1_1 ) { - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + "lib" - + File.separator - + "classes.zip" ) ); + final String classes = System.getProperty( "java.home" ) + + File.separator + "lib" + File.separator + "classes.zip"; + addExisting( new Path( classes ) ); } else { // JDK > 1.1 seems to set java.home to the JRE directory. - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + "lib" - + File.separator + "rt.jar" ) ); + final String rt = System.getProperty( "java.home" ) + + File.separator + "lib" + File.separator + "rt.jar"; + addExisting( new Path( rt ) ); // Just keep the old version as well and let addExisting // sort it out. - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + "jre" - + File.separator + "lib" - + File.separator + "rt.jar" ) ); + final String rt2 = System.getProperty( "java.home" ) + + File.separator + "jre" + File.separator + "lib" + + File.separator + "rt.jar"; + addExisting( new Path( rt2 ) ); // Added for MacOS X - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + ".." - + File.separator + "Classes" - + File.separator + "classes.jar" ) ); - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + ".." - + File.separator + "Classes" - + File.separator + "ui.jar" ) ); + final String classes = System.getProperty( "java.home" ) + + File.separator + ".." + File.separator + "Classes" + + File.separator + "classes.jar"; + addExisting( new Path( classes ) ); + final String ui = System.getProperty( "java.home" ) + + File.separator + ".." + File.separator + "Classes" + + File.separator + "ui.jar"; + addExisting( new Path( ui ) ); } } @@ -427,7 +413,7 @@ public class Path { try { - Path p = new Path( getProject() ); + Path p = new Path(); p.append( this ); return p; } @@ -461,7 +447,7 @@ public class Path public Path concatSystemClasspath( String defValue ) throws TaskException { - Path result = new Path( getProject() ); + Path result = new Path(); String order = defValue; if( getProject() != null ) @@ -521,7 +507,7 @@ public class Path { throw noChildrenAllowed(); } - Path p = new Path( getProject() ); + Path p = new Path(); elements.add( p ); checked = false; return p; @@ -597,10 +583,6 @@ public class Path else if( o instanceof Path ) { Path p = (Path)o; - if( p.getProject() == null ) - { - p.setProject( getProject() ); - } String[] parts = p.list(); for( int j = 0; j < parts.length; j++ ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java index 0c759289d..b2ee761bb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java @@ -96,7 +96,7 @@ public class Available { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } @@ -106,7 +106,7 @@ public class Available { if( this.filepath == null ) { - this.filepath = new Path( getProject() ); + this.filepath = new Path(); } return this.filepath.createPath(); } @@ -129,7 +129,6 @@ public class Available if( classpath != null ) { - classpath.setProject( getProject() ); this.loader = new AntClassLoader( getProject(), classpath ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java index b6282598f..88fd3bcfa 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -122,7 +122,7 @@ public class ExecuteOn extends ExecTask { throw new TaskException( "Cannot define more than one mapper" ); } - mapperElement = new Mapper( getProject() ); + mapperElement = new Mapper(); return mapperElement; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java index 025a2eadb..55f912115 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java @@ -658,7 +658,7 @@ public class Javac extends MatchingTask { if( bootclasspath == null ) { - bootclasspath = new Path( getProject() ); + bootclasspath = new Path(); } return bootclasspath.createPath(); } @@ -673,7 +673,7 @@ public class Javac extends MatchingTask { if( compileClasspath == null ) { - compileClasspath = new Path( getProject() ); + compileClasspath = new Path(); } return compileClasspath.createPath(); } @@ -701,7 +701,7 @@ public class Javac extends MatchingTask { if( extdirs == null ) { - extdirs = new Path( getProject() ); + extdirs = new Path(); } return extdirs.createPath(); } @@ -716,7 +716,7 @@ public class Javac extends MatchingTask { if( src == null ) { - src = new Path( getProject() ); + src = new Path(); } return src.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java index 9c3cf9758..9f261d338 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java @@ -146,7 +146,7 @@ public class PathConvert extends Task if( path == null ) { - path = new Path( getProject() ); + path = new Path(); } return path.createPath(); } @@ -162,7 +162,7 @@ public class PathConvert extends Task // If we are a reference, the create a Path from the reference if( isReference() ) { - path = new Path( getProject() ).createPath(); + path = new Path().createPath(); Object obj = refid.getReferencedObject( getProject() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java index 58f74c258..190d44dd6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java @@ -131,7 +131,7 @@ public class Property extends Task { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java index a667f18de..2fb48faa8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java @@ -369,7 +369,7 @@ public class SQLExec extends Task { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java index e21414632..cb5aee12d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java @@ -96,7 +96,7 @@ public class UpToDate extends MatchingTask implements Condition { throw new TaskException( "Cannot define more than one mapper" ); } - mapperElement = new Mapper( getProject() ); + mapperElement = new Mapper(); return mapperElement; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java index 3fffbdb03..e8bc69cdc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java @@ -44,7 +44,7 @@ public class Gcj extends DefaultCompilerAdapter throws TaskException { Commandline cmd = new Commandline(); - Path classpath = new Path( m_project ); + Path classpath = new Path(); // gcj doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java index d6c3983d6..4e762faf1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -42,7 +42,7 @@ public class Jikes { getLogger().debug( "Using jikes compiler" ); - Path classpath = new Path( m_project ); + Path classpath = new Path(); // Jikes doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. @@ -77,7 +77,7 @@ public class Jikes String jikesPath = System.getProperty( "jikes.class.path" ); if( jikesPath != null ) { - classpath.append( new Path( m_project, jikesPath ) ); + classpath.append( new Path( jikesPath ) ); } Commandline cmd = new Commandline(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java index 1d84210cb..1313c8d20 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java @@ -29,7 +29,7 @@ public class Jvc extends DefaultCompilerAdapter { getLogger().debug( "Using jvc compiler" ); - Path classpath = new Path( m_project ); + Path classpath = new Path(); // jvc doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java index 34761ad92..e4fcc74ed 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java @@ -84,7 +84,7 @@ public class Kjc extends DefaultCompilerAdapter // generate the clsspath cmd.createArgument().setValue( "-classpath" ); - Path cp = new Path( m_project ); + Path cp = new Path(); // kjc don't have bootclasspath option. if( m_bootclasspath != null ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/ConditionBase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/ConditionBase.java index f3b4aca73..3cec09b34 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/ConditionBase.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/ConditionBase.java @@ -199,11 +199,6 @@ public abstract class ConditionBase extends ProjectComponent { throw new NoSuchElementException(); } - - if( o instanceof ProjectComponent ) - { - ( (ProjectComponent)o ).setProject( getProject() ); - } return o; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java index d43e25a53..ba4ce8246 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java @@ -75,7 +75,7 @@ public class DocletInfo { if( m_path == null ) { - m_path = new Path( null ); + m_path = new Path(); } return m_path.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java index c7aa61bff..03f6c63ff 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -674,7 +674,7 @@ public class IContract extends MatchingTask { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath; } @@ -738,29 +738,29 @@ public class IContract extends MatchingTask // Create the classpath required to compile the sourcefiles BEFORE instrumentation Path beforeInstrumentationClasspath = ( (Path)baseClasspath.clone() ); - beforeInstrumentationClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); + beforeInstrumentationClasspath.append( new Path( srcDir.getAbsolutePath() ) ); // Create the classpath required to compile the sourcefiles AFTER instrumentation Path afterInstrumentationClasspath = ( (Path)baseClasspath.clone() ); - afterInstrumentationClasspath.append( new Path( getProject(), instrumentDir.getAbsolutePath() ) ); - afterInstrumentationClasspath.append( new Path( getProject(), repositoryDir.getAbsolutePath() ) ); - afterInstrumentationClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); - afterInstrumentationClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( instrumentDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( repositoryDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( srcDir.getAbsolutePath() ) ); + afterInstrumentationClasspath.append( new Path( buildDir.getAbsolutePath() ) ); // Create the classpath required to automatically compile the repository files Path repositoryClasspath = ( (Path)baseClasspath.clone() ); - repositoryClasspath.append( new Path( getProject(), instrumentDir.getAbsolutePath() ) ); - repositoryClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); - repositoryClasspath.append( new Path( getProject(), repositoryDir.getAbsolutePath() ) ); - repositoryClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( instrumentDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( srcDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( repositoryDir.getAbsolutePath() ) ); + repositoryClasspath.append( new Path( buildDir.getAbsolutePath() ) ); // Create the classpath required for iContract itself Path iContractClasspath = ( (Path)baseClasspath.clone() ); - iContractClasspath.append( new Path( getProject(), System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); - iContractClasspath.append( new Path( getProject(), srcDir.getAbsolutePath() ) ); - iContractClasspath.append( new Path( getProject(), repositoryDir.getAbsolutePath() ) ); - iContractClasspath.append( new Path( getProject(), instrumentDir.getAbsolutePath() ) ); - iContractClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); + iContractClasspath.append( new Path( srcDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( repositoryDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( instrumentDir.getAbsolutePath() ) ); + iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) ); // Create a forked java process Java iContract = (Java)getProject().createTask( "java" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java index f4c293d59..7cf182dcc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -206,7 +206,7 @@ public class Javah extends Task { if( bootclasspath == null ) { - bootclasspath = new Path( getProject() ); + bootclasspath = new Path(); } return bootclasspath.createPath(); } @@ -222,7 +222,7 @@ public class Javah extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index 899cee73a..9abdee1f1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -101,7 +101,7 @@ public class Native2Ascii extends MatchingTask { throw new TaskException( "Cannot define more than one mapper" ); } - mapper = new Mapper( getProject() ); + mapper = new Mapper(); return mapper; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java index 339ecdfd9..13a44b7ff 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -197,7 +197,8 @@ public class ReplaceRegExp extends Task } else if( file != null ) { - final String message = "The following file is missing: '" + file.getAbsolutePath() + "'"; + final String message = + "The following file is missing: '" + file.getAbsolutePath() + "'"; getLogger().error( message ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index a0b95ff1a..aa77b8932 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -184,7 +184,7 @@ public class Depend extends MatchingTask { if( dependClasspath == null ) { - dependClasspath = new Path( getProject() ); + dependClasspath = new Path(); } return dependClasspath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index dd0d9793c..de4eef133 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -422,7 +422,7 @@ public class CSharp { //demand create pathlist if( _referenceFiles == null ) - _referenceFiles = new Path( this.getProject() ); + _referenceFiles = new Path(); _referenceFiles.append( path ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index f2d1bf3ed..2c28dad23 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -274,17 +274,18 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec */ protected void addVendorFiles( Hashtable ejbFiles, String ddPrefix ) { - - File borlandDD = new File( getConfig().descriptorDir, ddPrefix + BAS_DD ); + final File borlandDD = new File( getConfig().descriptorDir, ddPrefix + BAS_DD ); if( borlandDD.exists() ) { - getLogger().debug( "Borland specific file found " + borlandDD ); + final String message = "Borland specific file found " + borlandDD; + getLogger().debug( message ); ejbFiles.put( META_DIR + BAS_DD, borlandDD ); } else { - log( "Unable to locate borland deployment descriptor. It was expected to be in " + - borlandDD.getPath(), Project.MSG_WARN ); + final String message = "Unable to locate borland deployment descriptor. " + + "It was expected to be in " + borlandDD.getPath(); + getLogger().warn( message ); return; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 714d685c5..1f88f706a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -97,7 +97,7 @@ public class BorlandGenerateClient extends Task { if( this.classpath == null ) { - this.classpath = new Path( getProject() ); + this.classpath = new Path(); } return this.classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index ef6af70c9..f76d3ac5a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -124,7 +124,7 @@ public class DDCreator extends MatchingTask ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" ); Argument arguments = ddCreatorTask.createArg(); arguments.setLine( args ); - ddCreatorTask.setClasspath( new Path( getProject(), execClassPath ) ); + ddCreatorTask.setClasspath( new Path( execClassPath ) ); if( ddCreatorTask.executeJava() != 0 ) { throw new TaskException( "Execution of ddcreator helper failed" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index d6e3c63c4..8745f7779 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -254,7 +254,7 @@ public class EjbJar extends MatchingTask { if( config.classpath == null ) { - config.classpath = new Path( getProject() ); + config.classpath = new Path(); } return config.classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 4af926e86..8e69f1456 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -183,7 +183,7 @@ public class Ejbc extends MatchingTask Argument arguments = helperTask.createArg(); arguments.setLine( args ); - helperTask.setClasspath( new Path( getProject(), execClassPath ) ); + helperTask.setClasspath( new Path( execClassPath ) ); if( helperTask.executeJava() != 0 ) { throw new TaskException( "Execution of ejbc helper failed" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index f41199d45..cdf0afba4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -198,7 +198,7 @@ public class GenericDeploymentTool { if( classpath == null ) { - classpath = new Path( task.getProject() ); + classpath = new Path(); } return classpath.createPath(); } @@ -672,11 +672,6 @@ public class GenericDeploymentTool */ } - protected void log( String message, int level ) - { - getTask().log( message, level ); - } - /** * This method checks the timestamp on each file listed in the * ejbFiles and compares them to the timestamp on the jarFile diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java index f79306664..cfab74a72 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java @@ -176,7 +176,7 @@ public class IPlanetEjbcTask extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java index 6fc8a2151..d723942ba 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java @@ -237,7 +237,7 @@ public class WLRun extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } @@ -251,7 +251,7 @@ public class WLRun extends Task { if( weblogicClasspath == null ) { - weblogicClasspath = new Path( getProject() ); + weblogicClasspath = new Path(); } return weblogicClasspath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java index 6976cab2a..9ac1fc643 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java @@ -120,7 +120,7 @@ public class WLStop extends Task { if( classpath == null ) { - classpath = new Path( getProject() ); + classpath = new Path(); } return classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 44c01e4ae..074d9ac69 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -296,7 +296,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { if( wlClasspath == null ) { - wlClasspath = new Path( getTask().getProject() ); + wlClasspath = new Path(); } return wlClasspath.createPath(); } @@ -323,7 +323,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool protected ClassLoader getClassLoaderFromJar( File classjar ) throws IOException, TaskException { - Path lookupPath = new Path( getTask().getProject() ); + Path lookupPath = new Path(); lookupPath.setLocation( classjar ); Path classpath = getCombinedClasspath(); @@ -740,7 +740,6 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool * @param sourceJar java.io.File representing the source (EJB1.1) jarfile. * @param destJar java.io.File representing the destination, WebLogic * jarfile. - * @param publicId Description of Parameter */ private void buildWeblogicJar( File sourceJar, File destJar, String publicId ) throws TaskException diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 9a8f6de05..57959512c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -376,7 +376,7 @@ public class WebsphereDeploymentTool { if( wasClasspath == null ) { - wasClasspath = new Path( getTask().getProject() ); + wasClasspath = new Path(); } return wasClasspath.createPath(); } @@ -403,7 +403,7 @@ public class WebsphereDeploymentTool protected ClassLoader getClassLoaderFromJar( File classjar ) throws IOException, TaskException { - Path lookupPath = new Path( getTask().getProject() ); + Path lookupPath = new Path(); lookupPath.setLocation( classjar ); Path classpath = getCombinedClasspath(); if( classpath != null ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java new file mode 100644 index 000000000..07322397a --- /dev/null +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ +package org.apache.tools.ant.taskdefs.optional.ide; + +/** + * Adaption of VAJLocalUtil to Task context. + */ +class VAJLocalToolUtil + extends VAJLocalUtil +{ + private VAJTask m_task; + + public VAJLocalToolUtil( final VAJTask task ) + { + m_task = task; + } + + public void log( final String msg, final int level ) + { + m_task.log( msg, level ); + } +} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index 0ff76723f..d36c9cd54 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -28,7 +28,8 @@ import org.apache.tools.ant.DirectoryScanner; * * @author Wolf Siberski, TUI Infotec GmbH */ -abstract class VAJLocalUtil implements VAJUtil +abstract class VAJLocalUtil + implements VAJUtil { // singleton containing the VAJ workspace private static Workspace workspace; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java index 0a7d56a82..362ad0ef9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java @@ -46,7 +46,7 @@ public class VAJTask extends Task { if( remoteServer == null ) { - util = new VAJLocalToolUtil(); + util = new VAJLocalToolUtil( this ); } else { @@ -56,16 +56,4 @@ public class VAJTask extends Task return util; } - /** - * Adaption of VAJLocalUtil to Task context. - * - * @author RT - */ - class VAJLocalToolUtil extends VAJLocalUtil - { - public void log( String msg, int level ) - { - VAJTask.this.log( msg, level ); - } - } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 90186ed0c..14f54541c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -14,16 +14,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.util.StringUtils; /** * Abstract base class to provide common services for the VAJ tool API servlets * * @author Wolf Siberski, based on servlets written by Glenn McAllister */ -public abstract class VAJToolsServlet extends HttpServlet +public abstract class VAJToolsServlet + extends HttpServlet { - // constants for servlet param names public final static String DIR_PARAM = "dir"; public final static String INCLUDE_PARAM = "include"; @@ -197,10 +196,9 @@ public abstract class VAJToolsServlet extends HttpServlet /** * Adaptation of VAJUtil for servlet context. - * - * @author RT */ - class VAJLocalServletUtil extends VAJLocalUtil + class VAJLocalServletUtil + extends VAJLocalUtil { public void log( String msg, int level ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index 6f32d7660..58b57984a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java @@ -118,7 +118,7 @@ public class JlinkTask extends MatchingTask { if( this.addfiles == null ) { - this.addfiles = new Path( getProject() ); + this.addfiles = new Path(); } return this.addfiles.createPath(); } @@ -134,7 +134,7 @@ public class JlinkTask extends MatchingTask { if( this.mergefiles == null ) { - this.mergefiles = new Path( getProject() ); + this.mergefiles = new Path(); } return this.mergefiles.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index bd9f9d7d2..67445874b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -314,7 +314,7 @@ public class JspC extends MatchingTask throws TaskException { if( classpath == null ) - classpath = new Path( getProject() ); + classpath = new Path(); return classpath.createPath(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 4aa3473cb..205b13f48 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -126,7 +126,7 @@ public class WLJspc extends MatchingTask { if( compileClasspath == null ) { - compileClasspath = new Path( getProject() ); + compileClasspath = new Path(); } return compileClasspath; } @@ -160,7 +160,7 @@ public class WLJspc extends MatchingTask //use the systemclasspath as well, to include the ant jar if( compileClasspath == null ) { - compileClasspath = new Path( getProject() ); + compileClasspath = new Path(); } compileClasspath.append( Path.systemClasspath ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index e9e073498..30b40cc46 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -158,7 +158,7 @@ public abstract class AbstractMetamataTask extends Task { if( classPath == null ) { - classPath = new Path( getProject() ); + classPath = new Path(); } return classPath; } @@ -182,7 +182,7 @@ public abstract class AbstractMetamataTask extends Task { if( sourcePath == null ) { - sourcePath = new Path( getProject() ); + sourcePath = new Path(); } return sourcePath; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index bffb7c1b2..a976e1c73 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -187,7 +187,7 @@ public abstract class DefaultRmicAdapter { // add dest dir to classpath so that previously compiled and // untouched classes are on classpath - Path classpath = new Path( attributes.getProject() ); + Path classpath = new Path(); classpath.setLocation( attributes.getBase() ); // Combine the build classpath with the system classpath, in an diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java index 795f3ba7a..215bc04d8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java @@ -228,7 +228,7 @@ public class CommandlineJava implements Cloneable { if( classpath == null ) { - classpath = new Path( p ); + classpath = new Path(); } return classpath; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java index 4cdd0cea2..1810ae5b4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java @@ -38,7 +38,6 @@ public class FileList extends DataType { this.dir = filelist.dir; this.filenames = filelist.filenames; - setProject( filelist.getProject() ); } public void setDir( File dir ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java index b0bb0cd4e..6bc143424 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java @@ -50,7 +50,6 @@ public class FileSet this.additionalPatterns = fileset.additionalPatterns; this.useDefaultExcludes = fileset.useDefaultExcludes; this.isCaseSensitive = fileset.isCaseSensitive; - setProject( getProject() ); } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java index 1a0d6a603..55117e3ac 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java @@ -62,7 +62,7 @@ public class Path { try { - return new Path( null, System.getProperty( "java.class.path" ) ); + return new Path( System.getProperty( "java.class.path" ) ); } catch( final TaskException te ) { @@ -73,20 +73,16 @@ public class Path /** * Invoked by IntrospectionHelper for setXXX(Path p) attribute * setters. - * - * @param p Description of Parameter - * @param path Description of Parameter */ - public Path( Project p, String path ) + public Path( final String path ) throws TaskException { - this( p ); + this(); createPathElement().setPath( path ); } - public Path( Project project ) + public Path() { - setProject( project ); elements = new ArrayList(); } @@ -113,10 +109,6 @@ public class Path /** * Splits a PATH (with : or ; as separators) into its parts. - * - * @param project Description of Parameter - * @param source Description of Parameter - * @return Description of the Returned Value */ public String[] translatePath( Project project, String source ) { @@ -298,7 +290,7 @@ public class Path String extProp = System.getProperty( "java.ext.dirs" ); if( extProp != null ) { - extdirs = new Path( getProject(), extProp ); + extdirs = new Path( extProp ); } else { @@ -363,38 +355,32 @@ public class Path } else if( Project.getJavaVersion() == Project.JAVA_1_1 ) { - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + "lib" - + File.separator - + "classes.zip" ) ); + final String classes = System.getProperty( "java.home" ) + + File.separator + "lib" + File.separator + "classes.zip"; + addExisting( new Path( classes ) ); } else { // JDK > 1.1 seems to set java.home to the JRE directory. - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + "lib" - + File.separator + "rt.jar" ) ); + final String rt = System.getProperty( "java.home" ) + + File.separator + "lib" + File.separator + "rt.jar"; + addExisting( new Path( rt ) ); // Just keep the old version as well and let addExisting // sort it out. - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + "jre" - + File.separator + "lib" - + File.separator + "rt.jar" ) ); + final String rt2 = System.getProperty( "java.home" ) + + File.separator + "jre" + File.separator + "lib" + + File.separator + "rt.jar"; + addExisting( new Path( rt2 ) ); // Added for MacOS X - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + ".." - + File.separator + "Classes" - + File.separator + "classes.jar" ) ); - addExisting( new Path( null, - System.getProperty( "java.home" ) - + File.separator + ".." - + File.separator + "Classes" - + File.separator + "ui.jar" ) ); + final String classes = System.getProperty( "java.home" ) + + File.separator + ".." + File.separator + "Classes" + + File.separator + "classes.jar"; + addExisting( new Path( classes ) ); + final String ui = System.getProperty( "java.home" ) + + File.separator + ".." + File.separator + "Classes" + + File.separator + "ui.jar"; + addExisting( new Path( ui ) ); } } @@ -427,7 +413,7 @@ public class Path { try { - Path p = new Path( getProject() ); + Path p = new Path(); p.append( this ); return p; } @@ -461,7 +447,7 @@ public class Path public Path concatSystemClasspath( String defValue ) throws TaskException { - Path result = new Path( getProject() ); + Path result = new Path(); String order = defValue; if( getProject() != null ) @@ -521,7 +507,7 @@ public class Path { throw noChildrenAllowed(); } - Path p = new Path( getProject() ); + Path p = new Path(); elements.add( p ); checked = false; return p; @@ -597,10 +583,6 @@ public class Path else if( o instanceof Path ) { Path p = (Path)o; - if( p.getProject() == null ) - { - p.setProject( getProject() ); - } String[] parts = p.list(); for( int j = 0; j < parts.length; j++ ) {