donaldp 02/02/06 05:38:23
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Available.java Checksum.java ConditionTask.java
DependSet.java ExecuteJava.java Get.java Input.java
Java.java Javac.java PathConvert.java Property.java
Recorder.java Rmic.java SQLExec.java Tstamp.java
UpToDate.java WaitFor.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive
Ear.java Jar.java Tar.java War.java Zip.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java Jikes.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
ExecTask.java ExecuteOn.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file
Move.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
Javadoc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic
DefaultRmicAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text
Native2Ascii.java Replace.java ReplaceRegExp.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
Chmod.java Rpm.java
Log:
Style touchups
Revision Changes Path
1.21 +2 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
Index: Available.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Available.java 3 Feb 2002 03:46:54 -0000 1.20
+++ Available.java 6 Feb 2002 13:38:20 -0000 1.21
@@ -11,10 +11,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.condition.Condition;
-
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PathUtil;
@@ -55,13 +53,13 @@
public void addClasspath( Path classpath )
throws TaskException
{
- if ( m_classpath == null )
+ if( m_classpath == null )
{
m_classpath = classpath;
}
else
{
- m_classpath.addPath(classpath);
+ m_classpath.addPath( classpath );
}
}
1.17 +1 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Index: Checksum.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Checksum.java 3 Feb 2002 03:46:54 -0000 1.16
+++ Checksum.java 6 Feb 2002 13:38:20 -0000 1.17
@@ -11,9 +11,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.InputStreamReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.security.DigestInputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -23,7 +23,6 @@
import java.util.Hashtable;
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.taskdefs.condition.Condition;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
@@ -284,7 +283,6 @@
fis = new FileInputStream( src );
final byte[] fileDigest = buildDigest( fis );
IOUtil.shutdownStream( fis );
-
String checksum = "";
for( int i = 0; i < fileDigest.length; i++ )
1.7 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
Index: ConditionTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConditionTask.java 3 Feb 2002 03:46:54 -0000 1.6
+++ ConditionTask.java 6 Feb 2002 13:38:20 -0000 1.7
@@ -8,7 +8,6 @@
package org.apache.tools.ant.taskdefs;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.taskdefs.condition.Condition;
import org.apache.tools.ant.taskdefs.condition.ConditionBase;
@@ -22,7 +21,7 @@
* This task does not extend Task to take advantage of ConditionBase.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class ConditionTask extends ConditionBase
{
1.13 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
Index: DependSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DependSet.java 26 Jan 2002 02:08:10 -0000 1.12
+++ DependSet.java 6 Feb 2002 13:38:20 -0000 1.13
@@ -11,8 +11,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
-import org.apache.myrmidon.api.TaskException;
import org.apache.aut.nativelib.Os;
+import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileList;
import org.apache.tools.ant.types.FileSet;
@@ -60,7 +60,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Craeg Strong</a>
- * @version $Revision: 1.12 $ $Date: 2002/01/26 02:08:10 $
+ * @version $Revision: 1.13 $ $Date: 2002/02/06 13:38:20 $
*/
public class DependSet extends MatchingTask
{
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExecuteJava.java 22 Jan 2002 12:14:08 -0000 1.11
+++ ExecuteJava.java 6 Feb 2002 13:38:20 -0000 1.12
@@ -14,8 +14,8 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.SysProperties;
import org.apache.tools.ant.types.PathUtil;
+import org.apache.tools.ant.types.SysProperties;
/*
* @author [EMAIL PROTECTED]
1.15 +8 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Get.java 20 Jan 2002 17:35:00 -0000 1.14
+++ Get.java 6 Feb 2002 13:38:20 -0000 1.15
@@ -239,7 +239,8 @@
if( is == null )
{
getLogger().info( "Can't get " + source + " to " + dest );
- if( ignoreErrors ) {
+ if( ignoreErrors )
+ {
return;
}
throw new TaskException( "Can't get " + source + " to " +
dest );
@@ -251,11 +252,13 @@
while( ( length = is.read( buffer ) ) >= 0 )
{
fos.write( buffer, 0, length );
- if( verbose ) {
+ if( verbose )
+ {
System.out.print( "." );
}
}
- if( verbose ) {
+ if( verbose )
+ {
System.out.println();
}
fos.close();
@@ -282,7 +285,8 @@
catch( IOException ioe )
{
getLogger().info( "Error getting " + source + " to " + dest );
- if( ignoreErrors ) {
+ if( ignoreErrors )
+ {
return;
}
throw new TaskException( "Error", ioe );
1.14 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Input.java 3 Feb 2002 03:46:54 -0000 1.13
+++ Input.java 6 Feb 2002 13:38:20 -0000 1.14
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import java.util.StringTokenizer;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.Task;
/**
1.28 +1 -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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Java.java 3 Feb 2002 10:26:20 -0000 1.27
+++ Java.java 6 Feb 2002 13:38:20 -0000 1.28
@@ -11,6 +11,7 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.taskdefs.exec.Execute2;
@@ -19,7 +20,6 @@
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.EnvironmentVariable;
import org.apache.tools.ant.types.Path;
-import org.apache.aut.nativelib.ExecManager;
/**
* This task acts as a loader for java applications but allows to use the
same
1.27 +3 -3
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Javac.java 20 Jan 2002 02:36:20 -0000 1.26
+++ Javac.java 6 Feb 2002 13:38:20 -0000 1.27
@@ -10,16 +10,16 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.JavaVersion;
-import org.apache.aut.nativelib.Os;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
import org.apache.tools.ant.types.Argument;
+import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.mappers.GlobPatternMapper;
import org.apache.tools.ant.types.SourceFileScanner;
+import org.apache.tools.ant.util.mappers.GlobPatternMapper;
/**
* Task to compile Java source files. This task can take the following
1.15 +8 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PathConvert.java 3 Feb 2002 03:46:54 -0000 1.14
+++ PathConvert.java 6 Feb 2002 13:38:20 -0000 1.15
@@ -10,7 +10,6 @@
import java.io.File;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
@@ -150,7 +149,8 @@
elem = elem.replace( fromDirSep, toDirSep );
- if( i != 0 ) {
+ if( i != 0 )
+ {
rslt.append( m_pathSep );
}
rslt.append( elem );
@@ -212,17 +212,20 @@
throws TaskException
{
- if( m_path == null ) {
+ if( m_path == null )
+ {
throw new TaskException( "You must specify a path to convert" );
}
- if( m_property == null ) {
+ if( m_property == null )
+ {
throw new TaskException( "You must specify a property" );
}
// Must either have a target OS or both a dirSep and pathSep
- if( m_targetOS == null && m_pathSep == null && m_dirSep == null ) {
+ if( m_targetOS == null && m_pathSep == null && m_dirSep == null )
+ {
throw new TaskException( "You must specify at least one of
targetOS, dirSep, or pathSep" );
}
1.29 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Property.java 3 Feb 2002 03:46:54 -0000 1.28
+++ Property.java 6 Feb 2002 13:38:20 -0000 1.29
@@ -15,7 +15,6 @@
import java.util.Iterator;
import java.util.Properties;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PathUtil;
@@ -82,7 +81,8 @@
getContext().setProperty( name, value );
}
- if( m_resource != null ) {
+ if( m_resource != null )
+ {
loadResource( m_resource );
}
}
1.10 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java
Index: Recorder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Recorder.java 13 Jan 2002 04:51:51 -0000 1.9
+++ Recorder.java 6 Feb 2002 13:38:20 -0000 1.10
@@ -13,9 +13,9 @@
import java.io.PrintStream;
import java.util.Hashtable;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.LogLevel;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-import org.apache.myrmidon.framework.LogLevel;
/**
* This task is the manager for RecorderEntry's. It is this class that holds
all
1.26 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Rmic.java 20 Jan 2002 09:54:08 -0000 1.25
+++ Rmic.java 6 Feb 2002 13:38:20 -0000 1.26
@@ -9,19 +9,19 @@
import java.io.File;
import java.io.IOException;
-import java.net.URLClassLoader;
import java.net.URL;
+import java.net.URLClassLoader;
import java.rmi.Remote;
import java.util.ArrayList;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.taskdefs.rmic.RmicAdapter;
import org.apache.tools.ant.taskdefs.rmic.RmicAdapterFactory;
+import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.mappers.FileNameMapper;
-import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.types.PathUtil;
+import org.apache.tools.ant.types.SourceFileScanner;
+import org.apache.tools.ant.util.mappers.FileNameMapper;
/**
* Task to compile RMI stubs and skeletons. This task can take the following
1.24 +16 -9
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SQLExec.java 26 Jan 2002 02:08:10 -0000 1.23
+++ SQLExec.java 6 Feb 2002 13:38:20 -0000 1.24
@@ -18,8 +18,8 @@
import java.io.PrintStream;
import java.io.Reader;
import java.io.StringReader;
-import java.net.URLClassLoader;
import java.net.URL;
+import java.net.URLClassLoader;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.Driver;
@@ -33,8 +33,8 @@
import java.util.Properties;
import java.util.StringTokenizer;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
@@ -469,7 +469,8 @@
throw new SQLException( "No suitable Driver for " + url );
}
- if( !isValidRdbms( conn ) ) {
+ if( !isValidRdbms( conn ) )
+ {
return;
}
@@ -565,7 +566,8 @@
*/
protected boolean isValidRdbms( Connection conn )
{
- if( rdbms == null && version == null ) {
+ if( rdbms == null && version == null )
+ {
return true;
}
@@ -620,7 +622,8 @@
throws SQLException
{
// Check and ignore empty statements
- if( "".equals( sql.trim() ) ) {
+ if( "".equals( sql.trim() ) )
+ {
return;
}
@@ -651,7 +654,8 @@
catch( SQLException e )
{
getLogger().error( "Failed to execute: " + sql );
- if( !onError.equals( "continue" ) ) {
+ if( !onError.equals( "continue" ) )
+ {
throw e;
}
getLogger().error( e.toString() );
@@ -731,10 +735,12 @@
{
line = line.trim();
line = "" + resolveValue( line );
- if( line.startsWith( "//" ) ) {
+ if( line.startsWith( "//" ) )
+ {
continue;
}
- if( line.startsWith( "--" ) ) {
+ if( line.startsWith( "--" ) )
+ {
continue;
}
StringTokenizer st = new StringTokenizer( line );
@@ -753,7 +759,8 @@
// SQL defines "--" as a comment to EOL
// and in Oracle it may contain a hint
// so we cannot just remove it, instead we must end it
- if( line.indexOf( "--" ) >= 0 ) {
+ if( line.indexOf( "--" ) >= 0 )
+ {
sql += "\n";
}
1.14 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Tstamp.java 3 Feb 2002 03:46:54 -0000 1.13
+++ Tstamp.java 6 Feb 2002 13:38:21 -0000 1.14
@@ -18,7 +18,6 @@
import java.util.StringTokenizer;
import java.util.TimeZone;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
1.21 +6 -6
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
Index: UpToDate.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- UpToDate.java 3 Feb 2002 03:46:54 -0000 1.20
+++ UpToDate.java 6 Feb 2002 13:38:21 -0000 1.21
@@ -11,15 +11,14 @@
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.taskdefs.condition.Condition;
+import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.mappers.Mapper;
+import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.util.mappers.FileNameMapper;
+import org.apache.tools.ant.util.mappers.Mapper;
import org.apache.tools.ant.util.mappers.MergingMapper;
-import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.types.ScannerUtil;
/**
* Will set the given property if the specified target has a timestamp
greater
@@ -121,7 +120,8 @@
}
// if not there then it can't be up to date
- if( _targetFile != null && !_targetFile.exists() ) {
+ if( _targetFile != null && !_targetFile.exists() )
+ {
return false;
}
1.6 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
Index: WaitFor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WaitFor.java 3 Feb 2002 03:46:54 -0000 1.5
+++ WaitFor.java 6 Feb 2002 13:38:21 -0000 1.6
@@ -9,7 +9,6 @@
import java.util.Hashtable;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.taskdefs.condition.Condition;
import org.apache.tools.ant.taskdefs.condition.ConditionBase;
import org.apache.tools.ant.types.EnumeratedAttribute;
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java
Index: Ear.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ear.java 27 Jan 2002 10:07:15 -0000 1.1
+++ Ear.java 6 Feb 2002 13:38:21 -0000 1.2
@@ -9,8 +9,8 @@
import java.io.File;
import java.io.IOException;
-import org.apache.myrmidon.api.TaskException;
import org.apache.aut.zip.ZipOutputStream;
+import org.apache.myrmidon.api.TaskException;
/**
* Creates a EAR archive. Based on WAR task
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java
Index: Jar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Jar.java 27 Jan 2002 10:07:15 -0000 1.1
+++ Jar.java 6 Feb 2002 13:38:21 -0000 1.2
@@ -20,11 +20,11 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.zip.ZipFile;
+import org.apache.aut.zip.ZipOutputStream;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.FileScanner;
import org.apache.tools.ant.taskdefs.Manifest;
import org.apache.tools.ant.taskdefs.ManifestException;
-import org.apache.aut.zip.ZipOutputStream;
+import org.apache.tools.ant.types.FileScanner;
/**
* Creates a JAR archive.
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java
Index: Tar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Tar.java 27 Jan 2002 21:45:45 -0000 1.2
+++ Tar.java 6 Feb 2002 13:38:21 -0000 1.3
@@ -17,10 +17,10 @@
import org.apache.aut.tar.TarOutputStream;
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.SourceFileScanner;
+import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.util.mappers.MergingMapper;
-import org.apache.tools.ant.taskdefs.MatchingTask;
/**
* Creates a TAR archive.
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java
Index: War.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- War.java 27 Jan 2002 10:07:15 -0000 1.1
+++ War.java 6 Feb 2002 13:38:21 -0000 1.2
@@ -9,8 +9,8 @@
import java.io.File;
import java.io.IOException;
-import org.apache.myrmidon.api.TaskException;
import org.apache.aut.zip.ZipOutputStream;
+import org.apache.myrmidon.api.TaskException;
/**
* Creates a WAR archive.
@@ -41,7 +41,7 @@
throw new TaskException( message );
}
- addFileAs(descr, "WEB-INF/web.xml" );
+ addFileAs( descr, "WEB-INF/web.xml" );
}
public void addClasses( final ZipFileSet fs )
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java
Index: Zip.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Zip.java 27 Jan 2002 21:46:10 -0000 1.2
+++ Zip.java 6 Feb 2002 13:38:21 -0000 1.3
@@ -22,15 +22,15 @@
import java.util.zip.ZipInputStream;
import org.apache.aut.zip.ZipEntry;
import org.apache.aut.zip.ZipOutputStream;
+import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileScanner;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.ScannerUtil;
import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.util.mappers.MergingMapper;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.avalon.excalibur.io.IOUtil;
/**
* Create a ZIP archive.
1.29 +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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultCompilerAdapter.java 3 Feb 2002 10:26:21 -0000 1.28
+++ DefaultCompilerAdapter.java 6 Feb 2002 13:38:21 -0000 1.29
@@ -11,6 +11,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -21,7 +22,6 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PathUtil;
import org.apache.tools.ant.util.FileUtils;
-import org.apache.aut.nativelib.ExecManager;
/**
* This is the default implementation for the CompilerAdapter interface.
1.12 +2 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Jikes.java 20 Jan 2002 17:35:02 -0000 1.11
+++ Jikes.java 6 Feb 2002 13:38:21 -0000 1.12
@@ -83,7 +83,8 @@
Commandline cmd = new Commandline();
cmd.setExecutable( "jikes" );
- if( m_deprecation == true ) {
+ if( m_deprecation == true )
+ {
cmd.addArgument( "-deprecation" );
}
1.20 +7 -5
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ExecTask.java 3 Feb 2002 03:46:54 -0000 1.19
+++ ExecTask.java 6 Feb 2002 13:38:22 -0000 1.20
@@ -18,7 +18,6 @@
import java.util.Properties;
import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.Commandline;
@@ -316,10 +315,12 @@
{
try
{
- if( m_ouput != null ) {
+ if( m_ouput != null )
+ {
m_ouput.close();
}
- if( m_byteArrayOutput != null ) {
+ if( m_byteArrayOutput != null )
+ {
m_byteArrayOutput.close();
}
}
@@ -350,8 +351,9 @@
throws TaskException
{
// default directory to the project's base directory
- if( m_workingDirectory == null ) {
- m_workingDirectory = getBaseDirectory();
+ if( m_workingDirectory == null )
+ {
+ m_workingDirectory = getBaseDirectory();
}
// show the command
getLogger().debug( m_command.toString() );
1.9 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteOn.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExecuteOn.java 3 Feb 2002 03:46:54 -0000 1.8
+++ ExecuteOn.java 6 Feb 2002 13:38:22 -0000 1.9
@@ -13,12 +13,11 @@
import java.util.Hashtable;
import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Marker;
-import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.util.mappers.FileNameMapper;
import org.apache.tools.ant.util.mappers.Mapper;
1.15 +6 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
Index: Move.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Move.java 3 Feb 2002 03:41:18 -0000 1.14
+++ Move.java 6 Feb 2002 13:38:22 -0000 1.15
@@ -50,7 +50,8 @@
throws TaskException
{
String[] list = d.list();
- if( list == null ) {
+ if( list == null )
+ {
return;
}// on an io error list() can return null
@@ -225,7 +226,8 @@
protected boolean okToDelete( File d )
{
String[] list = d.list();
- if( list == null ) {
+ if( list == null )
+ {
return false;
}// maybe io error?
@@ -235,7 +237,8 @@
File f = new File( d, s );
if( f.isDirectory() )
{
- if( !okToDelete( f ) ) {
+ if( !okToDelete( f ) )
+ {
return false;
}
}
1.23 +12 -9
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Javadoc.java 3 Feb 2002 10:26:21 -0000 1.22
+++ Javadoc.java 6 Feb 2002 13:38:22 -0000 1.23
@@ -15,19 +15,19 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.StringTokenizer;
+import org.apache.aut.nativelib.ExecManager;
+import org.apache.aut.nativelib.ExecOutputHandler;
+import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Pattern;
-import org.apache.aut.nativelib.Os;
-import org.apache.aut.nativelib.ExecOutputHandler;
-import org.apache.aut.nativelib.ExecManager;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.ant.util.FileUtils;
/**
* This task makes it easy to generate Javadoc documentation for a
collection of
@@ -567,17 +567,19 @@
// Build the classpath to pass to Javadoc
Path classpath = new Path();
classpath.addPath( m_sourcePath );
- if ( m_classpath != null )
+ if( m_classpath != null )
{
classpath.addPath( m_classpath );
}
cmd.addArgument( "-classpath" );
cmd.addArgument( classpath.toString() );
- if( m_version && m_doclet == null ) {
+ if( m_version && m_doclet == null )
+ {
cmd.addArgument( "-version" );
}
- if( m_author && m_doclet == null ) {
+ if( m_author && m_doclet == null )
+ {
cmd.addArgument( "-author" );
}
@@ -938,7 +940,8 @@
ArrayList addedPackages = new ArrayList();
String[] list = sourcePath.list();
- if( list == null ) {
+ if( list == null )
+ {
list = new String[ 0 ];
}
1.14 +11 -6
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
Index: DefaultRmicAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultRmicAdapter.java 20 Jan 2002 17:35:01 -0000 1.13
+++ DefaultRmicAdapter.java 6 Feb 2002 13:38:22 -0000 1.14
@@ -15,8 +15,8 @@
import org.apache.tools.ant.taskdefs.Rmic;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.mappers.FileNameMapper;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.mappers.FileNameMapper;
/**
* This is the default implementation for the RmicAdapter interface.
Currently,
@@ -123,13 +123,18 @@
String stubVersion = attributes.getStubVersion();
if( null != stubVersion )
{
- if( "1.1".equals( stubVersion ) ) {
+ if( "1.1".equals( stubVersion ) )
+ {
cmd.addArgument( "-v1.1" );
- } else if( "1.2".equals( stubVersion ) ) {
+ }
+ else if( "1.2".equals( stubVersion ) )
+ {
cmd.addArgument( "-v1.2" );
- } else {
+ }
+ else
+ {
cmd.addArgument( "-vcompat" );
- }
+ }
}
if( null != attributes.getSourceBase() )
@@ -182,7 +187,7 @@
classpath.addLocation( attributes.getBase() );
// add the classpath
- if ( attributes.getClasspath() != null )
+ if( attributes.getClasspath() != null )
{
classpath.addExisting( attributes.getClasspath() );
}
1.7 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
Index: Native2Ascii.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Native2Ascii.java 20 Jan 2002 17:35:01 -0000 1.6
+++ Native2Ascii.java 6 Feb 2002 13:38:22 -0000 1.7
@@ -12,11 +12,10 @@
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.util.mappers.Mapper;
import org.apache.tools.ant.types.SourceFileScanner;
-
import org.apache.tools.ant.util.mappers.FileNameMapper;
import org.apache.tools.ant.util.mappers.IdentityMapper;
+import org.apache.tools.ant.util.mappers.Mapper;
/**
* Convert files from native encodings to ascii.
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Replace.java 20 Jan 2002 09:50:38 -0000 1.4
+++ Replace.java 6 Feb 2002 13:38:22 -0000 1.5
@@ -22,11 +22,11 @@
import java.io.Writer;
import java.util.ArrayList;
import java.util.Properties;
-import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.excalibur.io.IOUtil;
+import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.DirectoryScanner;
/**
* Replaces all occurrences of one or more string tokens with given values in
@@ -390,8 +390,8 @@
}
finally
{
- IOUtil.shutdownReader(reader);
- IOUtil.shutdownWriter(writer);
+ IOUtil.shutdownReader( reader );
+ IOUtil.shutdownWriter( writer );
if( temp != null )
{
temp.delete();
1.7 +33 -17
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
Index: ReplaceRegExp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ReplaceRegExp.java 26 Jan 2002 02:08:11 -0000 1.6
+++ ReplaceRegExp.java 6 Feb 2002 13:38:22 -0000 1.7
@@ -17,8 +17,8 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.ScannerUtil;
import org.apache.tools.ant.util.regexp.Regexp;
@@ -96,7 +96,8 @@
public void setByLine( String byline )
{
Boolean res = Boolean.valueOf( byline );
- if( res == null ) {
+ if( res == null )
+ {
res = Boolean.FALSE;
}
this.byline = res.booleanValue();
@@ -115,7 +116,8 @@
public void setMatch( String match )
throws TaskException
{
- if( regex != null ) {
+ if( regex != null )
+ {
throw new TaskException( "Only one regular expression is
allowed" );
}
@@ -126,7 +128,8 @@
public void setReplace( String replace )
throws TaskException
{
- if( subs != null ) {
+ if( subs != null )
+ {
throw new TaskException( "Only one substitution expression is
allowed" );
}
@@ -142,7 +145,8 @@
public RegularExpression createRegularExpression()
throws TaskException
{
- if( regex != null ) {
+ if( regex != null )
+ {
throw new TaskException( "Only one regular expression is
allowed." );
}
@@ -153,7 +157,8 @@
public Substitution createSubstitution()
throws TaskException
{
- if( subs != null ) {
+ if( subs != null )
+ {
throw new TaskException( "Only one substitution expression is
allowed" );
}
@@ -164,32 +169,39 @@
public void execute()
throws TaskException
{
- if( regex == null ) {
+ if( regex == null )
+ {
throw new TaskException( "No expression to match." );
}
- if( subs == null ) {
+ if( subs == null )
+ {
throw new TaskException( "Nothing to replace expression with." );
}
- if( file != null && filesets.size() > 0 ) {
+ if( file != null && filesets.size() > 0 )
+ {
throw new TaskException( "You cannot supply the 'file' attribute
and filesets at the same time." );
}
int options = 0;
- if( flags.indexOf( 'g' ) != -1 ) {
+ if( flags.indexOf( 'g' ) != -1 )
+ {
options |= Regexp.REPLACE_ALL;
}
- if( flags.indexOf( 'i' ) != -1 ) {
+ if( flags.indexOf( 'i' ) != -1 )
+ {
options |= Regexp.MATCH_CASE_INSENSITIVE;
}
- if( flags.indexOf( 'm' ) != -1 ) {
+ if( flags.indexOf( 'm' ) != -1 )
+ {
options |= Regexp.MATCH_MULTILINE;
}
- if( flags.indexOf( 's' ) != -1 ) {
+ if( flags.indexOf( 's' ) != -1 )
+ {
options |= Regexp.MATCH_SINGLELINE;
}
@@ -305,7 +317,8 @@
while( ( line = lnr.readLine() ) != null )
{
String res = doReplace( regex, subs, line, options );
- if( !res.equals( line ) ) {
+ if( !res.equals( line ) )
+ {
changes = true;
}
@@ -328,7 +341,8 @@
String buf = new String( tmpBuf );
String res = doReplace( regex, subs, buf, options );
- if( !res.equals( buf ) ) {
+ if( !res.equals( buf ) )
+ {
changes = true;
}
@@ -355,7 +369,8 @@
{
try
{
- if( r != null ) {
+ if( r != null )
+ {
r.close();
}
}
@@ -366,7 +381,8 @@
try
{
- if( w != null ) {
+ if( w != null )
+ {
r.close();
}
}
1.16 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java
Index: Chmod.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Chmod.java 3 Feb 2002 03:46:55 -0000 1.15
+++ Chmod.java 6 Feb 2002 13:38:22 -0000 1.16
@@ -11,7 +11,6 @@
import java.io.IOException;
import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.framework.Pattern;
import org.apache.myrmidon.framework.PatternSet;
import org.apache.tools.ant.taskdefs.exec.Execute;
1.12 +4 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Rpm.java 3 Feb 2002 10:26:20 -0000 1.11
+++ Rpm.java 6 Feb 2002 13:38:22 -0000 1.12
@@ -9,12 +9,11 @@
import java.io.File;
import java.io.IOException;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
-import org.apache.aut.nativelib.ExecManager;
-
/**
* @author [EMAIL PROTECTED]
@@ -95,8 +94,9 @@
final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
- if( m_topDir == null ) {
- m_topDir = getBaseDirectory();
+ if( m_topDir == null )
+ {
+ m_topDir = getBaseDirectory();
}
exe.setWorkingDirectory( m_topDir );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
