donaldp 01/12/21 05:34:19
Modified: proposal/myrmidon/src/main/org/apache/tools/ant
ProjectComponent.java TaskAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
AntStructure.java Available.java Checksum.java
Chmod.java DependSet.java Echo.java ExecuteOn.java
Expand.java Filter.java GenerateKey.java Get.java
Input.java Java.java Javac.java Javadoc.java
MatchingTask.java Property.java Rmic.java
SQLExec.java SignJar.java Tar.java Touch.java
Tstamp.java UpToDate.java Zip.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
ExecTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file
Copy.java Delete.java Move.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
ANTLR.java Cab.java IContract.java Javah.java
Native2Ascii.java ReplaceRegExp.java Rpm.java
Script.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
Continuus.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.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
BorlandGenerateClient.java DDCreator.java
EjbJar.java Ejbc.java IPlanetEjbcTask.java
WLRun.java WLStop.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n
Translate.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJImport.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java JavaCC.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.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/junit
JUnitTask.java XMLResultAggregator.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
AbstractMetamataTask.java MAudit.java MMetrics.java
MParse.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net
FTP.java MimeMail.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Add.java P4Base.java P4Change.java P4Counter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovReport.java Coverage.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
Log:
Encapsulated access to project member variable via getters
Revision Changes Path
1.9 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java
Index: ProjectComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProjectComponent.java 2001/12/17 10:47:18 1.8
+++ ProjectComponent.java 2001/12/21 13:34:15 1.9
@@ -20,7 +20,7 @@
public abstract class ProjectComponent
extends AbstractTask
{
- protected Project project;
+ private Project project;
/**
* Sets the project object of this component. This method is used by
project
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TaskAdapter.java 2001/12/16 06:42:56 1.5
+++ TaskAdapter.java 2001/12/21 13:34:15 1.6
@@ -51,7 +51,7 @@
c.getMethod( "setProject", new Class[]{Project.class} );
if( setProjectM != null )
{
- setProjectM.invoke( proxy, new Object[]{project} );
+ setProjectM.invoke( proxy, new Object[]{getProject()} );
}
}
catch( NoSuchMethodException e )
1.5 +7 -7
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
Index: AntStructure.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AntStructure.java 2001/12/16 05:05:07 1.4
+++ AntStructure.java 2001/12/21 13:34:15 1.5
@@ -23,7 +23,7 @@
* Creates a partial DTD for Ant from the currently known tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class AntStructure extends Task
@@ -75,25 +75,25 @@
out = new PrintWriter( new FileWriter( output ) );
}
- printHead( out, project.getTaskDefinitions().keys(),
- project.getDataTypeDefinitions().keys() );
+ printHead( out, getProject().getTaskDefinitions().keys(),
+ getProject().getDataTypeDefinitions().keys() );
printTargetDecl( out );
- Enumeration dataTypes = project.getDataTypeDefinitions().keys();
+ Enumeration dataTypes =
getProject().getDataTypeDefinitions().keys();
while( dataTypes.hasMoreElements() )
{
String typeName = (String)dataTypes.nextElement();
printElementDecl( out, typeName,
-
(Class)project.getDataTypeDefinitions().get( typeName ) );
+
(Class)getProject().getDataTypeDefinitions().get( typeName ) );
}
- Enumeration tasks = project.getTaskDefinitions().keys();
+ Enumeration tasks = getProject().getTaskDefinitions().keys();
while( tasks.hasMoreElements() )
{
String taskName = (String)tasks.nextElement();
printElementDecl( out, taskName,
- (Class)project.getTaskDefinitions().get(
taskName ) );
+
(Class)getProject().getTaskDefinitions().get( taskName ) );
}
printTail( out );
1.8 +5 -5
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Available.java 2001/12/17 10:47:18 1.7
+++ Available.java 2001/12/21 13:34:15 1.8
@@ -97,7 +97,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( project );
+ this.classpath = new Path( getProject() );
}
return this.classpath.createPath();
}
@@ -107,7 +107,7 @@
{
if( this.filepath == null )
{
- this.filepath = new Path( project );
+ this.filepath = new Path( getProject() );
}
return this.filepath.createPath();
}
@@ -130,8 +130,8 @@
if( classpath != null )
{
- classpath.setProject( project );
- this.loader = new AntClassLoader( project, classpath );
+ classpath.setProject( getProject() );
+ this.loader = new AntClassLoader( getProject(), classpath );
}
if( ( classname != null ) && !checkClass( classname ) )
@@ -178,7 +178,7 @@
if( eval() )
{
String lSep = System.getProperty( "line.separator" );
- if( null == project.getProperty( property ) )
+ if( null == getProject().getProperty( property ) )
{
setProperty( property, value );
}
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Index: Checksum.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Checksum.java 2001/12/16 06:40:16 1.6
+++ Checksum.java 2001/12/21 13:34:15 1.7
@@ -475,11 +475,11 @@
for( int i = 0; i < sizeofFileSet; i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] srcFiles = ds.getIncludedFiles();
for( int j = 0; j < srcFiles.length; j++ )
{
- File src = new File( fs.getDir( project ), srcFiles[ j ] );
+ File src = new File( fs.getDir( getProject() ), srcFiles[ j
] );
addToIncludeFileMap( src );
}
}
1.8 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
Index: Chmod.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Chmod.java 2001/12/17 09:50:11 1.7
+++ Chmod.java 2001/12/21 13:34:15 1.8
@@ -151,14 +151,14 @@
public void execute()
throws TaskException
{
- if( defaultSetDefined || defaultSet.getDir( project ) == null )
+ if( defaultSetDefined || defaultSet.getDir( getProject() ) == null )
{
super.execute();
}
else if( isValidOs() )
{
// we are chmodding the given directory
- createArg().setValue( defaultSet.getDir( project ).getPath() );
+ createArg().setValue( defaultSet.getDir( getProject()
).getPath() );
Execute execute = prepareExec();
try
{
@@ -190,7 +190,7 @@
throw new TaskException( "Required attribute perm not set in
chmod" );
}
- if( defaultSetDefined && defaultSet.getDir( project ) != null )
+ if( defaultSetDefined && defaultSet.getDir( getProject() ) != null )
{
addFileset( defaultSet );
}
1.3 +9 -9
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
Index: DependSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependSet.java 2001/12/16 00:38:01 1.2
+++ DependSet.java 2001/12/21 13:34:15 1.3
@@ -60,7 +60,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Craeg Strong</a>
- * @version $Revision: 1.2 $ $Date: 2001/12/16 00:38:01 $
+ * @version $Revision: 1.3 $ $Date: 2001/12/21 13:34:15 $
*/
public class DependSet extends MatchingTask
{
@@ -155,13 +155,13 @@
{
FileSet targetFS = (FileSet)enumTargetSets.nextElement();
- DirectoryScanner targetDS = targetFS.getDirectoryScanner(
project );
+ DirectoryScanner targetDS = targetFS.getDirectoryScanner(
getProject() );
String[] targetFiles = targetDS.getIncludedFiles();
for( int i = 0; i < targetFiles.length; i++ )
{
- File dest = new File( targetFS.getDir( project ),
targetFiles[ i ] );
+ File dest = new File( targetFS.getDir( getProject() ),
targetFiles[ i ] );
allTargets.addElement( dest );
if( dest.lastModified() > now )
@@ -181,12 +181,12 @@
{
FileList targetFL = (FileList)enumTargetLists.nextElement();
- String[] targetFiles = targetFL.getFiles( project );
+ String[] targetFiles = targetFL.getFiles( getProject() );
for( int i = 0; i < targetFiles.length; i++ )
{
- File dest = new File( targetFL.getDir( project ),
targetFiles[ i ] );
+ File dest = new File( targetFL.getDir( getProject() ),
targetFiles[ i ] );
if( !dest.exists() )
{
log( targetFiles[ i ] + " does not exist.",
Project.MSG_VERBOSE );
@@ -215,12 +215,12 @@
{
FileSet sourceFS = (FileSet)enumSourceSets.nextElement();
- DirectoryScanner sourceDS = sourceFS.getDirectoryScanner(
project );
+ DirectoryScanner sourceDS = sourceFS.getDirectoryScanner(
getProject() );
String[] sourceFiles = sourceDS.getIncludedFiles();
for( int i = 0; upToDate && i < sourceFiles.length; i++ )
{
- File src = new File( sourceFS.getDir( project ),
sourceFiles[ i ] );
+ File src = new File( sourceFS.getDir( getProject() ),
sourceFiles[ i ] );
if( src.lastModified() > now )
{
@@ -255,12 +255,12 @@
{
FileList sourceFL = (FileList)enumSourceLists.nextElement();
- String[] sourceFiles = sourceFL.getFiles( project );
+ String[] sourceFiles = sourceFL.getFiles( getProject() );
int i = 0;
do
{
- File src = new File( sourceFL.getDir( project ),
sourceFiles[ i ] );
+ File src = new File( sourceFL.getDir( getProject() ),
sourceFiles[ i ] );
if( src.lastModified() > now )
{
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
Index: Echo.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Echo.java 2001/12/17 09:50:11 1.5
+++ Echo.java 2001/12/21 13:34:15 1.6
@@ -108,7 +108,7 @@
public void addText( String msg )
throws TaskException
{
- message += project.replaceProperties( msg );
+ message += getProject().replaceProperties( msg );
}
/**
1.10 +3 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExecuteOn.java 2001/12/17 09:50:11 1.9
+++ ExecuteOn.java 2001/12/21 13:34:15 1.10
@@ -122,7 +122,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- mapperElement = new Mapper( project );
+ mapperElement = new Mapper( getProject() );
return mapperElement;
}
@@ -385,8 +385,8 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- File base = fs.getDir( project );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ File base = fs.getDir( getProject() );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
if( !"dir".equals( type ) )
{
1.8 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Expand.java 2001/12/17 10:47:18 1.7
+++ Expand.java 2001/12/21 13:34:15 1.8
@@ -132,8 +132,8 @@
for( int j = 0; j < filesets.size(); j++ )
{
FileSet fs = (FileSet)filesets.elementAt( j );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
- File fromDir = fs.getDir( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+ File fromDir = fs.getDir( getProject() );
String[] files = ds.getIncludedFiles();
for( int i = 0; i < files.length; ++i )
@@ -201,7 +201,7 @@
for( int v = 0; v < patternsets.size(); v++ )
{
PatternSet p = (PatternSet)patternsets.elementAt( v );
- String[] incls = p.getIncludePatterns( project );
+ String[] incls = p.getIncludePatterns( getProject() );
if( incls != null )
{
for( int w = 0; w < incls.length; w++ )
@@ -214,7 +214,7 @@
}
}
}
- String[] excls = p.getExcludePatterns( project );
+ String[] excls = p.getExcludePatterns( getProject() );
if( excls != null )
{
for( int w = 0; w < excls.length; w++ )
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java
Index: Filter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Filter.java 2001/12/16 00:38:01 1.3
+++ Filter.java 2001/12/21 13:34:15 1.4
@@ -57,7 +57,7 @@
if( isSingleFilter )
{
- project.getGlobalFilterSet().addFilter( token, value );
+ getProject().getGlobalFilterSet().addFilter( token, value );
}
if( isFiltersFromFile )
@@ -70,6 +70,6 @@
throws TaskException
{
log( "Reading filters from " + filtersFile, Project.MSG_VERBOSE );
- project.getGlobalFilterSet().readFiltersFromFile( filtersFile );
+ getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile );
}
}
1.9 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
Index: GenerateKey.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GenerateKey.java 2001/12/17 09:50:11 1.8
+++ GenerateKey.java 2001/12/21 13:34:15 1.9
@@ -140,7 +140,7 @@
public void execute()
throws TaskException
{
- if( project.getJavaVersion().equals( Project.JAVA_1_1 ) )
+ if( getProject().getJavaVersion().equals( Project.JAVA_1_1 ) )
{
throw new TaskException( "The genkey task is only available on
JDK" +
" versions 1.2 or greater" );
@@ -162,7 +162,7 @@
}
getLogger().info( "Generating Key for " + alias );
- final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+ final ExecTask cmd = (ExecTask)getProject().createTask( "exec" );
cmd.setExecutable( "keytool" );
cmd.createArg().setValue( "-genkey " );
1.8 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Get.java 2001/12/16 05:44:55 1.7
+++ Get.java 2001/12/21 13:34:15 1.8
@@ -95,7 +95,7 @@
*/
public void setUseTimestamp( boolean v )
{
- if( project.getJavaVersion() != Project.JAVA_1_1 )
+ if( getProject().getJavaVersion() != Project.JAVA_1_1 )
{
useTimestamp = v;
}
@@ -300,9 +300,9 @@
throws TaskException
{
- if( project.getJavaVersion() != Project.JAVA_1_1 )
+ if( getProject().getJavaVersion() != Project.JAVA_1_1 )
{
- Touch touch = (Touch)project.createTask( "touch" );
+ Touch touch = (Touch)getProject().createTask( "touch" );
touch.setFile( file );
touch.setMillis( timemillis );
touch.touch();
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Input.java 2001/12/16 06:21:40 1.4
+++ Input.java 2001/12/21 13:34:15 1.5
@@ -89,7 +89,7 @@
public void addText( String msg )
throws TaskException
{
- message += project.replaceProperties( msg );
+ message += getProject().replaceProperties( msg );
}
/**
@@ -143,7 +143,7 @@
// adopted from org.apache.tools.ant.taskdefs.Property
if( addproperty != null )
{
- if( project.getProperty( addproperty ) == null )
+ if( getProject().getProperty( addproperty ) == null )
{
setProperty( addproperty, input );
}
1.7 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Java.java 2001/12/17 09:50:11 1.6
+++ Java.java 2001/12/21 13:34:15 1.7
@@ -197,7 +197,7 @@
public Path createClasspath()
throws TaskException
{
- return cmdl.createClasspath( project ).createPath();
+ return cmdl.createClasspath( getProject() ).createPath();
}
/**
@@ -339,7 +339,7 @@
try
{
outStream = new PrintStream( new FileOutputStream( out ) );
- exe.execute( project );
+ exe.execute( getProject() );
}
catch( IOException io )
{
@@ -355,7 +355,7 @@
}
else
{
- exe.execute( project );
+ exe.execute( getProject() );
}
}
@@ -385,7 +385,7 @@
exe = new Execute( new PumpStreamHandler( fos ), null );
}
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
if( dir == null )
{
1.8 +6 -6
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Javac.java 2001/12/16 05:44:55 1.7
+++ Javac.java 2001/12/21 13:34:15 1.8
@@ -646,7 +646,7 @@
public boolean isForkedJavac()
{
return !"false".equals( fork ) ||
- "extJavac".equals( project.getProperty( "build.compiler" ) );
+ "extJavac".equals( getProject().getProperty( "build.compiler" )
);
}
/**
@@ -659,7 +659,7 @@
{
if( bootclasspath == null )
{
- bootclasspath = new Path( project );
+ bootclasspath = new Path( getProject() );
}
return bootclasspath.createPath();
}
@@ -674,7 +674,7 @@
{
if( compileClasspath == null )
{
- compileClasspath = new Path( project );
+ compileClasspath = new Path( getProject() );
}
return compileClasspath.createPath();
}
@@ -702,7 +702,7 @@
{
if( extdirs == null )
{
- extdirs = new Path( project );
+ extdirs = new Path( getProject() );
}
return extdirs.createPath();
}
@@ -717,7 +717,7 @@
{
if( src == null )
{
- src = new Path( project );
+ src = new Path( getProject() );
}
return src.createPath();
}
@@ -870,7 +870,7 @@
private String determineCompiler()
{
- String compiler = project.getProperty( "build.compiler" );
+ String compiler = getProject().getProperty( "build.compiler" );
if( !"false".equals( fork ) )
{
1.9 +6 -6
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Javadoc.java 2001/12/17 10:47:18 1.8
+++ Javadoc.java 2001/12/21 13:34:15 1.9
@@ -576,7 +576,7 @@
{
if( bootclasspath == null )
{
- bootclasspath = new Path( project );
+ bootclasspath = new Path( getProject() );
}
return bootclasspath.createPath();
}
@@ -586,7 +586,7 @@
{
if( classpath == null )
{
- classpath = new Path( project );
+ classpath = new Path( getProject() );
}
return classpath.createPath();
}
@@ -616,7 +616,7 @@
{
if( sourcePath == null )
{
- sourcePath = new Path( project );
+ sourcePath = new Path( getProject() );
}
return sourcePath.createPath();
}
@@ -918,7 +918,7 @@
JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO
);
JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN
);
Execute exe = new Execute( new PumpStreamHandler( out, err ) );
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
/*
* No reason to change the working directory as all filenames and
@@ -971,7 +971,7 @@
protected String expand( String content )
throws TaskException
{
- return project.replaceProperties( content );
+ return getProject().replaceProperties( content );
}
private String getJavadocExecutableName()
@@ -1130,7 +1130,7 @@
File source = resolveFile( list[ j ] );
fs.setDir( source );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] packageDirs = ds.getIncludedDirectories();
for( int i = 0; i < packageDirs.length; i++ )
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
Index: MatchingTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MatchingTask.java 2001/12/16 01:31:38 1.5
+++ MatchingTask.java 2001/12/21 13:34:15 1.6
@@ -157,7 +157,7 @@
{
fileset.setDir( baseDir );
fileset.setDefaultexcludes( useDefaultExcludes );
- return fileset.getDirectoryScanner( project );
+ return fileset.getDirectoryScanner( getProject() );
}
}
1.12 +3 -3
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Property.java 2001/12/17 09:50:11 1.11
+++ Property.java 2001/12/21 13:34:15 1.12
@@ -131,7 +131,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( project );
+ this.classpath = new Path( getProject() );
}
return this.classpath.createPath();
}
@@ -195,7 +195,7 @@
String name = (String)e.nextElement();
String value = (String)props.getProperty( name );
- String v = project.replaceProperties( value );
+ String v = getProject().replaceProperties( value );
addProperty( name, v );
}
}
@@ -278,7 +278,7 @@
if( classpath != null )
{
- cL = new AntClassLoader( project, classpath );
+ cL = new AntClassLoader( getProject(), classpath );
}
else
{
1.12 +5 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Rmic.java 2001/12/21 13:29:09 1.11
+++ Rmic.java 2001/12/21 13:34:15 1.12
@@ -502,7 +502,7 @@
{
if( compileClasspath == null )
{
- compileClasspath = new Path( project );
+ compileClasspath = new Path( getProject() );
}
return compileClasspath.createPath();
}
@@ -517,7 +517,7 @@
{
if( extdirs == null )
{
- extdirs = new Path( project );
+ extdirs = new Path( getProject() );
}
return extdirs.createPath();
}
@@ -539,14 +539,14 @@
log( "Verify has been turned on.", Project.MSG_INFO );
}
- String compiler = project.getProperty( "build.rmic" );
+ String compiler = getProject().getProperty( "build.rmic" );
RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler, this );
// now we need to populate the compiler adapter
adapter.setRmic( this );
Path classpath = adapter.getClasspath();
- loader = new AntClassLoader( project, classpath );
+ loader = new AntClassLoader( getProject(), classpath );
// scan base dirs to build up compile lists only if a
// specific classname is not given
@@ -684,7 +684,7 @@
{
if( filtering )
{
- final FilterSetCollection filters = new
FilterSetCollection( project.getGlobalFilterSet() );
+ final FilterSetCollection filters = new
FilterSetCollection( getProject().getGlobalFilterSet() );
FileUtils.copyFile( oldFile, newFile, filters );
}
else
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SQLExec.java 2001/12/16 05:44:55 1.6
+++ SQLExec.java 2001/12/21 13:34:15 1.7
@@ -370,7 +370,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( project );
+ this.classpath = new Path( getProject() );
}
return this.classpath.createPath();
}
@@ -410,8 +410,8 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
- File srcDir = fs.getDir( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+ File srcDir = fs.getDir( getProject() );
String[] srcFiles = ds.getIncludedFiles();
@@ -459,7 +459,7 @@
log( "Loading " + driver + " using AntClassLoader with
classpath " + classpath,
Project.MSG_VERBOSE );
- loader = new AntClassLoader( project, classpath );
+ loader = new AntClassLoader( getProject(), classpath );
dc = loader.loadClass( driver );
}
else
@@ -754,7 +754,7 @@
while( ( line = in.readLine() ) != null )
{
line = line.trim();
- line = project.replaceProperties( line );
+ line = getProject().replaceProperties( line );
if( line.startsWith( "//" ) )
continue;
if( line.startsWith( "--" ) )
1.6 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
Index: SignJar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SignJar.java 2001/12/17 09:50:11 1.5
+++ SignJar.java 2001/12/21 13:34:15 1.6
@@ -155,11 +155,11 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] jarFiles = ds.getIncludedFiles();
for( int j = 0; j < jarFiles.length; j++ )
{
- doOneJar( new File( fs.getDir( project ), jarFiles[ j ]
), null );
+ doOneJar( new File( fs.getDir( getProject() ), jarFiles[
j ] ), null );
}
}
}
@@ -249,7 +249,7 @@
private void doOneJar( File jarSource, File jarTarget )
throws TaskException
{
- if( project.getJavaVersion().equals( Project.JAVA_1_1 ) )
+ if( getProject().getJavaVersion().equals( Project.JAVA_1_1 ) )
{
throw new TaskException( "The signjar task is only available on
JDK versions 1.2 or greater" );
}
@@ -269,7 +269,7 @@
final StringBuffer sb = new StringBuffer();
- final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+ final ExecTask cmd = (ExecTask)getProject().createTask( "exec" );
cmd.setExecutable( "jarsigner" );
if( null != keystore )
1.7 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Tar.java 2001/12/16 04:12:39 1.6
+++ Tar.java 2001/12/21 13:34:15 1.7
@@ -145,7 +145,7 @@
for( Enumeration e = filesets.elements(); e.hasMoreElements(); )
{
TarFileSet fs = (TarFileSet)e.nextElement();
- String[] files = fs.getFiles( project );
+ String[] files = fs.getFiles( getProject() );
if( !archiveIsUpToDate( files ) )
{
@@ -154,7 +154,7 @@
for( int i = 0; i < files.length; ++i )
{
- if( tarFile.equals( new File( fs.getDir( project ), files[ i
] ) ) )
+ if( tarFile.equals( new File( fs.getDir( getProject() ),
files[ i ] ) ) )
{
throw new TaskException( "A tar file cannot include
itself" );
}
@@ -194,10 +194,10 @@
for( Enumeration e = filesets.elements(); e.hasMoreElements(); )
{
TarFileSet fs = (TarFileSet)e.nextElement();
- String[] files = fs.getFiles( project );
+ String[] files = fs.getFiles( getProject() );
for( int i = 0; i < files.length; i++ )
{
- File f = new File( fs.getDir( project ), files[ i ] );
+ File f = new File( fs.getDir( getProject() ), files[ i ]
);
String name = files[ i ].replace( File.separatorChar,
'/' );
tarFile( f, tOut, name, fs );
}
1.6 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java
Index: Touch.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Touch.java 2001/12/17 10:47:18 1.5
+++ Touch.java 2001/12/21 13:34:15 1.6
@@ -148,7 +148,7 @@
}
}
- if( millis >= 0 && project.getJavaVersion() == Project.JAVA_1_1 )
+ if( millis >= 0 && getProject().getJavaVersion() == Project.JAVA_1_1
)
{
log( "modification time of files cannot be set in JDK 1.1",
Project.MSG_WARN );
@@ -171,8 +171,8 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
- File fromDir = fs.getDir( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+ File fromDir = fs.getDir( getProject() );
String[] srcFiles = ds.getIncludedFiles();
String[] srcDirs = ds.getIncludedDirectories();
@@ -202,7 +202,7 @@
throw new TaskException( "Can not change modification date of
read-only file " + file );
}
- if( project.getJavaVersion() == Project.JAVA_1_1 )
+ if( getProject().getJavaVersion() == Project.JAVA_1_1 )
{
return;
}
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Tstamp.java 2001/12/16 06:40:16 1.7
+++ Tstamp.java 2001/12/21 13:34:15 1.8
@@ -73,7 +73,7 @@
while( i.hasMoreElements() )
{
CustomFormat cts = (CustomFormat)i.nextElement();
- cts.execute( project, d );
+ cts.execute( getProject(), d );
}
}
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UpToDate.java 2001/12/16 06:21:40 1.6
+++ UpToDate.java 2001/12/21 13:34:15 1.7
@@ -97,7 +97,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- mapperElement = new Mapper( project );
+ mapperElement = new Mapper( getProject() );
return mapperElement;
}
@@ -128,8 +128,8 @@
while( upToDate && enum.hasMoreElements() )
{
FileSet fs = (FileSet)enum.nextElement();
- DirectoryScanner ds = fs.getDirectoryScanner( project );
- upToDate = upToDate && scanDir( fs.getDir( project ),
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+ upToDate = upToDate && scanDir( fs.getDir( getProject() ),
ds.getIncludedFiles() );
}
return upToDate;
1.8 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Zip.java 2001/12/17 10:47:18 1.7
+++ Zip.java 2001/12/21 13:34:15 1.8
@@ -266,7 +266,7 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- dss.addElement( fs.getDirectoryScanner( project ) );
+ dss.addElement( fs.getDirectoryScanner( getProject() ) );
}
int dssSize = dss.size();
FileScanner[] scanners = new FileScanner[ dssSize ];
@@ -541,7 +541,7 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String prefix = "";
String fullpath = "";
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecTask.java 2001/12/17 09:49:30 1.1
+++ ExecTask.java 2001/12/21 13:34:16 1.2
@@ -393,7 +393,7 @@
log( cmdl.toString(), Project.MSG_VERBOSE );
Execute exe = new Execute( createHandler(), createWatchdog() );
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
exe.setWorkingDirectory( dir );
exe.setVMLauncher( vmLauncher );
String[] environment = env.getVariables();
1.4 +5 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
Index: Copy.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Copy.java 2001/12/21 13:29:10 1.3
+++ Copy.java 2001/12/21 13:34:16 1.4
@@ -200,7 +200,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- m_mapperElement = new Mapper( project );
+ m_mapperElement = new Mapper( getProject() );
return m_mapperElement;
}
@@ -249,8 +249,8 @@
for( int i = 0; i < m_filesets.size(); i++ )
{
final FileSet fileSet = (FileSet)m_filesets.elementAt( i );
- final DirectoryScanner scanner = fileSet.getDirectoryScanner(
project );
- final File fromDir = fileSet.getDir( project );
+ final DirectoryScanner scanner = fileSet.getDirectoryScanner(
getProject() );
+ final File fromDir = fileSet.getDir( getProject() );
final String[] srcFiles = scanner.getIncludedFiles();
final String[] srcDirs = scanner.getIncludedDirectories();
@@ -419,7 +419,7 @@
final FilterSetCollection executionFilters = new
FilterSetCollection();
if( m_filtering )
{
- executionFilters.addFilterSet( project.getGlobalFilterSet() );
+ executionFilters.addFilterSet( getProject().getGlobalFilterSet()
);
}
for( final Enumeration filterEnum = m_filterSets.elements();
filterEnum.hasMoreElements(); )
@@ -506,7 +506,7 @@
else
{
FileSet fs = (FileSet)m_filesets.elementAt( 0 );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] srcFiles = ds.getIncludedFiles();
if( srcFiles.length > 0 )
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
Index: Delete.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Delete.java 2001/12/19 11:51:42 1.2
+++ Delete.java 2001/12/21 13:34:16 1.3
@@ -307,10 +307,10 @@
FileSet fs = (FileSet)filesets.elementAt( i );
try
{
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] files = ds.getIncludedFiles();
String[] dirs = ds.getIncludedDirectories();
- removeFiles( fs.getDir( project ), files, dirs );
+ removeFiles( fs.getDir( getProject() ), files, dirs );
}
catch( TaskException be )
{
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
Index: Move.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Move.java 2001/12/21 13:29:10 1.3
+++ Move.java 2001/12/21 13:34:16 1.4
@@ -151,7 +151,7 @@
FilterSetCollection executionFilters = new
FilterSetCollection();
if( isFiltering() )
{
- executionFilters.addFilterSet(
project.getGlobalFilterSet() );
+ executionFilters.addFilterSet(
getProject().getGlobalFilterSet() );
}
for( Enumeration filterEnum =
getFilterSets().elements(); filterEnum.hasMoreElements(); )
{
@@ -215,7 +215,7 @@
while( e.hasMoreElements() )
{
FileSet fs = (FileSet)e.nextElement();
- File dir = fs.getDir( project );
+ File dir = fs.getDir( getProject() );
if( okToDelete( dir ) )
{
1.7 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ANTLR.java 2001/12/17 09:50:11 1.6
+++ ANTLR.java 2001/12/21 13:34:16 1.7
@@ -94,7 +94,7 @@
*/
public Path createClasspath()
{
- return commandline.createClasspath( project ).createPath();
+ return commandline.createClasspath( getProject() ).createPath();
}
/**
@@ -139,7 +139,7 @@
ExecuteJava exe = new ExecuteJava();
exe.setJavaCommand( commandline.getJavaCommand() );
exe.setClasspath( commandline.getClasspath() );
- exe.execute( project );
+ exe.execute( getProject() );
}
}
}
@@ -229,7 +229,7 @@
{
Execute exe = new Execute( new LogStreamHandler( this,
Project.MSG_INFO,
Project.MSG_WARN ),
null );
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
if( workingdir != null )
{
exe.setWorkingDirectory( workingdir );
1.10 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cab.java 2001/12/17 10:47:19 1.9
+++ Cab.java 2001/12/21 13:34:16 1.10
@@ -206,7 +206,7 @@
FileSet fs = (FileSet)filesets.elementAt( i );
if( fs != null )
{
- appendFiles( files, fs.getDirectoryScanner( project ) );
+ appendFiles( files, fs.getDirectoryScanner( getProject()
) );
}
}
}
@@ -310,7 +310,7 @@
protected ExecTask createExec()
throws TaskException
{
- return (ExecTask)project.createTask( "exec" );
+ return (ExecTask)getProject().createTask( "exec" );
}
/**
1.8 +3 -5
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IContract.java 2001/12/17 10:55:23 1.7
+++ IContract.java 2001/12/21 13:34:17 1.8
@@ -721,7 +721,7 @@
// Prepare the directories for iContract. iContract will make
them if they
// don't exist, but for some reason I don't know, it will
complain about the REP files
// afterwards
- Mkdir mkdir = (Mkdir)project.createTask( "mkdir" );
+ Mkdir mkdir = (Mkdir)getProject().createTask( "mkdir" );
mkdir.setDir( instrumentDir );
mkdir.execute();
mkdir.setDir( buildDir );
@@ -733,7 +733,7 @@
Path baseClasspath = createClasspath();
// Might need to add the core classes if we're not using Sun's
Javac (like Jikes)
- String compiler = project.getProperty( "build.compiler" );
+ String compiler = getProject().getProperty( "build.compiler" );
ClasspathHelper classpathHelper = new ClasspathHelper( compiler
);
classpathHelper.modify( baseClasspath );
@@ -764,7 +764,7 @@
iContractClasspath.append( new Path( getProject(),
buildDir.getAbsolutePath() ) );
// Create a forked java process
- Java iContract = (Java)project.createTask( "java" );
+ Java iContract = (Java)getProject().createTask( "java" );
iContract.setFork( true );
iContract.setClassname( "com.reliablesystems.iContract.Tool" );
iContract.setClasspath( iContractClasspath );
@@ -1079,8 +1079,6 @@
* BuildListener that sets the iContractMissing flag to true if a message
* about missing iContract is missing. Used to indicate a more verbose
error
* to the user, with advice about how to solve the problem
- *
- * @author RT
*/
private class IContractPresenceDetector implements BuildListener
{
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Javah.java 2001/12/16 05:44:55 1.4
+++ Javah.java 2001/12/21 13:34:17 1.5
@@ -206,7 +206,7 @@
{
if( bootclasspath == null )
{
- bootclasspath = new Path( project );
+ bootclasspath = new Path( getProject() );
}
return bootclasspath.createPath();
}
@@ -222,7 +222,7 @@
{
if( classpath == null )
{
- classpath = new Path( project );
+ classpath = new Path( getProject() );
}
return classpath.createPath();
}
@@ -264,7 +264,7 @@
classpath = Path.systemClasspath;
}
- String compiler = project.getProperty( "build.compiler" );
+ String compiler = getProject().getProperty( "build.compiler" );
if( compiler == null )
{
if( Project.getJavaVersion() != Project.JAVA_1_1 &&
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Native2Ascii.java 2001/12/16 06:21:40 1.5
+++ Native2Ascii.java 2001/12/21 13:34:17 1.6
@@ -102,7 +102,7 @@
{
throw new TaskException( "Cannot define more than one mapper" );
}
- mapper = new Mapper( project );
+ mapper = new Mapper( getProject() );
return mapper;
}
1.5 +3 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReplaceRegExp.java 2001/12/17 10:47:19 1.4
+++ ReplaceRegExp.java 2001/12/21 13:34:17 1.5
@@ -239,11 +239,11 @@
throws TaskException
{
String res = input;
- Regexp regexp = r.getRegexp( project );
+ Regexp regexp = r.getRegexp( getProject() );
if( regexp.matches( input, options ) )
{
- res = regexp.substitute( input, s.getExpression( project ),
options );
+ res = regexp.substitute( input, s.getExpression( getProject() ),
options );
}
return res;
@@ -276,7 +276,7 @@
boolean changes = false;
- log( "Replacing pattern '" + regex.getPattern( project ) + "'
with '" + subs.getExpression( project ) +
+ log( "Replacing pattern '" + regex.getPattern( getProject() ) +
"' with '" + subs.getExpression( getProject() ) +
"' in '" + f.getPath() + "'" +
( byline ? " by line" : "" ) +
( flags.length() > 0 ? " with flags: '" + flags + "'" : ""
) +
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Index: Rpm.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Rpm.java 2001/12/17 09:50:11 1.7
+++ Rpm.java 2001/12/21 13:34:17 1.8
@@ -189,7 +189,7 @@
Execute exe = new Execute( streamhandler, null );
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
if( topDir == null ) topDir = getBaseDirectory();
exe.setWorkingDirectory( topDir );
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
Index: Script.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Script.java 2001/12/16 06:40:17 1.5
+++ Script.java 2001/12/21 13:34:17 1.6
@@ -86,8 +86,8 @@
{
try
{
- addBeans( project.getProperties() );
- addBeans( project.getReferences() );
+ addBeans( getProject().getProperties() );
+ addBeans( getProject().getReferences() );
beans.put( "project", getProject() );
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
Index: Continuus.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Continuus.java 2001/12/17 09:50:12 1.7
+++ Continuus.java 2001/12/21 13:34:17 1.8
@@ -65,7 +65,7 @@
*/
public final void setCcmDir( String dir )
{
- _ccmDir = project.translatePath( dir );
+ _ccmDir = getProject().translatePath( dir );
}
/**
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClearCase.java 2001/12/17 09:50:12 1.6
+++ ClearCase.java 2001/12/21 13:34:17 1.7
@@ -62,7 +62,7 @@
*/
public final void setClearToolDir( String dir )
{
- m_ClearToolDir = project.translatePath( dir );
+ m_ClearToolDir = getProject().translatePath( dir );
}
/**
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Depend.java 2001/12/16 05:44:56 1.5
+++ Depend.java 2001/12/21 13:34:17 1.6
@@ -184,7 +184,7 @@
{
if( dependClasspath == null )
{
- dependClasspath = new Path( project );
+ dependClasspath = new Path( getProject() );
}
return dependClasspath.createPath();
}
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CSharp.java 2001/12/16 06:21:41 1.6
+++ CSharp.java 2001/12/21 13:34:17 1.7
@@ -422,7 +422,7 @@
{
//demand create pathlist
if( _referenceFiles == null )
- _referenceFiles = new Path( this.project );
+ _referenceFiles = new Path( this.getProject() );
_referenceFiles.append( path );
}
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BorlandGenerateClient.java 2001/12/17 09:50:12 1.5
+++ BorlandGenerateClient.java 2001/12/21 13:34:17 1.6
@@ -98,7 +98,7 @@
{
if( this.classpath == null )
{
- this.classpath = new Path( project );
+ this.classpath = new Path( getProject() );
}
return this.classpath.createPath();
}
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DDCreator.java 2001/12/16 04:12:39 1.3
+++ DDCreator.java 2001/12/21 13:34:17 1.4
@@ -53,7 +53,7 @@
*/
public void setClasspath( String s )
{
- this.classpath = project.translatePath( s );
+ this.classpath = getProject().translatePath( s );
}
/**
@@ -118,13 +118,13 @@
}
String systemClassPath = System.getProperty( "java.class.path" );
- String execClassPath = project.translatePath( systemClassPath + ":"
+ classpath );
- Java ddCreatorTask = (Java)project.createTask( "java" );
+ String execClassPath = getProject().translatePath( systemClassPath +
":" + classpath );
+ Java ddCreatorTask = (Java)getProject().createTask( "java" );
ddCreatorTask.setFork( true );
ddCreatorTask.setClassname(
"org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" );
Commandline.Argument arguments = ddCreatorTask.createArg();
arguments.setLine( args );
- ddCreatorTask.setClasspath( new Path( project, execClassPath ) );
+ ddCreatorTask.setClasspath( new Path( getProject(), execClassPath )
);
if( ddCreatorTask.executeJava() != 0 )
{
throw new TaskException( "Execution of ddcreator helper failed"
);
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EjbJar.java 2001/12/16 00:37:02 1.2
+++ EjbJar.java 2001/12/21 13:34:17 1.3
@@ -255,7 +255,7 @@
{
if( config.classpath == null )
{
- config.classpath = new Path( project );
+ config.classpath = new Path( getProject() );
}
return config.classpath.createPath();
}
1.4 +4 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ejbc.java 2001/12/16 04:12:39 1.3
+++ Ejbc.java 2001/12/21 13:34:17 1.4
@@ -64,7 +64,7 @@
*/
public void setClasspath( String s )
{
- this.classpath = project.translatePath( s );
+ this.classpath = getProject().translatePath( s );
}
/**
@@ -159,14 +159,14 @@
}
String systemClassPath = System.getProperty( "java.class.path" );
- String execClassPath = project.translatePath( systemClassPath + ":"
+ classpath +
+ String execClassPath = getProject().translatePath( systemClassPath +
":" + classpath +
":" +
generatedFilesDirectory );
// get all the files in the descriptor directory
DirectoryScanner ds = super.getDirectoryScanner( descriptorDirectory
);
String[] files = ds.getIncludedFiles();
- Java helperTask = (Java)project.createTask( "java" );
+ Java helperTask = (Java)getProject().createTask( "java" );
helperTask.setFork( true );
helperTask.setClassname(
"org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper" );
String args = "";
@@ -183,7 +183,7 @@
Commandline.Argument arguments = helperTask.createArg();
arguments.setLine( args );
- helperTask.setClasspath( new Path( project, execClassPath ) );
+ helperTask.setClasspath( new Path( getProject(), execClassPath ) );
if( helperTask.executeJava() != 0 )
{
throw new TaskException( "Execution of ejbc helper failed" );
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IPlanetEjbcTask.java 2001/12/16 00:37:02 1.3
+++ IPlanetEjbcTask.java 2001/12/21 13:34:17 1.4
@@ -176,7 +176,7 @@
{
if( classpath == null )
{
- classpath = new Path( project );
+ classpath = new Path( getProject() );
}
return classpath.createPath();
}
1.6 +4 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WLRun.java 2001/12/16 04:12:39 1.5
+++ WLRun.java 2001/12/21 13:34:17 1.6
@@ -237,7 +237,7 @@
{
if( classpath == null )
{
- classpath = new Path( project );
+ classpath = new Path( getProject() );
}
return classpath.createPath();
}
@@ -251,7 +251,7 @@
{
if( weblogicClasspath == null )
{
- weblogicClasspath = new Path( project );
+ weblogicClasspath = new Path( getProject() );
}
return weblogicClasspath.createPath();
}
@@ -312,7 +312,7 @@
}
}
- Java weblogicServer = (Java)project.createTask( "java" );
+ Java weblogicServer = (Java)getProject().createTask( "java" );
weblogicServer.setFork( true );
weblogicServer.setClassname( weblogicMainClass );
@@ -362,7 +362,7 @@
throw new TaskException( "You must supply a management password
to start the server" );
}
- Java weblogicServer = (Java)project.createTask( "java" );
+ Java weblogicServer = (Java)getProject().createTask( "java" );
weblogicServer.setFork( true );
weblogicServer.setDir( weblogicSystemHome );
weblogicServer.setClassname( weblogicMainClass );
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WLStop.java 2001/12/16 00:37:02 1.2
+++ WLStop.java 2001/12/21 13:34:17 1.3
@@ -120,7 +120,7 @@
{
if( classpath == null )
{
- classpath = new Path( project );
+ classpath = new Path( getProject() );
}
return classpath.createPath();
}
@@ -145,7 +145,7 @@
throw new TaskException( "The url of the weblogic server must be
provided." );
}
- Java weblogicAdmin = (Java)project.createTask( "java" );
+ Java weblogicAdmin = (Java)getProject().createTask( "java" );
weblogicAdmin.setFork( true );
weblogicAdmin.setClassname( "weblogic.Admin" );
String args;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
Index: Translate.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Translate.java 2001/12/17 10:47:19 1.4
+++ Translate.java 2001/12/21 13:34:17 1.5
@@ -518,7 +518,7 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] srcFiles = ds.getIncludedFiles();
for( int j = 0; j < srcFiles.length; j++ )
{
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
Index: VAJImport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VAJImport.java 2001/12/16 00:36:41 1.2
+++ VAJImport.java 2001/12/21 13:34:17 1.3
@@ -224,7 +224,7 @@
*/
protected void importFileset( FileSet fileset )
{
- DirectoryScanner ds = fileset.getDirectoryScanner( this.project );
+ DirectoryScanner ds = fileset.getDirectoryScanner( this.getProject()
);
if( ds.getIncludedFiles().length == 0 )
{
return;
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JJTree.java 2001/12/17 09:50:12 1.5
+++ JJTree.java 2001/12/21 13:34:17 1.6
@@ -175,7 +175,7 @@
{
throw new TaskException( "Javacchome not set." );
}
- final Path classpath = cmdl.createClasspath( project );
+ final Path classpath = cmdl.createClasspath( getProject() );
classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
"/JavaCC.zip" );
classpath.addJavaRuntime();
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaCC.java 2001/12/17 09:50:12 1.3
+++ JavaCC.java 2001/12/21 13:34:17 1.4
@@ -225,7 +225,7 @@
{
throw new TaskException( "Javacchome not set." );
}
- final Path classpath = cmdl.createClasspath( project );
+ final Path classpath = cmdl.createClasspath( getProject() );
classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
"/JavaCC.zip" );
classpath.addJavaRuntime();
1.6 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDependTask.java 2001/12/17 09:50:12 1.5
+++ JDependTask.java 2001/12/21 13:34:18 1.6
@@ -206,7 +206,7 @@
{
if( _compileClasspath == null )
{
- _compileClasspath = new Path( project );
+ _compileClasspath = new Path( getProject() );
}
return _compileClasspath.createPath();
}
@@ -233,7 +233,7 @@
{
if( _sourcesPath == null )
{
- _sourcesPath = new Path( project );
+ _sourcesPath = new Path( getProject() );
}
return _sourcesPath.createPath();
}
@@ -340,7 +340,7 @@
if( getDir() != null )
{
execute.setWorkingDirectory( getDir() );
- execute.setAntRun( project );
+ execute.setAntRun( getProject() );
}
if( getOutputFile() != null )
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspC.java 2001/12/16 05:44:56 1.5
+++ JspC.java 2001/12/21 13:34:18 1.6
@@ -58,7 +58,7 @@
* </a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">J D Glanville</a>
- * @version $Revision: 1.5 $ $Date: 2001/12/16 05:44:56 $
+ * @version $Revision: 1.6 $ $Date: 2001/12/21 13:34:18 $
*/
public class JspC extends MatchingTask
{
@@ -315,7 +315,7 @@
throws TaskException
{
if( classpath == null )
- classpath = new Path( project );
+ classpath = new Path( getProject() );
return classpath.createPath();
}
@@ -376,7 +376,7 @@
// compile the source files
- String compiler = project.getProperty( "jsp.compiler" );
+ String compiler = getProject().getProperty( "jsp.compiler" );
if( compiler == null )
{
compiler = "jasper";
1.8 +3 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WLJspc.java 2001/12/16 05:44:56 1.7
+++ WLJspc.java 2001/12/21 13:34:18 1.8
@@ -127,7 +127,7 @@
{
if( compileClasspath == null )
{
- compileClasspath = new Path( project );
+ compileClasspath = new Path( getProject() );
}
return compileClasspath;
}
@@ -161,7 +161,7 @@
//use the systemclasspath as well, to include the ant jar
if( compileClasspath == null )
{
- compileClasspath = new Path( project );
+ compileClasspath = new Path( getProject() );
}
compileClasspath.append( Path.systemClasspath );
@@ -171,7 +171,7 @@
// Therefore, takes loads of time
// Can pass directories at a time (*.jsp) but easily runs out of
memory on hefty dirs
// (even on a Sun)
- Java helperTask = (Java)project.createTask( "java" );
+ Java helperTask = (Java)getProject().createTask( "java" );
helperTask.setFork( true );
helperTask.setClassname( "weblogic.jspc" );
String[] args = new String[ 12 ];
1.8 +7 -7
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JUnitTask.java 2001/12/17 09:50:12 1.7
+++ JUnitTask.java 2001/12/21 13:34:18 1.8
@@ -344,7 +344,7 @@
*/
public BatchTest createBatchTest()
{
- BatchTest test = new BatchTest( project );
+ BatchTest test = new BatchTest( getProject() );
batchTests.addElement( test );
return test;
}
@@ -356,7 +356,7 @@
*/
public Path createClasspath()
{
- return commandline.createClasspath( project ).createPath();
+ return commandline.createClasspath( getProject() ).createPath();
}
/**
@@ -392,7 +392,7 @@
while( list.hasMoreElements() )
{
JUnitTest test = (JUnitTest)list.nextElement();
- if( test.shouldRun( project ) )
+ if( test.shouldRun( getProject() ) )
{
execute( test );
}
@@ -655,7 +655,7 @@
// Create a temporary file to pass the Ant properties to the forked
test
File propsFile = new File( "junit" + ( new Random(
System.currentTimeMillis() ) ).nextLong() + ".properties" );
cmd.createArgument().setValue( "propsfile=" +
propsFile.getAbsolutePath() );
- Hashtable p = project.getProperties();
+ Hashtable p = getProject().getProperties();
Properties props = new Properties();
for( Enumeration enum = p.keys(); enum.hasMoreElements(); )
{
@@ -675,7 +675,7 @@
Execute execute = new Execute( new LogStreamHandler( this,
Project.MSG_INFO, Project.MSG_WARN ), watchdog );
execute.setCommandline( cmd.getCommandline() );
- execute.setAntRun( project );
+ execute.setAntRun( getProject() );
if( dir != null )
{
execute.setWorkingDirectory( dir );
@@ -710,7 +710,7 @@
private int executeInVM( JUnitTest test )
throws TaskException
{
- test.setProperties( project.getProperties() );
+ test.setProperties( getProject().getProperties() );
if( dir != null )
{
log( "dir attribute ignored if running in the same VM",
Project.MSG_WARN );
@@ -730,7 +730,7 @@
{
log( "Using CLASSPATH " + classpath, Project.MSG_VERBOSE );
- cl = new AntClassLoader( null, project, classpath, false );
+ cl = new AntClassLoader( null, getProject(), classpath,
false );
// make sure the test will be accepted as a TestCase
cl.addSystemPackageRoot( "junit" );
// will cause trouble in JDK 1.1 if omitted
1.6 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLResultAggregator.java 2001/12/21 13:28:31 1.5
+++ XMLResultAggregator.java 2001/12/21 13:34:18 1.6
@@ -185,7 +185,7 @@
}
if( toDir == null )
{
- toDir = FileUtil.resolveFile( project.getBaseDir(), DEFAULT_DIR
);
+ toDir = FileUtil.resolveFile( getProject().getBaseDir(),
DEFAULT_DIR );
}
return new File( toDir, toFile );
}
@@ -202,7 +202,7 @@
for( int i = 0; i < size; i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
ds.scan();
String[] f = ds.getIncludedFiles();
for( int j = 0; j < f.length; j++ )
@@ -212,7 +212,7 @@
{
File file = new File( ds.getBasedir(), pathname );
file = FileUtil.
- resolveFile( project.getBaseDir(), file.getPath() );
+ resolveFile( getProject().getBaseDir(),
file.getPath() );
v.addElement( file );
}
}
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractMetamataTask.java 2001/12/17 09:50:12 1.4
+++ AbstractMetamataTask.java 2001/12/21 13:34:18 1.5
@@ -159,7 +159,7 @@
{
if( classPath == null )
{
- classPath = new Path( project );
+ classPath = new Path( getProject() );
}
return classPath;
}
@@ -183,7 +183,7 @@
{
if( sourcePath == null )
{
- sourcePath = new Path( project );
+ sourcePath = new Path( getProject() );
}
return sourcePath;
}
@@ -222,7 +222,7 @@
// set the classpath as the jar file
File jar = getMetamataJar( metamataHome );
- final Path classPath = cmdl.createClasspath( project );
+ final Path classPath = cmdl.createClasspath( getProject() );
classPath.createPathElement().setLocation( jar );
// set the metamata.home property
@@ -374,7 +374,7 @@
for( int i = 0; i < fileSets.size(); i++ )
{
FileSet fs = (FileSet)fileSets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
ds.scan();
String[] f = ds.getIncludedFiles();
log( i + ") Adding " + f.length + " files from directory " +
ds.getBasedir(), Project.MSG_VERBOSE );
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
Index: MAudit.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MAudit.java 2001/12/17 09:50:12 1.4
+++ MAudit.java 2001/12/21 13:34:18 1.5
@@ -135,7 +135,7 @@
{
if( searchPath == null )
{
- searchPath = new Path( project );
+ searchPath = new Path( getProject() );
}
return searchPath;
}
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
Index: MMetrics.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MMetrics.java 2001/12/17 09:50:12 1.3
+++ MMetrics.java 2001/12/21 13:34:18 1.4
@@ -113,7 +113,7 @@
{
if( path == null )
{
- path = new Path( project );
+ path = new Path( getProject() );
}
return path;
}
1.7 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MParse.java 2001/12/17 09:50:12 1.6
+++ MParse.java 2001/12/21 13:34:18 1.7
@@ -150,7 +150,7 @@
{
if( classpath == null )
{
- classpath = new Path( project );
+ classpath = new Path( getProject() );
}
return classpath;
}
@@ -174,7 +174,7 @@
{
if( sourcepath == null )
{
- sourcepath = new Path( project );
+ sourcepath = new Path( getProject() );
}
return sourcepath;
}
@@ -211,7 +211,7 @@
// set the classpath as the jar files
File[] jars = getMetamataLibs();
- final Path classPath = cmdl.createClasspath( project );
+ final Path classPath = cmdl.createClasspath( getProject() );
for( int i = 0; i < jars.length; i++ )
{
classPath.createPathElement().setLocation( jars[ i ] );
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Index: FTP.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FTP.java 2001/12/16 05:44:56 1.4
+++ FTP.java 2001/12/21 13:34:18 1.5
@@ -798,12 +798,12 @@
if( action == SEND_FILES )
{
- ds = fs.getDirectoryScanner( project );
+ ds = fs.getDirectoryScanner( getProject() );
}
else
{
ds = new FTPDirectoryScanner( ftp );
- fs.setupDirectoryScanner( ds, project );
+ fs.setupDirectoryScanner( ds, getProject() );
ds.scan();
}
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
Index: MimeMail.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MimeMail.java 2001/12/16 05:44:56 1.4
+++ MimeMail.java 2001/12/21 13:34:18 1.5
@@ -308,7 +308,7 @@
FileSet fs = (FileSet)filesets.elementAt( i );
if( fs != null )
{
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
String[] dsfiles = ds.getIncludedFiles();
File baseDir = ds.getBasedir();
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
Index: P4Add.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- P4Add.java 2001/12/16 00:35:04 1.2
+++ P4Add.java 2001/12/21 13:34:18 1.3
@@ -124,7 +124,7 @@
for( int i = 0; i < filesets.size(); i++ )
{
FileSet fs = (FileSet)filesets.elementAt( i );
- DirectoryScanner ds = fs.getDirectoryScanner( project );
+ DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
//File fromDir = fs.getDir(project);
String[] srcFiles = ds.getIncludedFiles();
1.7 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- P4Base.java 2001/12/17 09:50:13 1.6
+++ P4Base.java 2001/12/21 13:34:18 1.7
@@ -100,11 +100,11 @@
//Get default P4 settings from environment - Mark would have done
something cool with
//introspection here.....:-)
String tmpprop;
- if( ( tmpprop = project.getProperty( "p4.port" ) ) != null )
+ if( ( tmpprop = getProject().getProperty( "p4.port" ) ) != null )
setPort( tmpprop );
- if( ( tmpprop = project.getProperty( "p4.client" ) ) != null )
+ if( ( tmpprop = getProject().getProperty( "p4.client" ) ) != null )
setClient( tmpprop );
- if( ( tmpprop = project.getProperty( "p4.user" ) ) != null )
+ if( ( tmpprop = getProject().getProperty( "p4.user" ) ) != null )
setUser( tmpprop );
}
@@ -167,7 +167,7 @@
Execute exe = new Execute( handler, null );
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
exe.setCommandline( commandline.getCommandline() );
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
Index: P4Change.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- P4Change.java 2001/12/16 06:21:41 1.3
+++ P4Change.java 2001/12/21 13:34:18 1.4
@@ -81,7 +81,7 @@
if( emptyChangeList == null )
emptyChangeList = getEmptyChangeList();
- final Project myProj = project;
+ final Project myProj = getProject();
P4Handler handler =
new P4HandlerAdapter()
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
Index: P4Counter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- P4Counter.java 2001/12/16 06:21:41 1.3
+++ P4Counter.java 2001/12/21 13:34:18 1.4
@@ -76,7 +76,7 @@
if( shouldSetProperty )
{
- final Project myProj = project;
+ final Project myProj = getProject();
P4Handler handler =
new P4HandlerAdapter()
1.7 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
Index: CovReport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CovReport.java 2001/12/17 09:50:13 1.6
+++ CovReport.java 2001/12/21 13:34:19 1.7
@@ -203,7 +203,7 @@
{
if( coveragePath == null )
{
- coveragePath = new Path( project );
+ coveragePath = new Path( getProject() );
}
return coveragePath.createPath();
}
@@ -221,7 +221,7 @@
{
if( sourcePath == null )
{
- sourcePath = new Path( project );
+ sourcePath = new Path( getProject() );
}
return sourcePath.createPath();
}
@@ -290,7 +290,7 @@
// as a default -sourcepath use . in JProbe, so use project .
if( sourcePath == null )
{
- sourcePath = new Path( project );
+ sourcePath = new Path( getProject() );
sourcePath.createPath().setLocation( getBaseDirectory() );
}
v.addElement( "-sourcepath=" + sourcePath );
@@ -364,7 +364,7 @@
{
if( classPath == null )
{
- classPath = new Path( CovReport.this.project );
+ classPath = new Path( CovReport.this.getProject() );
}
return classPath.createPath();
}
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Coverage.java 2001/12/17 09:50:13 1.4
+++ Coverage.java 2001/12/21 13:34:19 1.5
@@ -229,7 +229,7 @@
*/
public Path createClasspath()
{
- return cmdlJava.createClasspath( project ).createPath();
+ return cmdlJava.createClasspath( getProject() ).createPath();
}
public Filters createFilters()
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MSVSS.java 2001/12/17 09:50:13 1.6
+++ MSVSS.java 2001/12/21 13:34:19 1.7
@@ -135,7 +135,7 @@
*/
public final void setSsdir( String dir )
{
- m_SSDir = project.translatePath( dir );
+ m_SSDir = getProject().translatePath( dir );
}
/**
@@ -227,7 +227,7 @@
exe.setEnvironment( newEnv );
}
- exe.setAntRun( project );
+ exe.setAntRun( getProject() );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
