donaldp 01/12/30 02:47:00
Modified: proposal/myrmidon/src/main/org/apache/tools/ant
DirectoryScanner.java TaskAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
AntStructure.java Echo.java ExecuteJava.java
GenerateKey.java Java.java Javac.java Patch.java
RecorderEntry.java SignJar.java Touch.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java Javac12.java Jikes.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
ExecTask.java Execute.java LogOutputStream.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file
Copy.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
Javadoc.java JavadocOutputStream.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
ANTLR.java Javah.java PropertyFile.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
Continuus.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.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/compilers
DefaultCompilerAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
BriefJUnitResultFormatter.java
SummaryJUnitResultFormatter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
MAudit.java MMetrics.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovMerge.java CovReport.java Coverage.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic
SunRmic.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text
FixCRLF.java Replace.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
Rpm.java
proposal/myrmidon/src/main/org/apache/tools/ant/types
Commandline.java FilterSet.java ZipScanner.java
proposal/myrmidon/src/main/org/apache/tools/ant/util
FileUtils.java
Log:
Restyled.
Revision Changes Path
1.6 +190 -117
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectoryScanner.java 23 Dec 2001 06:34:49 -0000 1.5
+++ DirectoryScanner.java 30 Dec 2001 10:46:57 -0000 1.6
@@ -88,97 +88,91 @@
* @author Arnout J. Kuiper <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Magesh Umasankar</a>
*/
-public class DirectoryScanner implements FileScanner
+public class DirectoryScanner
+ implements FileScanner
{
-
/**
* Patterns that should be excluded by default.
*
* @see #addDefaultExcludes()
*/
- protected final static String[] DEFAULTEXCLUDES = {
- "**/*~",
- "**/#*#",
- "**/.#*",
- "**/%*%",
- "**/CVS",
- "**/CVS/**",
- "**/.cvsignore",
- "**/SCCS",
- "**/SCCS/**",
- "**/vssver.scc"
- };
+ private final static String[] DEFAULTEXCLUDES =
+ {
+ "**/*~",
+ "**/#*#",
+ "**/.#*",
+ "**/%*%",
+ "**/CVS",
+ "**/CVS/**",
+ "**/.cvsignore",
+ "**/SCCS",
+ "**/SCCS/**",
+ "**/vssver.scc"
+ };
/**
* Have the ArrayLists holding our results been built by a slow scan?
*/
- protected boolean haveSlowResults = false;
+ private boolean m_haveSlowResults;
/**
* Should the file system be treated as a case sensitive one?
*/
- protected boolean isCaseSensitive = true;
+ private boolean m_isCaseSensitive = true;
/**
* Is everything we've seen so far included?
*/
- protected boolean everythingIncluded = true;
+ private boolean m_everythingIncluded = true;
/**
* The base directory which should be scanned.
*/
- protected File basedir;
+ private File m_basedir;
/**
* The files that where found and matched at least one includes, and also
* matched at least one excludes.
*/
- protected ArrayList dirsExcluded;
+ private ArrayList m_dirsExcluded;
/**
* The directories that where found and matched at least one includes,
and
* matched no excludes.
*/
- protected ArrayList dirsIncluded;
+ private ArrayList m_dirsIncluded;
/**
* The directories that where found and did not match any includes.
*/
- protected ArrayList dirsNotIncluded;
+ private ArrayList m_dirsNotIncluded;
/**
* The patterns for the files that should be excluded.
*/
- protected String[] excludes;
+ private String[] m_excludes;
/**
* The files that where found and matched at least one includes, and also
* matched at least one excludes.
*/
- protected ArrayList filesExcluded;
+ private ArrayList m_filesExcluded;
/**
* The files that where found and matched at least one includes, and
matched
* no excludes.
*/
- protected ArrayList filesIncluded;
+ private ArrayList m_filesIncluded;
/**
* The files that where found and did not match any includes.
*/
- protected ArrayList filesNotIncluded;
+ private ArrayList m_filesNotIncluded;
/**
* The patterns for the files that should be included.
*/
- protected String[] includes;
-
- /**
- * Constructor.
- */
- public DirectoryScanner()
- {
- }
+ private String[] m_includes;
/**
* Matches a string against a pattern. The pattern contains two special
@@ -190,7 +184,7 @@
* @return <code>true</code> when the string matches against the pattern,
* <code>false</code> otherwise.
*/
- public static boolean match( String pattern, String str )
+ public static boolean match( final String pattern, final String str )
{
return match( pattern, str, true );
}
@@ -206,7 +200,9 @@
* @return <code>true</code> when the string matches against the pattern,
* <code>false</code> otherwise.
*/
- protected static boolean match( String pattern, String str, boolean
isCaseSensitive )
+ protected static boolean match( final String pattern,
+ final String str,
+ final boolean isCaseSensitive )
{
char[] patArr = pattern.toCharArray();
char[] strArr = str.toCharArray();
@@ -398,7 +394,7 @@
* @return <code>true</code> when the pattern matches against the string.
* <code>false</code> otherwise.
*/
- protected static boolean matchPath( String pattern, String str )
+ protected static boolean matchPath( final String pattern, final String
str )
{
return matchPath( pattern, str, true );
}
@@ -412,7 +408,9 @@
* @return <code>true</code> when the pattern matches against the string.
* <code>false</code> otherwise.
*/
- protected static boolean matchPath( String pattern, String str, boolean
isCaseSensitive )
+ protected static boolean matchPath( final String pattern,
+ final String str,
+ final boolean isCaseSensitive )
{
// When str starts with a File.separator, pattern has to start with a
// File.separator.
@@ -578,7 +576,7 @@
* @param str the (non-null) string (path) to match
* @return Description of the Returned Value
*/
- protected static boolean matchPatternStart( String pattern, String str )
+ protected static boolean matchPatternStart( final String pattern, final
String str )
{
return matchPatternStart( pattern, str, true );
}
@@ -596,8 +594,9 @@
* @param isCaseSensitive must matches be case sensitive?
* @return Description of the Returned Value
*/
- protected static boolean matchPatternStart( String pattern, String str,
- boolean isCaseSensitive )
+ protected static boolean matchPatternStart( final String pattern,
+ final String str,
+ final boolean
isCaseSensitive )
{
// When str starts with a File.separator, pattern has to start with a
// File.separator.
@@ -669,7 +668,7 @@
*
* @param basedir the (non-null) basedir for scanning
*/
- public void setBasedir( String basedir )
+ public void setBasedir( final String basedir )
{
setBasedir( new File( basedir.replace( '/', File.separatorChar
).replace( '\\', File.separatorChar ) ) );
}
@@ -680,9 +679,9 @@
*
* @param basedir the basedir for scanning
*/
- public void setBasedir( File basedir )
+ public void setBasedir( final File basedir )
{
- this.basedir = basedir;
+ m_basedir = basedir;
}
/**
@@ -690,9 +689,9 @@
*
* @param isCaseSensitive The new CaseSensitive value
*/
- public void setCaseSensitive( boolean isCaseSensitive )
+ public void setCaseSensitive( final boolean isCaseSensitive )
{
- this.isCaseSensitive = isCaseSensitive;
+ m_isCaseSensitive = isCaseSensitive;
}
/**
@@ -704,15 +703,15 @@
*
* @param excludes list of exclude patterns
*/
- public void setExcludes( String[] excludes )
+ public void setExcludes( final String[] excludes )
{
if( excludes == null )
{
- this.excludes = null;
+ m_excludes = null;
}
else
{
- this.excludes = new String[ excludes.length ];
+ m_excludes = new String[ excludes.length ];
for( int i = 0; i < excludes.length; i++ )
{
String pattern;
@@ -721,7 +720,7 @@
{
pattern += "**";
}
- this.excludes[ i ] = pattern;
+ m_excludes[ i ] = pattern;
}
}
}
@@ -735,15 +734,15 @@
*
* @param includes list of include patterns
*/
- public void setIncludes( String[] includes )
+ public void setIncludes( final String[] includes )
{
if( includes == null )
{
- this.includes = null;
+ m_includes = null;
}
else
{
- this.includes = new String[ includes.length ];
+ m_includes = new String[ includes.length ];
for( int i = 0; i < includes.length; i++ )
{
String pattern;
@@ -752,7 +751,7 @@
{
pattern += "**";
}
- this.includes[ i ] = pattern;
+ m_includes[ i ] = pattern;
}
}
}
@@ -765,7 +764,7 @@
*/
public File getBasedir()
{
- return basedir;
+ return m_basedir;
}
/**
@@ -779,11 +778,11 @@
throws TaskException
{
slowScan();
- int count = dirsExcluded.size();
+ int count = m_dirsExcluded.size();
String[] directories = new String[ count ];
for( int i = 0; i < count; i++ )
{
- directories[ i ] = (String)dirsExcluded.get( i );
+ directories[ i ] = (String)m_dirsExcluded.get( i );
}
return directories;
}
@@ -799,11 +798,11 @@
throws TaskException
{
slowScan();
- int count = filesExcluded.size();
+ int count = m_filesExcluded.size();
String[] files = new String[ count ];
for( int i = 0; i < count; i++ )
{
- files[ i ] = (String)filesExcluded.get( i );
+ files[ i ] = (String)m_filesExcluded.get( i );
}
return files;
}
@@ -817,11 +816,11 @@
*/
public String[] getIncludedDirectories()
{
- int count = dirsIncluded.size();
+ int count = m_dirsIncluded.size();
String[] directories = new String[ count ];
for( int i = 0; i < count; i++ )
{
- directories[ i ] = (String)dirsIncluded.get( i );
+ directories[ i ] = (String)m_dirsIncluded.get( i );
}
return directories;
}
@@ -835,11 +834,11 @@
*/
public String[] getIncludedFiles()
{
- int count = filesIncluded.size();
+ int count = m_filesIncluded.size();
String[] files = new String[ count ];
for( int i = 0; i < count; i++ )
{
- files[ i ] = (String)filesIncluded.get( i );
+ files[ i ] = (String)m_filesIncluded.get( i );
}
return files;
}
@@ -854,11 +853,11 @@
throws TaskException
{
slowScan();
- int count = dirsNotIncluded.size();
+ int count = m_dirsNotIncluded.size();
String[] directories = new String[ count ];
for( int i = 0; i < count; i++ )
{
- directories[ i ] = (String)dirsNotIncluded.get( i );
+ directories[ i ] = (String)m_dirsNotIncluded.get( i );
}
return directories;
}
@@ -873,11 +872,11 @@
throws TaskException
{
slowScan();
- int count = filesNotIncluded.size();
+ int count = m_filesNotIncluded.size();
String[] files = new String[ count ];
for( int i = 0; i < count; i++ )
{
- files[ i ] = (String)filesNotIncluded.get( i );
+ files[ i ] = (String)m_filesNotIncluded.get( i );
}
return files;
}
@@ -891,7 +890,7 @@
*/
public boolean isEverythingIncluded()
{
- return everythingIncluded;
+ return m_everythingIncluded;
}
/**
@@ -899,18 +898,18 @@
*/
public void addDefaultExcludes()
{
- int excludesLength = excludes == null ? 0 : excludes.length;
+ int excludesLength = m_excludes == null ? 0 : m_excludes.length;
String[] newExcludes;
newExcludes = new String[ excludesLength + DEFAULTEXCLUDES.length ];
if( excludesLength > 0 )
{
- System.arraycopy( excludes, 0, newExcludes, 0, excludesLength );
+ System.arraycopy( m_excludes, 0, newExcludes, 0, excludesLength
);
}
for( int i = 0; i < DEFAULTEXCLUDES.length; i++ )
{
newExcludes[ i + excludesLength ] = DEFAULTEXCLUDES[ i
].replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
}
- excludes = newExcludes;
+ m_excludes = newExcludes;
}
/**
@@ -921,55 +920,55 @@
public void scan()
throws TaskException
{
- if( basedir == null )
+ if( m_basedir == null )
{
throw new IllegalStateException( "No basedir set" );
}
- if( !basedir.exists() )
+ if( !m_basedir.exists() )
{
- throw new IllegalStateException( "basedir " + basedir
+ throw new IllegalStateException( "basedir " + m_basedir
+ " does not exist" );
}
- if( !basedir.isDirectory() )
+ if( !m_basedir.isDirectory() )
{
- throw new IllegalStateException( "basedir " + basedir
+ throw new IllegalStateException( "basedir " + m_basedir
+ " is not a directory" );
}
- if( includes == null )
+ if( m_includes == null )
{
// No includes supplied, so set it to 'matches all'
- includes = new String[ 1 ];
- includes[ 0 ] = "**";
+ m_includes = new String[ 1 ];
+ m_includes[ 0 ] = "**";
}
- if( excludes == null )
+ if( m_excludes == null )
{
- excludes = new String[ 0 ];
+ m_excludes = new String[ 0 ];
}
- filesIncluded = new ArrayList();
- filesNotIncluded = new ArrayList();
- filesExcluded = new ArrayList();
- dirsIncluded = new ArrayList();
- dirsNotIncluded = new ArrayList();
- dirsExcluded = new ArrayList();
+ m_filesIncluded = new ArrayList();
+ m_filesNotIncluded = new ArrayList();
+ m_filesExcluded = new ArrayList();
+ m_dirsIncluded = new ArrayList();
+ m_dirsNotIncluded = new ArrayList();
+ m_dirsExcluded = new ArrayList();
if( isIncluded( "" ) )
{
if( !isExcluded( "" ) )
{
- dirsIncluded.add( "" );
+ m_dirsIncluded.add( "" );
}
else
{
- dirsExcluded.add( "" );
+ m_dirsExcluded.add( "" );
}
}
else
{
- dirsNotIncluded.add( "" );
+ m_dirsNotIncluded.add( "" );
}
- scandir( basedir, "", true );
+ scandir( m_basedir, "", true );
}
/**
@@ -981,9 +980,9 @@
*/
protected boolean isExcluded( String name )
{
- for( int i = 0; i < excludes.length; i++ )
+ for( int i = 0; i < m_excludes.length; i++ )
{
- if( matchPath( excludes[ i ], name, isCaseSensitive ) )
+ if( matchPath( m_excludes[ i ], name, m_isCaseSensitive ) )
{
return true;
}
@@ -998,11 +997,11 @@
* @return <code>true</code> when the name matches against at least one
* include pattern, <code>false</code> otherwise.
*/
- protected boolean isIncluded( String name )
+ protected boolean isIncluded( final String name )
{
- for( int i = 0; i < includes.length; i++ )
+ for( int i = 0; i < m_includes.length; i++ )
{
- if( matchPath( includes[ i ], name, isCaseSensitive ) )
+ if( matchPath( m_includes[ i ], name, m_isCaseSensitive ) )
{
return true;
}
@@ -1017,11 +1016,11 @@
* @return <code>true</code> when the name matches against at least one
* include pattern, <code>false</code> otherwise.
*/
- protected boolean couldHoldIncluded( String name )
+ protected boolean couldHoldIncluded( final String name )
{
- for( int i = 0; i < includes.length; i++ )
+ for( int i = 0; i < m_includes.length; i++ )
{
- if( matchPatternStart( includes[ i ], name, isCaseSensitive ) )
+ if( matchPatternStart( m_includes[ i ], name, m_isCaseSensitive
) )
{
return true;
}
@@ -1046,7 +1045,7 @@
* @see #dirsNotIncluded
* @see #dirsExcluded
*/
- protected void scandir( File dir, String vpath, boolean fast )
+ protected void scandir( final File dir, final String vpath, final
boolean fast )
throws TaskException
{
String[] newfiles = dir.list();
@@ -1074,7 +1073,7 @@
{
if( !isExcluded( name ) )
{
- dirsIncluded.add( name );
+ m_dirsIncluded.add( name );
if( fast )
{
scandir( file, name + File.separator, fast );
@@ -1082,8 +1081,8 @@
}
else
{
- everythingIncluded = false;
- dirsExcluded.add( name );
+ m_everythingIncluded = false;
+ m_dirsExcluded.add( name );
if( fast && couldHoldIncluded( name ) )
{
scandir( file, name + File.separator, fast );
@@ -1092,8 +1091,8 @@
}
else
{
- everythingIncluded = false;
- dirsNotIncluded.add( name );
+ m_everythingIncluded = false;
+ m_dirsNotIncluded.add( name );
if( fast && couldHoldIncluded( name ) )
{
scandir( file, name + File.separator, fast );
@@ -1110,18 +1109,18 @@
{
if( !isExcluded( name ) )
{
- filesIncluded.add( name );
+ m_filesIncluded.add( name );
}
else
{
- everythingIncluded = false;
- filesExcluded.add( name );
+ m_everythingIncluded = false;
+ m_filesExcluded.add( name );
}
}
else
{
- everythingIncluded = false;
- filesNotIncluded.add( name );
+ m_everythingIncluded = false;
+ m_filesNotIncluded.add( name );
}
}
}
@@ -1135,22 +1134,22 @@
protected void slowScan()
throws TaskException
{
- if( haveSlowResults )
+ if( m_haveSlowResults )
{
return;
}
- String[] excl = new String[ dirsExcluded.size() ];
- excl = (String[])dirsExcluded.toArray( excl );
+ String[] excl = new String[ m_dirsExcluded.size() ];
+ excl = (String[])m_dirsExcluded.toArray( excl );
- String[] notIncl = new String[ dirsNotIncluded.size() ];
- notIncl = (String[])dirsNotIncluded.toArray( notIncl );
+ String[] notIncl = new String[ m_dirsNotIncluded.size() ];
+ notIncl = (String[])m_dirsNotIncluded.toArray( notIncl );
for( int i = 0; i < excl.length; i++ )
{
if( !couldHoldIncluded( excl[ i ] ) )
{
- scandir( new File( basedir, excl[ i ] ),
+ scandir( new File( m_basedir, excl[ i ] ),
excl[ i ] + File.separator, false );
}
}
@@ -1159,12 +1158,86 @@
{
if( !couldHoldIncluded( notIncl[ i ] ) )
{
- scandir( new File( basedir, notIncl[ i ] ),
+ scandir( new File( m_basedir, notIncl[ i ] ),
notIncl[ i ] + File.separator, false );
}
}
- haveSlowResults = true;
+ m_haveSlowResults = true;
+ }
+
+ public static String[] getDEFAULTEXCLUDES()
+ {
+ return DEFAULTEXCLUDES;
+ }
+
+ public ArrayList getDirsExcluded()
+ {
+ return m_dirsExcluded;
+ }
+
+ public void setDirsExcluded( ArrayList dirsExcluded )
+ {
+ m_dirsExcluded = dirsExcluded;
+ }
+
+ public ArrayList getDirsIncluded()
+ {
+ return m_dirsIncluded;
+ }
+
+ public void setDirsIncluded( ArrayList dirsIncluded )
+ {
+ m_dirsIncluded = dirsIncluded;
+ }
+
+ public ArrayList getDirsNotIncluded()
+ {
+ return m_dirsNotIncluded;
}
+ public void setDirsNotIncluded( ArrayList dirsNotIncluded )
+ {
+ m_dirsNotIncluded = dirsNotIncluded;
+ }
+
+ public String[] getExcludes()
+ {
+ return m_excludes;
+ }
+
+ public ArrayList getFilesExcluded()
+ {
+ return m_filesExcluded;
+ }
+
+ public void setFilesExcluded( ArrayList filesExcluded )
+ {
+ m_filesExcluded = filesExcluded;
+ }
+
+ public ArrayList getFilesIncluded()
+ {
+ return m_filesIncluded;
+ }
+
+ public void setFilesIncluded( ArrayList filesIncluded )
+ {
+ m_filesIncluded = filesIncluded;
+ }
+
+ public ArrayList getFilesNotIncluded()
+ {
+ return m_filesNotIncluded;
+ }
+
+ public void setFilesNotIncluded( ArrayList filesNotIncluded )
+ {
+ m_filesNotIncluded = filesNotIncluded;
+ }
+
+ public String[] getIncludes()
+ {
+ return m_includes;
+ }
}
1.10 +2 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TaskAdapter.java 30 Dec 2001 03:30:07 -0000 1.9
+++ TaskAdapter.java 30 Dec 2001 10:46:57 -0000 1.10
@@ -7,8 +7,8 @@
*/
package org.apache.tools.ant;
-import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
/**
@@ -47,7 +47,7 @@
Throwable target = e;
if( e instanceof InvocationTargetException )
{
- target = ((InvocationTargetException)e).getTargetException();
+ target = ( (InvocationTargetException)e
).getTargetException();
}
final String message = "Error invoking " + m_proxy.getClass();
1.10 +1 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AntStructure.java 30 Dec 2001 09:25:50 -0000 1.9
+++ AntStructure.java 30 Dec 2001 10:46:57 -0000 1.10
@@ -18,13 +18,12 @@
import java.util.Hashtable;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
-import org.apache.avalon.excalibur.util.StringUtil;
/**
* Creates a partial DTD for Ant from the currently known tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class AntStructure
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Echo.java 30 Dec 2001 00:38:44 -0000 1.10
+++ Echo.java 30 Dec 2001 10:46:58 -0000 1.11
@@ -76,7 +76,7 @@
{
if( m_file == null )
{
- throw new TaskException( "Echo only used to write to files now
!");
+ throw new TaskException( "Echo only used to write to files now
!" );
}
else
{
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExecuteJava.java 30 Dec 2001 06:46:37 -0000 1.7
+++ ExecuteJava.java 30 Dec 2001 10:46:58 -0000 1.8
@@ -14,7 +14,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.SysProperties;
@@ -22,6 +21,7 @@
* @author [EMAIL PROTECTED]
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*/
+
public class ExecuteJava
{
private Commandline m_javaCommand;
1.15 +0 -1
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- GenerateKey.java 30 Dec 2001 01:14:58 -0000 1.14
+++ GenerateKey.java 30 Dec 2001 10:46:58 -0000 1.15
@@ -10,7 +10,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.ExecTask;
1.18 +0 -1
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Java.java 30 Dec 2001 01:14:58 -0000 1.17
+++ Java.java 30 Dec 2001 10:46:58 -0000 1.18
@@ -13,7 +13,6 @@
import java.io.PrintStream;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.18 +1 -1
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Javac.java 30 Dec 2001 06:14:21 -0000 1.17
+++ Javac.java 30 Dec 2001 10:46:58 -0000 1.18
@@ -10,8 +10,8 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.myrmidon.framework.JavaVersion;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.JavaVersion;
import org.apache.myrmidon.framework.Os;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
1.10 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
Index: Patch.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Patch.java 29 Dec 2001 23:51:04 -0000 1.9
+++ Patch.java 30 Dec 2001 10:46:58 -0000 1.10
@@ -10,7 +10,6 @@
import java.io.File;
import java.io.IOException;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.10 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
Index: RecorderEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RecorderEntry.java 30 Dec 2001 09:15:37 -0000 1.9
+++ RecorderEntry.java 30 Dec 2001 10:46:58 -0000 1.10
@@ -8,9 +8,9 @@
package org.apache.tools.ant.taskdefs;
import java.io.PrintStream;
+import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.listeners.AbstractProjectListener;
import org.apache.tools.ant.Project;
1.12 +0 -1
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SignJar.java 30 Dec 2001 01:14:58 -0000 1.11
+++ SignJar.java 30 Dec 2001 10:46:58 -0000 1.12
@@ -15,7 +15,6 @@
import java.util.zip.ZipFile;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.ExecTask;
import org.apache.tools.ant.types.FileSet;
1.12 +0 -1
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Touch.java 30 Dec 2001 01:14:58 -0000 1.11
+++ Touch.java 30 Dec 2001 10:46:58 -0000 1.12
@@ -16,7 +16,6 @@
import java.util.Locale;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
1.21 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultCompilerAdapter.java 30 Dec 2001 09:25:51 -0000 1.20
+++ DefaultCompilerAdapter.java 30 Dec 2001 10:46:58 -0000 1.21
@@ -11,8 +11,8 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.excalibur.util.StringUtil;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Javac;
1.8 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
Index: Javac12.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Javac12.java 30 Dec 2001 00:21:05 -0000 1.7
+++ Javac12.java 30 Dec 2001 10:46:58 -0000 1.8
@@ -12,7 +12,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
1.8 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Jikes.java 30 Dec 2001 01:16:50 -0000 1.7
+++ Jikes.java 30 Dec 2001 10:46:58 -0000 1.8
@@ -8,7 +8,6 @@
package org.apache.tools.ant.taskdefs.compilers;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
1.14 +1 -2
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExecTask.java 30 Dec 2001 09:25:51 -0000 1.13
+++ ExecTask.java 30 Dec 2001 10:46:58 -0000 1.14
@@ -16,14 +16,13 @@
import java.io.StringReader;
import java.util.Iterator;
import java.util.Properties;
+import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.EnvironmentData;
import org.apache.tools.ant.types.EnvironmentVariable;
-import org.apache.avalon.excalibur.util.StringUtil;
/**
* Executes a given command if the os platform is appropriate.
1.23 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java
Index: Execute.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Execute.java 30 Dec 2001 06:49:51 -0000 1.22
+++ Execute.java 30 Dec 2001 10:46:58 -0000 1.23
@@ -11,14 +11,13 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.Properties;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.framework.exec.impl.DefaultExecManager;
import org.apache.myrmidon.framework.exec.ExecException;
import org.apache.myrmidon.framework.exec.ExecMetaData;
-import org.apache.tools.ant.Project;
+import org.apache.myrmidon.framework.exec.impl.DefaultExecManager;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Commandline;
-import org.apache.avalon.framework.logger.Logger;
/**
* Runs an external program.
1.6 +0 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/LogOutputStream.java
Index: LogOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/LogOutputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LogOutputStream.java 30 Dec 2001 00:03:24 -0000 1.5
+++ LogOutputStream.java 30 Dec 2001 10:46:58 -0000 1.6
@@ -11,8 +11,6 @@
import java.io.IOException;
import java.io.OutputStream;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
/**
* Logs each line written to this stream to the log system of ant. Tries to
be
1.10 +0 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Copy.java 30 Dec 2001 00:11:44 -0000 1.9
+++ Copy.java 30 Dec 2001 10:46:58 -0000 1.10
@@ -16,7 +16,6 @@
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.FilterSet;
1.7 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Javadoc.java 30 Dec 2001 00:50:33 -0000 1.6
+++ Javadoc.java 30 Dec 2001 10:46:58 -0000 1.7
@@ -18,7 +18,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Os;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.types.Commandline;
1.3 +1 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/JavadocOutputStream.java
Index: JavadocOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/JavadocOutputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavadocOutputStream.java 30 Dec 2001 00:00:05 -0000 1.2
+++ JavadocOutputStream.java 30 Dec 2001 10:46:58 -0000 1.3
@@ -7,10 +7,8 @@
*/
package org.apache.tools.ant.taskdefs.javadoc;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
class JavadocOutputStream
extends LogOutputStream
1.15 +0 -1
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ANTLR.java 29 Dec 2001 23:52:48 -0000 1.14
+++ ANTLR.java 30 Dec 2001 10:46:58 -0000 1.15
@@ -13,7 +13,6 @@
import java.io.IOException;
import java.net.URL;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.ExecuteJava;
import org.apache.tools.ant.taskdefs.exec.Execute;
1.15 +2 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Javah.java 30 Dec 2001 09:25:51 -0000 1.14
+++ Javah.java 30 Dec 2001 10:46:58 -0000 1.15
@@ -11,14 +11,13 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.StringTokenizer;
+import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.JavaVersion;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-import org.apache.avalon.excalibur.util.StringUtil;
/**
* Task to generate JNI header files using javah. This task can take the
@@ -267,7 +266,7 @@
String compiler = getProject().getProperty( "build.compiler" );
if( compiler == null )
{
- if( JavaVersion.JAVA1_2 != JavaVersion.getCurrentJavaVersion() )
+ if( JavaVersion.JAVA1_2 != JavaVersion.getCurrentJavaVersion() )
{
compiler = "modern";
}
1.9 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
Index: PropertyFile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PropertyFile.java 30 Dec 2001 09:25:51 -0000 1.8
+++ PropertyFile.java 30 Dec 2001 10:46:58 -0000 1.9
@@ -29,7 +29,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.avalon.excalibur.util.StringUtil;
/**
* PropertyFile task uses java.util.Properties to modify integer, String and
1.14 +2 -3
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Continuus.java 30 Dec 2001 01:04:35 -0000 1.13
+++ Continuus.java 30 Dec 2001 10:46:58 -0000 1.14
@@ -7,15 +7,14 @@
*/
package org.apache.tools.ant.taskdefs.optional.ccm;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
-import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
/**
1.15 +0 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JJTree.java 29 Dec 2001 23:53:28 -0000 1.14
+++ JJTree.java 30 Dec 2001 10:46:59 -0000 1.15
@@ -12,7 +12,6 @@
import java.util.Enumeration;
import java.util.Hashtable;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.14 +0 -1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JDependTask.java 29 Dec 2001 23:55:44 -0000 1.13
+++ JDependTask.java 30 Dec 2001 10:46:59 -0000 1.14
@@ -13,7 +13,6 @@
import java.io.PrintWriter;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.PathTokenizer;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultCompilerAdapter.java 30 Dec 2001 09:25:51 -0000 1.7
+++ DefaultCompilerAdapter.java 30 Dec 2001 10:46:59 -0000 1.8
@@ -9,8 +9,8 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.excalibur.util.StringUtil;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
import org.apache.tools.ant.types.Commandline;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
Index: BriefJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BriefJUnitResultFormatter.java 30 Dec 2001 09:25:51 -0000 1.4
+++ BriefJUnitResultFormatter.java 30 Dec 2001 10:46:59 -0000 1.5
@@ -9,8 +9,8 @@
import junit.framework.AssertionFailedError;
import junit.framework.Test;
-import org.apache.myrmidon.api.TaskException;
import org.apache.avalon.excalibur.util.StringUtil;
+import org.apache.myrmidon.api.TaskException;
/**
* Prints plain text output of the test to a specified Writer. Inspired by
the
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
Index: SummaryJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SummaryJUnitResultFormatter.java 30 Dec 2001 09:25:51 -0000 1.4
+++ SummaryJUnitResultFormatter.java 30 Dec 2001 10:46:59 -0000 1.5
@@ -12,8 +12,8 @@
import java.text.NumberFormat;
import junit.framework.AssertionFailedError;
import junit.framework.Test;
-import org.apache.myrmidon.api.TaskException;
import org.apache.avalon.excalibur.util.StringUtil;
+import org.apache.myrmidon.api.TaskException;
/**
* Prints short summary output of the test to Ant's logging system.
1.11 +0 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MAudit.java 29 Dec 2001 23:57:18 -0000 1.10
+++ MAudit.java 30 Dec 2001 10:46:59 -0000 1.11
@@ -13,7 +13,6 @@
import java.io.OutputStream;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Path;
1.9 +0 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MMetrics.java 29 Dec 2001 23:57:18 -0000 1.8
+++ MMetrics.java 30 Dec 2001 10:46:59 -0000 1.9
@@ -13,7 +13,6 @@
import java.io.IOException;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.11 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CovMerge.java 29 Dec 2001 23:58:35 -0000 1.10
+++ CovMerge.java 30 Dec 2001 10:46:59 -0000 1.11
@@ -15,7 +15,6 @@
import java.util.Random;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.13 +0 -1
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CovReport.java 29 Dec 2001 23:58:22 -0000 1.12
+++ CovReport.java 30 Dec 2001 10:46:59 -0000 1.13
@@ -18,7 +18,6 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.13 +4 -5
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Coverage.java 29 Dec 2001 23:58:02 -0000 1.12
+++ Coverage.java 30 Dec 2001 10:46:59 -0000 1.13
@@ -16,11 +16,10 @@
import java.util.ArrayList;
import java.util.Random;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
@@ -295,9 +294,9 @@
cmdl.createArgument().setValue( "-jp_input=" +
paramfile.getAbsolutePath() );
// use the custom handler for stdin issues
- final LogOutputStream output = new LogOutputStream(
getLogger(), false );
- final LogOutputStream error = new LogOutputStream( getLogger(), true
);
- final LogStreamHandler handler = new CoverageStreamHandler( output,
error );
+ final LogOutputStream output = new LogOutputStream( getLogger(),
false );
+ final LogOutputStream error = new LogOutputStream( getLogger(),
true );
+ final LogStreamHandler handler = new CoverageStreamHandler(
output, error );
Execute exec = new Execute( handler );
getLogger().debug( cmdl.toString() );
exec.setCommandline( cmdl.getCommandline() );
1.15 +1 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MSVSS.java 30 Dec 2001 01:04:35 -0000 1.14
+++ MSVSS.java 30 Dec 2001 10:46:59 -0000 1.15
@@ -7,11 +7,10 @@
*/
package org.apache.tools.ant.taskdefs.optional.vss;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.util.Properties;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.8 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
Index: SunRmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SunRmic.java 29 Dec 2001 23:51:45 -0000 1.7
+++ SunRmic.java 30 Dec 2001 10:46:59 -0000 1.8
@@ -12,7 +12,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
1.2 +3 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FixCRLF.java 30 Dec 2001 09:58:25 -0000 1.1
+++ FixCRLF.java 30 Dec 2001 10:46:59 -0000 1.2
@@ -7,6 +7,7 @@
*/
package org.apache.tools.ant.taskdefs.text;
+import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -15,19 +16,17 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
-import java.io.InputStream;
-import java.io.BufferedInputStream;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.util.FileUtils;
/**
* Task to convert text source files to local OS formatting conventions, as
well
@@ -68,7 +67,7 @@
*
* @author Sam Ruby <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
- * @version $Revision: 1.1 $ $Name: $
+ * @version $Revision: 1.2 $ $Name: $
*/
public class FixCRLF
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java
Index: Replace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Replace.java 30 Dec 2001 09:58:25 -0000 1.1
+++ Replace.java 30 Dec 2001 10:46:59 -0000 1.2
@@ -22,10 +22,10 @@
import java.io.Writer;
import java.util.ArrayList;
import java.util.Properties;
+import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.avalon.excalibur.util.StringUtil;
/**
* Replaces all occurrences of one or more string tokens with given values in
1.5 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java
Index: Rpm.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Rpm.java 29 Dec 2001 23:50:34 -0000 1.4
+++ Rpm.java 30 Dec 2001 10:46:59 -0000 1.5
@@ -14,7 +14,6 @@
import java.io.OutputStream;
import java.io.PrintStream;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
1.8 +0 -19
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java
Index: Commandline.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Commandline.java 23 Dec 2001 06:32:47 -0000 1.7
+++ Commandline.java 30 Dec 2001 10:46:59 -0000 1.8
@@ -38,25 +38,6 @@
protected final ArrayList m_arguments = new ArrayList();
private String m_executable;
- public Commandline( String to_process )
- throws TaskException
- {
- String[] tmp = translateCommandline( to_process );
- if( tmp != null && tmp.length > 0 )
- {
- setExecutable( tmp[ 0 ] );
- for( int i = 1; i < tmp.length; i++ )
- {
- createArgument().setValue( tmp[ i ] );
- }
- }
- }
-
- public Commandline()
- {
- super();
- }
-
/**
* Put quotes around the given String if necessary. <p>
*
1.8 +3 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java
Index: FilterSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FilterSet.java 23 Dec 2001 14:23:47 -0000 1.7
+++ FilterSet.java 30 Dec 2001 10:46:59 -0000 1.8
@@ -24,7 +24,9 @@
* @author <A href="mailto:[EMAIL PROTECTED]"> Michael McCallum </A>
* @created 14 March 2001
*/
-public class FilterSet extends DataType implements Cloneable
+public class FilterSet
+ extends DataType
+ implements Cloneable
{
/**
1.4 +12 -13
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java
Index: ZipScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ZipScanner.java 23 Dec 2001 06:32:48 -0000 1.3
+++ ZipScanner.java 30 Dec 2001 10:46:59 -0000 1.4
@@ -21,13 +21,13 @@
*
* @author Don Ferguson <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
*/
-public class ZipScanner extends DirectoryScanner
+public class ZipScanner
+ extends DirectoryScanner
{
-
/**
* The zip file which should be scanned.
*/
- protected File srcFile;
+ private File m_srcFile;
/**
* Sets the srcFile for scanning. This is the jar or zip file that is
@@ -37,7 +37,7 @@
*/
public void setSrc( File srcFile )
{
- this.srcFile = srcFile;
+ this.m_srcFile = srcFile;
}
/**
@@ -60,7 +60,7 @@
public String[] getIncludedFiles()
{
String[] result = new String[ 1 ];
- result[ 0 ] = srcFile.getAbsolutePath();
+ result[ 0 ] = m_srcFile.getAbsolutePath();
return result;
}
@@ -69,15 +69,15 @@
*/
public void init()
{
- if( includes == null )
+ if( getIncludes() == null )
{
// No includes supplied, so set it to 'matches all'
- includes = new String[ 1 ];
- includes[ 0 ] = "**";
+ setIncludes( new String[ 1 ] );
+ getIncludes()[ 0 ] = "**";
}
- if( excludes == null )
+ if( getExcludes() == null )
{
- excludes = new String[ 0 ];
+ setExcludes( new String[ 0 ] );
}
}
@@ -91,9 +91,8 @@
*/
public boolean match( String path )
{
- String vpath = path.replace( '/', File.separatorChar ).
- replace( '\\', File.separatorChar );
+ final String vpath =
+ path.replace( '/', File.separatorChar ).replace( '\\',
File.separatorChar );
return isIncluded( vpath ) && !isExcluded( vpath );
}
-
}
1.11 +1 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileUtils.java 29 Dec 2001 23:48:36 -0000 1.10
+++ FileUtils.java 30 Dec 2001 10:46:59 -0000 1.11
@@ -7,7 +7,6 @@
*/
package org.apache.tools.ant.util;
-import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -16,7 +15,6 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Stack;
import java.util.StringTokenizer;
import org.apache.myrmidon.api.TaskException;
@@ -30,7 +28,7 @@
* @author [EMAIL PROTECTED]
* @author <a href="mailto:[EMAIL PROTECTED]">Conor MacNeill</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class FileUtils
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
