You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2001/12/30 01:21:53 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types CommandlineJava.java FileList.java FileSet.java Path.java
donaldp 01/12/29 16:21:53
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Available.java ExecuteOn.java Javac.java
PathConvert.java Property.java SQLExec.java
UpToDate.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
Gcj.java Jikes.java Jvc.java Kjc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition
ConditionBase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
DocletInfo.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
IContract.java Javah.java Native2Ascii.java
ReplaceRegExp.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend
Depend.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java
BorlandGenerateClient.java DDCreator.java
EjbJar.java Ejbc.java GenericDeploymentTool.java
IPlanetEjbcTask.java WLRun.java WLStop.java
WeblogicDeploymentTool.java
WebsphereDeploymentTool.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJLocalUtil.java VAJTask.java VAJToolsServlet.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink
JlinkTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java WLJspc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
AbstractMetamataTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic
DefaultRmicAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/types
CommandlineJava.java FileList.java FileSet.java
Path.java
Added: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJLocalToolUtil.java
Log:
Update classes so that Path no longer accepts a Project object in its constructor and there is no setProject in ProjectComponent objects
Revision Changes Path
1.11 +2 -3 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
Index: Available.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Available.java 23 Dec 2001 14:21:50 -0000 1.10
+++ Available.java 30 Dec 2001 00:21:51 -0000 1.11
@@ -96,7 +96,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( getProject() );
+ this.classpath = new Path();
}
return this.classpath.createPath();
}
@@ -106,7 +106,7 @@
{
if( this.filepath == null )
{
- this.filepath = new Path( getProject() );
+ this.filepath = new Path();
}
return this.filepath.createPath();
}
@@ -129,7 +129,6 @@
if( classpath != null )
{
- classpath.setProject( getProject() );
this.loader = new AntClassLoader( getProject(), classpath );
}
1.17 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExecuteOn.java 23 Dec 2001 14:21:50 -0000 1.16
+++ ExecuteOn.java 30 Dec 2001 00:21:51 -0000 1.17
@@ -122,7 +122,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- mapperElement = new Mapper( getProject() );
+ mapperElement = new Mapper();
return mapperElement;
}
1.14 +4 -4 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Javac.java 23 Dec 2001 14:21:50 -0000 1.13
+++ Javac.java 30 Dec 2001 00:21:51 -0000 1.14
@@ -658,7 +658,7 @@
{
if( bootclasspath == null )
{
- bootclasspath = new Path( getProject() );
+ bootclasspath = new Path();
}
return bootclasspath.createPath();
}
@@ -673,7 +673,7 @@
{
if( compileClasspath == null )
{
- compileClasspath = new Path( getProject() );
+ compileClasspath = new Path();
}
return compileClasspath.createPath();
}
@@ -701,7 +701,7 @@
{
if( extdirs == null )
{
- extdirs = new Path( getProject() );
+ extdirs = new Path();
}
return extdirs.createPath();
}
@@ -716,7 +716,7 @@
{
if( src == null )
{
- src = new Path( getProject() );
+ src = new Path();
}
return src.createPath();
}
1.8 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PathConvert.java 23 Dec 2001 14:21:50 -0000 1.7
+++ PathConvert.java 30 Dec 2001 00:21:51 -0000 1.8
@@ -146,7 +146,7 @@
if( path == null )
{
- path = new Path( getProject() );
+ path = new Path();
}
return path.createPath();
}
@@ -162,7 +162,7 @@
// 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() );
1.18 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Property.java 23 Dec 2001 14:21:50 -0000 1.17
+++ Property.java 30 Dec 2001 00:21:51 -0000 1.18
@@ -131,7 +131,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( getProject() );
+ this.classpath = new Path();
}
return this.classpath.createPath();
}
1.12 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SQLExec.java 23 Dec 2001 14:21:50 -0000 1.11
+++ SQLExec.java 30 Dec 2001 00:21:51 -0000 1.12
@@ -369,7 +369,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( getProject() );
+ this.classpath = new Path();
}
return this.classpath.createPath();
}
1.12 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
Index: UpToDate.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UpToDate.java 23 Dec 2001 14:21:50 -0000 1.11
+++ UpToDate.java 30 Dec 2001 00:21:51 -0000 1.12
@@ -96,7 +96,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- mapperElement = new Mapper( getProject() );
+ mapperElement = new Mapper();
return mapperElement;
}
1.6 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
Index: Gcj.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Gcj.java 23 Dec 2001 14:22:44 -0000 1.5
+++ Gcj.java 30 Dec 2001 00:21:51 -0000 1.6
@@ -44,7 +44,7 @@
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.
1.6 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Jikes.java 23 Dec 2001 14:22:44 -0000 1.5
+++ Jikes.java 30 Dec 2001 00:21:51 -0000 1.6
@@ -42,7 +42,7 @@
{
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 @@
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();
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
Index: Jvc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Jvc.java 23 Dec 2001 14:22:44 -0000 1.4
+++ Jvc.java 30 Dec 2001 00:21:51 -0000 1.5
@@ -29,7 +29,7 @@
{
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.
1.7 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
Index: Kjc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Kjc.java 23 Dec 2001 14:22:44 -0000 1.6
+++ Kjc.java 30 Dec 2001 00:21:51 -0000 1.7
@@ -84,7 +84,7 @@
// 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 )
1.6 +1 -6 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
Index: ConditionBase.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConditionBase.java 23 Dec 2001 06:34:23 -0000 1.5
+++ ConditionBase.java 30 Dec 2001 00:21:51 -0000 1.6
@@ -22,7 +22,7 @@
* conditions are in sync.
*
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public abstract class ConditionBase extends ProjectComponent
{
@@ -198,11 +198,6 @@
catch( ArrayIndexOutOfBoundsException e )
{
throw new NoSuchElementException();
- }
-
- if( o instanceof ProjectComponent )
- {
- ( (ProjectComponent)o ).setProject( getProject() );
}
return o;
}
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java
Index: DocletInfo.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocletInfo.java 23 Dec 2001 07:07:04 -0000 1.2
+++ DocletInfo.java 30 Dec 2001 00:21:51 -0000 1.3
@@ -75,7 +75,7 @@
{
if( m_path == null )
{
- m_path = new Path( null );
+ m_path = new Path();
}
return m_path.createPath();
}
1.12 +15 -15 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
Index: IContract.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IContract.java 23 Dec 2001 14:17:40 -0000 1.11
+++ IContract.java 30 Dec 2001 00:21:51 -0000 1.12
@@ -674,7 +674,7 @@
{
if( classpath == null )
{
- classpath = new Path( getProject() );
+ classpath = new Path();
}
return classpath;
}
@@ -738,29 +738,29 @@
// 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" );
1.10 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
Index: Javah.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Javah.java 23 Dec 2001 14:17:40 -0000 1.9
+++ Javah.java 30 Dec 2001 00:21:51 -0000 1.10
@@ -206,7 +206,7 @@
{
if( bootclasspath == null )
{
- bootclasspath = new Path( getProject() );
+ bootclasspath = new Path();
}
return bootclasspath.createPath();
}
@@ -222,7 +222,7 @@
{
if( classpath == null )
{
- classpath = new Path( getProject() );
+ classpath = new Path();
}
return classpath.createPath();
}
1.9 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
Index: Native2Ascii.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Native2Ascii.java 23 Dec 2001 14:17:40 -0000 1.8
+++ Native2Ascii.java 30 Dec 2001 00:21:51 -0000 1.9
@@ -101,7 +101,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- mapper = new Mapper( getProject() );
+ mapper = new Mapper();
return mapper;
}
1.9 +2 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
Index: ReplaceRegExp.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ReplaceRegExp.java 23 Dec 2001 14:17:40 -0000 1.8
+++ ReplaceRegExp.java 30 Dec 2001 00:21:51 -0000 1.9
@@ -197,7 +197,8 @@
}
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 );
}
1.10 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
Index: Depend.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Depend.java 23 Dec 2001 14:22:45 -0000 1.9
+++ Depend.java 30 Dec 2001 00:21:51 -0000 1.10
@@ -184,7 +184,7 @@
{
if( dependClasspath == null )
{
- dependClasspath = new Path( getProject() );
+ dependClasspath = new Path();
}
return dependClasspath.createPath();
}
1.9 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CSharp.java 23 Dec 2001 06:31:55 -0000 1.8
+++ CSharp.java 30 Dec 2001 00:21:51 -0000 1.9
@@ -422,7 +422,7 @@
{
//demand create pathlist
if( _referenceFiles == null )
- _referenceFiles = new Path( this.getProject() );
+ _referenceFiles = new Path();
_referenceFiles.append( path );
}
1.13 +6 -5 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BorlandDeploymentTool.java 23 Dec 2001 14:22:45 -0000 1.12
+++ BorlandDeploymentTool.java 30 Dec 2001 00:21:52 -0000 1.13
@@ -274,17 +274,18 @@
*/
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;
}
}
1.10 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BorlandGenerateClient.java 23 Dec 2001 14:22:45 -0000 1.9
+++ BorlandGenerateClient.java 30 Dec 2001 00:21:52 -0000 1.10
@@ -97,7 +97,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( getProject() );
+ this.classpath = new Path();
}
return this.classpath.createPath();
}
1.7 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
Index: DDCreator.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DDCreator.java 23 Dec 2001 06:31:56 -0000 1.6
+++ DDCreator.java 30 Dec 2001 00:21:52 -0000 1.7
@@ -124,7 +124,7 @@
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" );
1.6 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
Index: EjbJar.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EjbJar.java 23 Dec 2001 14:22:45 -0000 1.5
+++ EjbJar.java 30 Dec 2001 00:21:52 -0000 1.6
@@ -254,7 +254,7 @@
{
if( config.classpath == null )
{
- config.classpath = new Path( getProject() );
+ config.classpath = new Path();
}
return config.classpath.createPath();
}
1.8 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
Index: Ejbc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Ejbc.java 23 Dec 2001 06:31:56 -0000 1.7
+++ Ejbc.java 30 Dec 2001 00:21:52 -0000 1.8
@@ -183,7 +183,7 @@
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" );
1.10 +1 -6 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
Index: GenericDeploymentTool.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GenericDeploymentTool.java 23 Dec 2001 14:22:45 -0000 1.9
+++ GenericDeploymentTool.java 30 Dec 2001 00:21:52 -0000 1.10
@@ -198,7 +198,7 @@
{
if( classpath == null )
{
- classpath = new Path( task.getProject() );
+ classpath = new Path();
}
return classpath.createPath();
}
@@ -670,11 +670,6 @@
* subclasses should throw a TaskException if the configuration is
* invalid for their server.
*/
- }
-
- protected void log( String message, int level )
- {
- getTask().log( message, level );
}
/**
1.6 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
Index: IPlanetEjbcTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IPlanetEjbcTask.java 23 Dec 2001 06:31:56 -0000 1.5
+++ IPlanetEjbcTask.java 30 Dec 2001 00:21:52 -0000 1.6
@@ -176,7 +176,7 @@
{
if( classpath == null )
{
- classpath = new Path( getProject() );
+ classpath = new Path();
}
return classpath.createPath();
}
1.8 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
Index: WLRun.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WLRun.java 23 Dec 2001 06:31:56 -0000 1.7
+++ WLRun.java 30 Dec 2001 00:21:52 -0000 1.8
@@ -237,7 +237,7 @@
{
if( classpath == null )
{
- classpath = new Path( getProject() );
+ classpath = new Path();
}
return classpath.createPath();
}
@@ -251,7 +251,7 @@
{
if( weblogicClasspath == null )
{
- weblogicClasspath = new Path( getProject() );
+ weblogicClasspath = new Path();
}
return weblogicClasspath.createPath();
}
1.5 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
Index: WLStop.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WLStop.java 23 Dec 2001 06:31:56 -0000 1.4
+++ WLStop.java 30 Dec 2001 00:21:52 -0000 1.5
@@ -120,7 +120,7 @@
{
if( classpath == null )
{
- classpath = new Path( getProject() );
+ classpath = new Path();
}
return classpath.createPath();
}
1.11 +2 -3 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Index: WeblogicDeploymentTool.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WeblogicDeploymentTool.java 23 Dec 2001 14:22:45 -0000 1.10
+++ WeblogicDeploymentTool.java 30 Dec 2001 00:21:52 -0000 1.11
@@ -296,7 +296,7 @@
{
if( wlClasspath == null )
{
- wlClasspath = new Path( getTask().getProject() );
+ wlClasspath = new Path();
}
return wlClasspath.createPath();
}
@@ -323,7 +323,7 @@
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 @@
* @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
1.11 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WebsphereDeploymentTool.java 23 Dec 2001 14:22:45 -0000 1.10
+++ WebsphereDeploymentTool.java 30 Dec 2001 00:21:52 -0000 1.11
@@ -376,7 +376,7 @@
{
if( wasClasspath == null )
{
- wasClasspath = new Path( getTask().getProject() );
+ wasClasspath = new Path();
}
return wasClasspath.createPath();
}
@@ -403,7 +403,7 @@
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 )
1.8 +2 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
Index: VAJLocalUtil.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VAJLocalUtil.java 23 Dec 2001 14:22:46 -0000 1.7
+++ VAJLocalUtil.java 30 Dec 2001 00:21:52 -0000 1.8
@@ -28,7 +28,8 @@
*
* @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;
1.4 +1 -13 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java
Index: VAJTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VAJTask.java 23 Dec 2001 06:31:57 -0000 1.3
+++ VAJTask.java 30 Dec 2001 00:21:52 -0000 1.4
@@ -46,7 +46,7 @@
{
if( remoteServer == null )
{
- util = new VAJLocalToolUtil();
+ util = new VAJLocalToolUtil( this );
}
else
{
@@ -56,16 +56,4 @@
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 );
- }
- }
}
1.7 +4 -6 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
Index: VAJToolsServlet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VAJToolsServlet.java 23 Dec 2001 14:22:46 -0000 1.6
+++ VAJToolsServlet.java 30 Dec 2001 00:21:52 -0000 1.7
@@ -14,16 +14,15 @@
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 @@
/**
* Adaptation of VAJUtil for servlet context.
- *
- * @author RT
*/
- class VAJLocalServletUtil extends VAJLocalUtil
+ class VAJLocalServletUtil
+ extends VAJLocalUtil
{
public void log( String msg, int level )
{
1.1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalToolUtil.java
Index: VAJLocalToolUtil.java
===================================================================
/*
* 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 );
}
}
1.8 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
Index: JlinkTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JlinkTask.java 23 Dec 2001 14:22:46 -0000 1.7
+++ JlinkTask.java 30 Dec 2001 00:21:52 -0000 1.8
@@ -118,7 +118,7 @@
{
if( this.addfiles == null )
{
- this.addfiles = new Path( getProject() );
+ this.addfiles = new Path();
}
return this.addfiles.createPath();
}
@@ -134,7 +134,7 @@
{
if( this.mergefiles == null )
{
- this.mergefiles = new Path( getProject() );
+ this.mergefiles = new Path();
}
return this.mergefiles.createPath();
}
1.11 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JspC.java 23 Dec 2001 14:22:46 -0000 1.10
+++ JspC.java 30 Dec 2001 00:21:52 -0000 1.11
@@ -57,7 +57,7 @@
* </a>
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
* @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
- * @version $Revision: 1.10 $ $Date: 2001/12/23 14:22:46 $
+ * @version $Revision: 1.11 $ $Date: 2001/12/30 00:21:52 $
*/
public class JspC extends MatchingTask
{
@@ -314,7 +314,7 @@
throws TaskException
{
if( classpath == null )
- classpath = new Path( getProject() );
+ classpath = new Path();
return classpath.createPath();
}
1.13 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
Index: WLJspc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WLJspc.java 23 Dec 2001 14:22:46 -0000 1.12
+++ WLJspc.java 30 Dec 2001 00:21:52 -0000 1.13
@@ -126,7 +126,7 @@
{
if( compileClasspath == null )
{
- compileClasspath = new Path( getProject() );
+ compileClasspath = new Path();
}
return compileClasspath;
}
@@ -160,7 +160,7 @@
//use the systemclasspath as well, to include the ant jar
if( compileClasspath == null )
{
- compileClasspath = new Path( getProject() );
+ compileClasspath = new Path();
}
compileClasspath.append( Path.systemClasspath );
1.12 +2 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractMetamataTask.java 23 Dec 2001 14:22:46 -0000 1.11
+++ AbstractMetamataTask.java 30 Dec 2001 00:21:52 -0000 1.12
@@ -158,7 +158,7 @@
{
if( classPath == null )
{
- classPath = new Path( getProject() );
+ classPath = new Path();
}
return classPath;
}
@@ -182,7 +182,7 @@
{
if( sourcePath == null )
{
- sourcePath = new Path( getProject() );
+ sourcePath = new Path();
}
return sourcePath;
}
1.8 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
Index: DefaultRmicAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultRmicAdapter.java 23 Dec 2001 14:22:48 -0000 1.7
+++ DefaultRmicAdapter.java 30 Dec 2001 00:21:52 -0000 1.8
@@ -187,7 +187,7 @@
{
// 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
1.10 +1 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CommandlineJava.java 23 Dec 2001 06:32:48 -0000 1.9
+++ CommandlineJava.java 30 Dec 2001 00:21:52 -0000 1.10
@@ -228,7 +228,7 @@
{
if( classpath == null )
{
- classpath = new Path( p );
+ classpath = new Path();
}
return classpath;
}
1.7 +1 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
Index: FileList.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileList.java 23 Dec 2001 06:32:48 -0000 1.6
+++ FileList.java 30 Dec 2001 00:21:52 -0000 1.7
@@ -21,7 +21,7 @@
* a matched file if it currently exists in the file system.
*
* @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
- * @version $Revision: 1.6 $ $Date: 2001/12/23 06:32:48 $
+ * @version $Revision: 1.7 $ $Date: 2001/12/30 00:21:52 $
*/
public class FileList extends DataType
{
@@ -38,7 +38,6 @@
{
this.dir = filelist.dir;
this.filenames = filelist.filenames;
- setProject( filelist.getProject() );
}
public void setDir( File dir )
1.10 +0 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
Index: FileSet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileSet.java 23 Dec 2001 14:23:47 -0000 1.9
+++ FileSet.java 30 Dec 2001 00:21:52 -0000 1.10
@@ -50,7 +50,6 @@
this.additionalPatterns = fileset.additionalPatterns;
this.useDefaultExcludes = fileset.useDefaultExcludes;
this.isCaseSensitive = fileset.isCaseSensitive;
- setProject( getProject() );
}
/**
1.9 +26 -44 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Path.java 23 Dec 2001 14:23:47 -0000 1.8
+++ Path.java 30 Dec 2001 00:21:52 -0000 1.9
@@ -62,7 +62,7 @@
{
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 @@
/**
* Invoked by IntrospectionHelper for <code>setXXX(Path p)</code> 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 @@
/**
* 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 @@
String extProp = System.getProperty( "java.ext.dirs" );
if( extProp != null )
{
- extdirs = new Path( getProject(), extProp );
+ extdirs = new Path( extProp );
}
else
{
@@ -363,38 +355,32 @@
}
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 @@
{
try
{
- Path p = new Path( getProject() );
+ Path p = new Path();
p.append( this );
return p;
}
@@ -461,7 +447,7 @@
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 @@
{
throw noChildrenAllowed();
}
- Path p = new Path( getProject() );
+ Path p = new Path();
elements.add( p );
checked = false;
return p;
@@ -597,10 +583,6 @@
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++ )
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>