diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml index 663ebff0e..90a08d6ae 100644 --- a/proposal/myrmidon/build.xml +++ b/proposal/myrmidon/build.xml @@ -568,8 +568,16 @@ Legal: - + + + + + + + diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java index 0f4486898..96d61eaf9 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java @@ -33,7 +33,7 @@ public abstract class AbstractAvailableCondition public void addClasspath( final Path classpath ) throws TaskException { - m_classpath.addPath( classpath ); + m_classpath.add( classpath ); } /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java index d5dc1a7a4..9c04c0c68 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java @@ -396,7 +396,7 @@ public class CSharp { m_referenceFiles = new Path(); } - m_referenceFiles.addPath( path ); + m_referenceFiles.add( path ); } /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java new file mode 100644 index 000000000..b22dde10c --- /dev/null +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/ListPathTask.java @@ -0,0 +1,49 @@ +/* + * 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.antlib.file; + +import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.FileList; +import org.apache.myrmidon.framework.file.Path; + +/** + * A diagnostic task that lists the contents of a path. + * + * @author Adam Murdoch + * @version $Revision$ $Date$ + * + * @ant:task name="list-path" + */ +public class ListPathTask + extends AbstractTask +{ + private final Path m_path = new Path(); + + /** + * Adds a nested path. + */ + public void add( final FileList list ) + { + m_path.add( list ); + } + + /** + * Executes the task. + */ + public void execute() + throws TaskException + { + final String[] files = m_path.listFiles( getContext() ); + for( int i = 0; i < files.length; i++ ) + { + final String file = files[ i ]; + getContext().warn( file ); + } + } +} diff --git a/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java b/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java index 3794a6134..9c63bdedd 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java @@ -44,7 +44,7 @@ public class JavaTask public void addClasspath( final Path classpath ) throws TaskException { - m_exec.getClassPath().addPath( classpath ); + m_exec.getClassPath().add( classpath ); } /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java index 847c28e2f..291ce3c33 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java @@ -109,7 +109,7 @@ public class XMLValidateTask } else { - m_classpath.addPath( classpath ); + m_classpath.add( classpath ); } } @@ -170,7 +170,7 @@ public class XMLValidateTask } Path path1 = m_classpath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java index bab827fa1..bbb10cec6 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java @@ -142,7 +142,7 @@ public class XSLTProcess { m_classpath = new Path(); } - m_classpath.addPath( path ); + m_classpath.add( path ); } public void addParam( final XSLTParam param ) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java index 18e5fa570..082a19b32 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/FileSet.java @@ -15,6 +15,8 @@ import java.io.File; * * @author Peter Donald * @version $Revision$ $Date$ + * + * @ant:data-type name="fileset" */ public class FileSet extends AbstractFileSet diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java index 8a56e0bb7..b46b30191 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java @@ -100,7 +100,8 @@ public class Pattern { try { - final boolean result = getCondition().evaluate( context ); + final Condition condition = getCondition(); + final boolean result = ( condition == null || condition.evaluate( context ) ); if( result ) { return getName(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java index 81e9c3445..ae0a79450 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java @@ -15,6 +15,8 @@ import org.apache.myrmidon.api.TaskException; * * @author Adam Murdoch * @version $Revision$ $Date$ + * + * @ant:role shorthand="path" */ public interface FileList { diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java index 2fd5b90d1..ffd7fe919 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java @@ -59,7 +59,7 @@ public class Path public Path( final String path ) { - addPath( path ); + add( path ); } public Path() @@ -110,13 +110,13 @@ public class Path */ public void setPath( final String path ) { - addPath( path ); + add( path ); } /** * Adds a path. */ - public void addPath( final String path ) + public void add( final String path ) { final FileList pathElement = new ParsedPathElement( path ); m_elements.add( pathElement ); @@ -125,18 +125,18 @@ public class Path /** * Adds a path. */ - public void addPath( final String[] path ) + public void add( final String[] path ) { final FileList pathElement = new ArrayFileList( path ); m_elements.add( pathElement ); } /** - * Creates a nested <path> element. + * Adds a path. */ - public void addPath( final Path path ) + public void add( final FileList list ) { - m_elements.add( path ); + m_elements.add( list ); } /** diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/test/ant-descriptor.xml b/proposal/myrmidon/src/test/org/apache/antlib/core/test/ant-descriptor.xml deleted file mode 100644 index e0fd41a4b..000000000 --- a/proposal/myrmidon/src/test/org/apache/antlib/core/test/ant-descriptor.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/PathTestCase.java b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/PathTestCase.java new file mode 100644 index 000000000..36b391051 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/PathTestCase.java @@ -0,0 +1,99 @@ +/* + * 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.myrmidon.framework.file.test; + +import java.io.File; +import org.apache.avalon.excalibur.io.FileUtil; +import org.apache.myrmidon.AbstractProjectTest; +import org.apache.myrmidon.LogMessageTracker; + +/** + * Test-cases for the data type. + * + * @author Adam Murdoch + * @version $Revision$ $Date$ + */ +public class PathTestCase + extends AbstractProjectTest +{ + public PathTestCase( final String name ) + { + super( name ); + } + + /** + * Tests setting the location attribute. + */ + public void testLocationAttribute() throws Exception + { + testPathContent( "set-location", new String[] { "location" } ); + } + + /** + * Tests setting the path attribute. + */ + public void testPathAttribute() throws Exception + { + // Test a path with a single file + testPathContent( "set-path", new String[] { "single-file" } ); + + // Test a path with several files, using ; separator + testPathContent( "set-multi-path", new String[] { "file1", "file2", ".." } ); + + // Test a path with several files, using : separator + testPathContent( "set-multi-path2", new String[] { "file1", "file2", ".." } ); + } + + /** + * Test using nested elements. + */ + public void testPathElement() throws Exception + { + testPathContent( "nested-path", new String[] { "some-file" } ); + testPathContent( "mixed-path", new String[] { "file1", "file2", "file3", "file4", "file5" } ); + } + + /** + * Test using nested elements. + */ + public void testFilesetElement() throws Exception + { + testPathContent( "set-fileset", new String[] { "path.ant" } ); + } + + /** + * Test using a nested custom file list implementation. + */ + public void testCustomFileList() throws Exception + { + testPathContent( "test-custom-file-list", new String[] { "file1" } ); + } + + /** + * Executes a target, and asserts that a particular list of file names + * is logged. + */ + private void testPathContent( final String targetName, + final String[] files ) throws Exception + { + final File projectFile = getTestResource( "path.ant" ); + final File baseDir = projectFile.getParentFile(); + + // Add each of the expected file names + final LogMessageTracker listener = new LogMessageTracker(); + for( int i = 0; i < files.length; i++ ) + { + final String fileName = files[ i ]; + final File file = FileUtil.resolveFile( baseDir, fileName ); + listener.addExpectedMessage( targetName, file.getAbsolutePath() ); + } + + // Execute the target + executeTarget( projectFile, targetName, listener ); + } +} diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java new file mode 100644 index 000000000..c5984de5b --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/TestFileList.java @@ -0,0 +1,42 @@ +/* + * 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.myrmidon.framework.file.test; + +import org.apache.myrmidon.framework.file.FileList; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; +import java.io.File; + +/** + * A test FileList implementation. + * + * @author Adam Murdoch + * @version $Revision$ $Date$ + * + * @ant:type type="path" name="test-file-list" + */ +public class TestFileList + implements FileList +{ + private String m_name; + + public void setName( final String name ) + { + m_name = name; + } + + /** + * Returns the files in this list. + */ + public String[] listFiles( final TaskContext context ) + throws TaskException + { + final File file = context.resolveFile( m_name ); + return new String[] { file.getAbsolutePath() }; + } +} diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/path.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/path.ant new file mode 100644 index 000000000..319f92336 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/framework/file/test/path.ant @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/ant-descriptor.xml b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/ant-descriptor.xml deleted file mode 100644 index e0fd41a4b..000000000 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/ant-descriptor.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/PathTestCase.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/PathTestCase.java new file mode 100644 index 000000000..36b391051 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/PathTestCase.java @@ -0,0 +1,99 @@ +/* + * 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.myrmidon.framework.file.test; + +import java.io.File; +import org.apache.avalon.excalibur.io.FileUtil; +import org.apache.myrmidon.AbstractProjectTest; +import org.apache.myrmidon.LogMessageTracker; + +/** + * Test-cases for the data type. + * + * @author Adam Murdoch + * @version $Revision$ $Date$ + */ +public class PathTestCase + extends AbstractProjectTest +{ + public PathTestCase( final String name ) + { + super( name ); + } + + /** + * Tests setting the location attribute. + */ + public void testLocationAttribute() throws Exception + { + testPathContent( "set-location", new String[] { "location" } ); + } + + /** + * Tests setting the path attribute. + */ + public void testPathAttribute() throws Exception + { + // Test a path with a single file + testPathContent( "set-path", new String[] { "single-file" } ); + + // Test a path with several files, using ; separator + testPathContent( "set-multi-path", new String[] { "file1", "file2", ".." } ); + + // Test a path with several files, using : separator + testPathContent( "set-multi-path2", new String[] { "file1", "file2", ".." } ); + } + + /** + * Test using nested elements. + */ + public void testPathElement() throws Exception + { + testPathContent( "nested-path", new String[] { "some-file" } ); + testPathContent( "mixed-path", new String[] { "file1", "file2", "file3", "file4", "file5" } ); + } + + /** + * Test using nested elements. + */ + public void testFilesetElement() throws Exception + { + testPathContent( "set-fileset", new String[] { "path.ant" } ); + } + + /** + * Test using a nested custom file list implementation. + */ + public void testCustomFileList() throws Exception + { + testPathContent( "test-custom-file-list", new String[] { "file1" } ); + } + + /** + * Executes a target, and asserts that a particular list of file names + * is logged. + */ + private void testPathContent( final String targetName, + final String[] files ) throws Exception + { + final File projectFile = getTestResource( "path.ant" ); + final File baseDir = projectFile.getParentFile(); + + // Add each of the expected file names + final LogMessageTracker listener = new LogMessageTracker(); + for( int i = 0; i < files.length; i++ ) + { + final String fileName = files[ i ]; + final File file = FileUtil.resolveFile( baseDir, fileName ); + listener.addExpectedMessage( targetName, file.getAbsolutePath() ); + } + + // Execute the target + executeTarget( projectFile, targetName, listener ); + } +} diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/TestFileList.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/TestFileList.java new file mode 100644 index 000000000..c5984de5b --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/TestFileList.java @@ -0,0 +1,42 @@ +/* + * 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.myrmidon.framework.file.test; + +import org.apache.myrmidon.framework.file.FileList; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.api.TaskException; +import java.io.File; + +/** + * A test FileList implementation. + * + * @author Adam Murdoch + * @version $Revision$ $Date$ + * + * @ant:type type="path" name="test-file-list" + */ +public class TestFileList + implements FileList +{ + private String m_name; + + public void setName( final String name ) + { + m_name = name; + } + + /** + * Returns the files in this list. + */ + public String[] listFiles( final TaskContext context ) + throws TaskException + { + final File file = context.resolveFile( m_name ); + return new String[] { file.getAbsolutePath() }; + } +} diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/path.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/path.ant new file mode 100644 index 000000000..319f92336 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/framework/file/test/path.ant @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java index 08cb3f612..1f8e0a72d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java @@ -69,7 +69,7 @@ public class ANTLR */ public void addClasspath( final Path path ) { - m_exe.getClassPath().addPath( path ); + m_exe.getClassPath().add( path ); } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java index f537290f6..25f16e5cf 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java @@ -488,7 +488,7 @@ public class IContract extends MatchingTask */ public void setClasspath( final Path path ) { - createClasspath().addPath( path ); + createClasspath().add( path ); } /** @@ -709,12 +709,12 @@ public class IContract extends MatchingTask // Create the classpath required to compile the sourcefiles BEFORE instrumentation Path beforeInstrumentationClasspath = new Path(); - beforeInstrumentationClasspath.addPath( baseClasspath ); + beforeInstrumentationClasspath.add( baseClasspath ); beforeInstrumentationClasspath.addLocation( srcDir ); // Create the classpath required to compile the sourcefiles AFTER instrumentation Path afterInstrumentationClasspath = new Path(); - afterInstrumentationClasspath.addPath( baseClasspath ); + afterInstrumentationClasspath.add( baseClasspath ); afterInstrumentationClasspath.addLocation( instrumentDir ); afterInstrumentationClasspath.addLocation( repositoryDir ); afterInstrumentationClasspath.addLocation( srcDir ); @@ -722,7 +722,7 @@ public class IContract extends MatchingTask // Create the classpath required to automatically compile the repository files Path repositoryClasspath = new Path(); - repositoryClasspath.addPath( baseClasspath ); + repositoryClasspath.add( baseClasspath ); repositoryClasspath.addLocation( instrumentDir ); repositoryClasspath.addLocation( srcDir ); repositoryClasspath.addLocation( repositoryDir ); @@ -730,7 +730,7 @@ public class IContract extends MatchingTask // Create the classpath required for iContract itself Path iContractClasspath = new Path(); - iContractClasspath.addPath( baseClasspath ); + iContractClasspath.add( baseClasspath ); iContractClasspath.addLocation( new File(System.getProperty( "java.home" ) + File.separator + ".." + File.separator + "lib" + File.separator + "tools.jar" ) ); iContractClasspath.addLocation( srcDir ); iContractClasspath.addLocation( repositoryDir ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java index 36eb8e39a..b6998eb89 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java @@ -79,7 +79,7 @@ public class Javah } else { - m_bootclasspath.addPath( bootclasspath ); + m_bootclasspath.add( bootclasspath ); } } @@ -100,7 +100,7 @@ public class Javah } else { - m_classpath.addPath( classpath ); + m_classpath.add( classpath ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java index 8d3b76349..a33997c74 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java @@ -108,7 +108,7 @@ public class PathConvert extends AbstractTask } else { - m_path.addPath( path ); + m_path.add( path ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java index 1fa565129..c022d83b9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java @@ -45,7 +45,7 @@ public class Property } else { - m_classpath.addPath( classpath ); + m_classpath.add( classpath ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java index ff43c7e4b..c2c84a4d4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java @@ -178,7 +178,7 @@ public class SQLExec } else { - this.classpath.addPath( classpath ); + this.classpath.add( classpath ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java index 8270fcb51..dfb001e4e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java @@ -295,7 +295,7 @@ public abstract class DefaultCompilerAdapter // add the classpath if( m_compileClasspath != null ) { - classpath.addPath( m_compileClasspath ); + classpath.add( m_compileClasspath ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java index f1c244f40..43e63a089 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java @@ -50,7 +50,7 @@ public class Gcj extends DefaultCompilerAdapter // gcj doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. final String[] bootclasspath = m_bootclasspath.listFiles( getTaskContext() ); - classpath.addPath( bootclasspath ); + classpath.add( bootclasspath ); // gcj doesn't support an extension dir (-extdir) // so we'll emulate it for compatibility and convenience. @@ -66,7 +66,7 @@ public class Gcj extends DefaultCompilerAdapter // Gcj has no option for source-path so we // will add it to classpath. - classpath.addPath( src ); + classpath.add( src ); cmd.setExecutable( "gcj" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java index 8dc9cb840..aa0493309 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java @@ -89,7 +89,7 @@ public class Javac */ public void addBootclasspath( final Path bootclasspath ) { - m_bootclasspath.addPath( bootclasspath ); + m_bootclasspath.add( bootclasspath ); } /** @@ -103,7 +103,7 @@ public class Javac } else { - m_compileClasspath.addPath( classpath ); + m_compileClasspath.add( classpath ); } } @@ -181,7 +181,7 @@ public class Javac } else { - m_extdirs.addPath( extdirs ); + m_extdirs.add( extdirs ); } } @@ -282,7 +282,7 @@ public class Javac } else { - m_src.addPath( srcDir ); + m_src.add( srcDir ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java index 107824006..04bc0c6a9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java @@ -47,7 +47,7 @@ public class Jikes // Jikes doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. final String[] bootclasspath = m_bootclasspath.listFiles( getTaskContext() ); - classpath.addPath( bootclasspath ); + classpath.add( bootclasspath ); // Jikes doesn't support an extension dir (-extdir) // so we'll emulate it for compatibility and convenience. @@ -67,13 +67,13 @@ public class Jikes // Jikes has no option for source-path so we // will add it to classpath. - classpath.addPath( src ); + classpath.add( src ); // if the user has set JIKESPATH we should add the contents as well String jikesPath = System.getProperty( "jikes.class.path" ); if( jikesPath != null ) { - classpath.addPath( jikesPath ); + classpath.add( jikesPath ); } Commandline cmd = new Commandline(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java index b3edc8e4b..d232f8b38 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java @@ -35,7 +35,7 @@ public class Jvc extends DefaultCompilerAdapter // jvc doesn't support bootclasspath dir (-bootclasspath) // so we'll emulate it for compatibility and convenience. final String[] bootclasspath = m_bootclasspath.listFiles( getTaskContext() ); - classpath.addPath( bootclasspath ); + classpath.add( bootclasspath ); // jvc doesn't support an extension dir (-extdir) // so we'll emulate it for compatibility and convenience. @@ -55,7 +55,7 @@ public class Jvc extends DefaultCompilerAdapter // jvc has no option for source-path so we // will add it to classpath. - classpath.addPath( src ); + classpath.add( src ); Commandline cmd = new Commandline(); cmd.setExecutable( "jvc" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java index f39b7e57b..3acd5239a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java @@ -89,15 +89,15 @@ public class Kjc extends DefaultCompilerAdapter Path cp = new Path(); // kjc don't have bootclasspath option. - cp.addPath( m_bootclasspath ); + cp.add( m_bootclasspath ); if( m_extdirs != null ) { addExtdirs( cp ); } - cp.addPath( classpath ); - cp.addPath( src ); + cp.add( classpath ); + cp.add( src ); cmd.addArgument( PathUtil.formatPath( cp, getTaskContext() ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java index 9098d0201..4dd38137d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java @@ -32,7 +32,7 @@ public class DocletInfo } else { - m_path.addPath( path ); + m_path.add( path ); } } @@ -67,7 +67,7 @@ public class DocletInfo } Path path1 = m_path; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java index c688ba997..56198973f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java @@ -114,7 +114,7 @@ public class Javadoc } else { - m_bootclasspath.addPath( src ); + m_bootclasspath.add( src ); } } @@ -139,7 +139,7 @@ public class Javadoc } else { - m_classpath.addPath( src ); + m_classpath.add( src ); } } @@ -384,7 +384,7 @@ public class Javadoc } else { - m_sourcePath.addPath( src ); + m_sourcePath.add( src ); } } @@ -475,7 +475,7 @@ public class Javadoc } Path path1 = m_bootclasspath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } @@ -488,7 +488,7 @@ public class Javadoc } Path path1 = m_classpath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } @@ -521,7 +521,7 @@ public class Javadoc } Path path1 = m_sourcePath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } @@ -564,10 +564,10 @@ public class Javadoc // Build the classpath to pass to Javadoc Path classpath = new Path(); - classpath.addPath( m_sourcePath ); + classpath.add( m_sourcePath ); if( m_classpath != null ) { - classpath.addPath( m_classpath ); + classpath.add( m_classpath ); } cmd.addArgument( "-classpath" ); cmd.addArgument( PathUtil.formatPath( classpath, getContext() ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java index 2a5742824..0f9e7d566 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java @@ -105,7 +105,7 @@ public class JDependTask */ public void addClasspath( final Path path ) { - m_compileClasspath.addPath( path ); + m_compileClasspath.add( path ); } /** @@ -119,7 +119,7 @@ public class JDependTask } Path path1 = m_sourcesPath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } @@ -169,7 +169,7 @@ public class JDependTask exe.setJvm( m_jvm ); } - exe.getClassPath().addPath( m_compileClasspath ); + exe.getClassPath().add( m_compileClasspath ); if( m_outputFile != null ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java index df2a1c0eb..5405f6e8a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java @@ -107,7 +107,7 @@ public class JspC extends MatchingTask } else { - classpath.addPath( cp ); + classpath.add( cp ); } } @@ -185,7 +185,7 @@ public class JspC extends MatchingTask } else { - src.addPath( srcDir ); + src.add( srcDir ); } } @@ -308,7 +308,7 @@ public class JspC extends MatchingTask } Path path1 = classpath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java index a08387adc..58f9a23ae 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java @@ -82,7 +82,7 @@ public class WLJspc extends MatchingTask } else { - compileClasspath.addPath( classpath ); + compileClasspath.add( classpath ); } } @@ -219,7 +219,7 @@ public class WLJspc extends MatchingTask ExecuteJava helperTask = new ExecuteJava(); helperTask.setClassName( "weblogic.jspc" ); helperTask.getArguments().addArguments( args ); - helperTask.getClassPath().addPath( compileClasspath ); + helperTask.getClassPath().add( compileClasspath ); helperTask.executeForked( getContext() ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java index b2ffc8b33..3d3306e70 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java @@ -331,7 +331,7 @@ public class JUnitTask extends AbstractTask */ public void addClasspath( final Path path ) { - classPath.addPath( path ); + classPath.add( path ); } /** @@ -567,7 +567,7 @@ public class JUnitTask extends AbstractTask cmd.setIgnoreReturnCode( true ); cmd.setWorkingDirectory( dir ); cmd.setMaxMemory( maxMem ); - cmd.getClassPath().addPath( classPath ); + cmd.getClassPath().add( classPath ); cmd.getVmArguments().addArguments( vmArgs ); cmd.getSysProperties().addVariables( sysProperties ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java index 3a6ba6541..578da0780 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java @@ -128,7 +128,7 @@ public abstract class AbstractMetamataTask */ public void addClasspath( final Path path ) { - m_exe.getClassPath().addPath( path ); + m_exe.getClassPath().add( path ); } /** @@ -144,7 +144,7 @@ public abstract class AbstractMetamataTask */ public void addSourcepath( final Path path ) { - m_sourcePath.addPath( path ); + m_sourcePath.add( path ); } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java index ee89eb045..98077d49f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java @@ -124,10 +124,10 @@ public class MAudit // there is a bug in Metamata 2.0 build 37. The sourcepath argument does // not work. So we will use the sourcepath prepended to classpath. (order // is important since Metamata looks at .class and .java) - classpath.addPath( getSourcePath() ); + classpath.add( getSourcePath() ); // don't forget to modify the pattern if you change the options reporting - classpath.addPath( getClassPath() ); + classpath.add( getClassPath() ); final String formattedClasspath = PathUtil.formatPath( classpath, getContext() ); if( formattedClasspath.length() > 0 ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java index f4fcc59f8..1000f671b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java @@ -127,10 +127,10 @@ public class MMetrics extends AbstractMetamataTask // there is a bug in Metamata 2.0 build 37. The sourcepath argument does // not work. So we will use the sourcepath prepended to classpath. (order // is important since Metamata looks at .class and .java) - classpath.addPath( getSourcePath() ); + classpath.add( getSourcePath() ); // don't forget to modify the pattern if you change the options reporting - classpath.addPath( getClassPath() ); + classpath.add( getClassPath() ); final String formattedClasspath = PathUtil.formatPath( classpath, getContext() ); if( formattedClasspath.length() > 0 ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java index 51174a3a2..709191833 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java @@ -132,7 +132,7 @@ public class MParse */ public void addClasspath( final Path path ) { - m_classpath.addPath( path ); + m_classpath.add( path ); } /** @@ -148,7 +148,7 @@ public class MParse */ public void addSourcepath( final Path path ) { - m_sourcepath.addPath( path ); + m_sourcepath.add( path ); } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java index 06d03df80..eb18b2872 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java @@ -195,7 +195,7 @@ public abstract class DefaultRmicAdapter // add the classpath if( attributes.getClasspath() != null ) { - classpath.addPath( attributes.getClasspath() ); + classpath.add( attributes.getClasspath() ); } return classpath; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java index ff5982efe..053c6fb24 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java @@ -116,7 +116,7 @@ public class Rmic extends MatchingTask } else { - compileClasspath.addPath( classpath ); + compileClasspath.add( classpath ); } } @@ -145,7 +145,7 @@ public class Rmic extends MatchingTask } else { - this.extdirs.addPath( extdirs ); + this.extdirs.add( extdirs ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java index 0aba98b9f..32512ff14 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java @@ -206,7 +206,7 @@ public class CovReport } Path path1 = coveragePath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } @@ -227,7 +227,7 @@ public class CovReport } Path path1 = sourcePath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } @@ -292,7 +292,7 @@ public class CovReport sourcePath = new Path(); Path path1 = sourcePath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); path.setLocation( getBaseDirectory() ); } v.add( "-sourcepath=" + sourcePath ); @@ -368,7 +368,7 @@ public class CovReport } Path path1 = classPath; final Path path = new Path(); - path1.addPath( path ); + path1.add( path ); return path; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java index 64d46df1c..ad0781128 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java @@ -184,7 +184,7 @@ public class Coverage */ public void setClasspath( final Path path ) { - m_classpath.addPath( path ); + m_classpath.add( path ); } public Filters createFilters()