From 8fb5ee4f11221d29f8d756000b75e87e03321845 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 22 Dec 2001 13:00:26 +0000 Subject: [PATCH] restyled Removed setAntRun() calls from Execute class Renamed Environment to EnvironmentData git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270314 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/AntStructure.java | 3 +-- .../main/org/apache/tools/ant/taskdefs/BUnzip2.java | 2 +- .../main/org/apache/tools/ant/taskdefs/Checksum.java | 3 +-- .../src/main/org/apache/tools/ant/taskdefs/Chmod.java | 2 +- .../main/org/apache/tools/ant/taskdefs/DependSet.java | 2 +- .../main/org/apache/tools/ant/taskdefs/ExecuteOn.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Expand.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/GUnzip.java | 2 +- .../org/apache/tools/ant/taskdefs/GenerateKey.java | 3 +-- .../src/main/org/apache/tools/ant/taskdefs/Get.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Input.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Jar.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Java.java | 8 +++----- .../src/main/org/apache/tools/ant/taskdefs/Javac.java | 8 ++++---- .../main/org/apache/tools/ant/taskdefs/Javadoc.java | 4 +--- .../main/org/apache/tools/ant/taskdefs/Manifest.java | 10 +++++----- .../main/org/apache/tools/ant/taskdefs/Recorder.java | 2 +- .../main/org/apache/tools/ant/taskdefs/Replace.java | 3 +-- .../main/org/apache/tools/ant/taskdefs/SQLExec.java | 6 +++--- .../main/org/apache/tools/ant/taskdefs/SendEmail.java | 2 +- .../main/org/apache/tools/ant/taskdefs/SignJar.java | 1 - .../src/main/org/apache/tools/ant/taskdefs/Tar.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Touch.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Tstamp.java | 4 ++-- .../main/org/apache/tools/ant/taskdefs/UpToDate.java | 2 +- .../org/apache/tools/ant/taskdefs/exec/ExecTask.java | 7 +++---- .../org/apache/tools/ant/taskdefs/optional/ANTLR.java | 3 +-- .../org/apache/tools/ant/taskdefs/optional/Cab.java | 2 +- .../apache/tools/ant/taskdefs/optional/IContract.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/Javah.java | 2 +- .../tools/ant/taskdefs/optional/ManifestFile.java | 1 - .../apache/tools/ant/taskdefs/optional/NetRexxC.java | 4 ++-- .../tools/ant/taskdefs/optional/PropertyFile.java | 6 +++--- .../org/apache/tools/ant/taskdefs/optional/Rpm.java | 1 - .../org/apache/tools/ant/taskdefs/optional/Script.java | 2 +- .../tools/ant/taskdefs/optional/ccm/Continuus.java | 1 - .../ant/taskdefs/optional/clearcase/ClearCase.java | 3 +-- .../taskdefs/optional/depend/DirectoryIterator.java | 2 +- .../optional/depend/constantpool/ConstantPool.java | 4 ++-- .../tools/ant/taskdefs/optional/dotnet/NetCommand.java | 1 - .../taskdefs/optional/ejb/BorlandDeploymentTool.java | 7 +++---- .../taskdefs/optional/ejb/BorlandGenerateClient.java | 2 +- .../apache/tools/ant/taskdefs/optional/ejb/Ejbc.java | 2 +- .../taskdefs/optional/ejb/WeblogicDeploymentTool.java | 1 - .../taskdefs/optional/ejb/WebsphereDeploymentTool.java | 7 +++---- .../tools/ant/taskdefs/optional/i18n/Translate.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJBuildInfo.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJImport.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJLocalUtil.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java | 2 +- .../ant/taskdefs/optional/ide/VAJToolsServlet.java | 2 +- .../ant/taskdefs/optional/ide/VAJWorkspaceScanner.java | 2 +- .../tools/ant/taskdefs/optional/javacc/JJTree.java | 3 +-- .../tools/ant/taskdefs/optional/javacc/JavaCC.java | 3 +-- .../ant/taskdefs/optional/jdepend/JDependTask.java | 1 - .../tools/ant/taskdefs/optional/jlink/jlink.java | 2 +- .../apache/tools/ant/taskdefs/optional/jsp/JspC.java | 8 ++++---- .../apache/tools/ant/taskdefs/optional/jsp/WLJspc.java | 2 +- .../optional/jsp/compilers/DefaultCompilerAdapter.java | 2 +- .../tools/ant/taskdefs/optional/junit/BatchTest.java | 2 +- .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 9 ++++----- .../tools/ant/taskdefs/optional/junit/JUnitTest.java | 4 ++-- .../ant/taskdefs/optional/junit/JUnitTestRunner.java | 8 ++++---- .../optional/junit/XMLJUnitResultFormatter.java | 2 +- .../taskdefs/optional/junit/XMLResultAggregator.java | 2 +- .../optional/metamata/AbstractMetamataTask.java | 4 ++-- .../optional/metamata/MAuditStreamHandler.java | 4 ++-- .../optional/metamata/MMetricsStreamHandler.java | 2 +- .../tools/ant/taskdefs/optional/metamata/MParse.java | 2 +- .../apache/tools/ant/taskdefs/optional/net/FTP.java | 2 +- .../tools/ant/taskdefs/optional/net/MimeMail.java | 2 +- .../tools/ant/taskdefs/optional/net/TelnetTask.java | 2 +- .../tools/ant/taskdefs/optional/perforce/P4Base.java | 2 -- .../apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java | 3 +-- .../ant/taskdefs/optional/scm/AntStarTeamCheckOut.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/CovMerge.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/Coverage.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/Triggers.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/XMLReport.java | 4 ++-- .../optional/sitraka/bytecode/ClassPathLoader.java | 4 ++-- .../tools/ant/taskdefs/optional/sound/SoundTask.java | 2 +- .../apache/tools/ant/taskdefs/optional/vss/MSVSS.java | 1 - .../org/apache/tools/ant/taskdefs/AntStructure.java | 3 +-- .../todo/org/apache/tools/ant/taskdefs/BUnzip2.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/Checksum.java | 3 +-- .../src/todo/org/apache/tools/ant/taskdefs/Chmod.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/DependSet.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/ExecuteOn.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Expand.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/GUnzip.java | 2 +- .../org/apache/tools/ant/taskdefs/GenerateKey.java | 3 +-- .../src/todo/org/apache/tools/ant/taskdefs/Get.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Input.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Jar.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Java.java | 8 +++----- .../src/todo/org/apache/tools/ant/taskdefs/Javac.java | 8 ++++---- .../todo/org/apache/tools/ant/taskdefs/Javadoc.java | 4 +--- .../todo/org/apache/tools/ant/taskdefs/Manifest.java | 10 +++++----- .../todo/org/apache/tools/ant/taskdefs/Recorder.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/Replace.java | 3 +-- .../todo/org/apache/tools/ant/taskdefs/SQLExec.java | 6 +++--- .../todo/org/apache/tools/ant/taskdefs/SendEmail.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/SignJar.java | 1 - .../src/todo/org/apache/tools/ant/taskdefs/Tar.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Touch.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Tstamp.java | 4 ++-- .../todo/org/apache/tools/ant/taskdefs/UpToDate.java | 2 +- .../org/apache/tools/ant/taskdefs/exec/ExecTask.java | 7 +++---- .../org/apache/tools/ant/taskdefs/optional/ANTLR.java | 3 +-- .../org/apache/tools/ant/taskdefs/optional/Cab.java | 2 +- .../apache/tools/ant/taskdefs/optional/IContract.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/Javah.java | 2 +- .../tools/ant/taskdefs/optional/ManifestFile.java | 1 - .../apache/tools/ant/taskdefs/optional/NetRexxC.java | 4 ++-- .../tools/ant/taskdefs/optional/PropertyFile.java | 6 +++--- .../org/apache/tools/ant/taskdefs/optional/Rpm.java | 1 - .../org/apache/tools/ant/taskdefs/optional/Script.java | 2 +- .../tools/ant/taskdefs/optional/ccm/Continuus.java | 1 - .../ant/taskdefs/optional/clearcase/ClearCase.java | 3 +-- .../taskdefs/optional/depend/DirectoryIterator.java | 2 +- .../optional/depend/constantpool/ConstantPool.java | 4 ++-- .../tools/ant/taskdefs/optional/dotnet/NetCommand.java | 1 - .../taskdefs/optional/ejb/BorlandDeploymentTool.java | 7 +++---- .../taskdefs/optional/ejb/BorlandGenerateClient.java | 2 +- .../apache/tools/ant/taskdefs/optional/ejb/Ejbc.java | 2 +- .../taskdefs/optional/ejb/WeblogicDeploymentTool.java | 1 - .../taskdefs/optional/ejb/WebsphereDeploymentTool.java | 7 +++---- .../tools/ant/taskdefs/optional/i18n/Translate.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJBuildInfo.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJImport.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJLocalUtil.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java | 2 +- .../ant/taskdefs/optional/ide/VAJToolsServlet.java | 2 +- .../ant/taskdefs/optional/ide/VAJWorkspaceScanner.java | 2 +- .../tools/ant/taskdefs/optional/javacc/JJTree.java | 3 +-- .../tools/ant/taskdefs/optional/javacc/JavaCC.java | 3 +-- .../ant/taskdefs/optional/jdepend/JDependTask.java | 1 - .../tools/ant/taskdefs/optional/jlink/jlink.java | 2 +- .../apache/tools/ant/taskdefs/optional/jsp/JspC.java | 8 ++++---- .../apache/tools/ant/taskdefs/optional/jsp/WLJspc.java | 2 +- .../optional/jsp/compilers/DefaultCompilerAdapter.java | 2 +- .../tools/ant/taskdefs/optional/junit/BatchTest.java | 2 +- .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 9 ++++----- .../tools/ant/taskdefs/optional/junit/JUnitTest.java | 4 ++-- .../ant/taskdefs/optional/junit/JUnitTestRunner.java | 8 ++++---- .../optional/junit/XMLJUnitResultFormatter.java | 2 +- .../taskdefs/optional/junit/XMLResultAggregator.java | 2 +- .../optional/metamata/AbstractMetamataTask.java | 4 ++-- .../optional/metamata/MAuditStreamHandler.java | 4 ++-- .../optional/metamata/MMetricsStreamHandler.java | 2 +- .../tools/ant/taskdefs/optional/metamata/MParse.java | 2 +- .../apache/tools/ant/taskdefs/optional/net/FTP.java | 2 +- .../tools/ant/taskdefs/optional/net/MimeMail.java | 2 +- .../tools/ant/taskdefs/optional/net/TelnetTask.java | 2 +- .../tools/ant/taskdefs/optional/perforce/P4Base.java | 2 -- .../apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java | 3 +-- .../ant/taskdefs/optional/scm/AntStarTeamCheckOut.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/CovMerge.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/Coverage.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/Triggers.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/XMLReport.java | 4 ++-- .../optional/sitraka/bytecode/ClassPathLoader.java | 4 ++-- .../tools/ant/taskdefs/optional/sound/SoundTask.java | 2 +- .../apache/tools/ant/taskdefs/optional/vss/MSVSS.java | 1 - 166 files changed, 220 insertions(+), 274 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 9a96006c8..bb788dbbb 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -14,9 +14,8 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java index c78cbc037..1a04a2106 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java @@ -37,7 +37,7 @@ public class BUnzip2 extends Unpack if( source.lastModified() > dest.lastModified() ) { getLogger().info( "Expanding " + source.getAbsolutePath() + " to " - + dest.getAbsolutePath() ); + + dest.getAbsolutePath() ); FileOutputStream out = null; CBZip2InputStream zIn = null; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 7b5f426c6..23f109998 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -17,10 +17,9 @@ import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; import java.util.Enumeration; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java index 5cbab9e58..6f85cd68b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java @@ -11,9 +11,9 @@ import java.io.File; import java.io.IOException; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; +import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.PatternSet; -import org.apache.tools.ant.taskdefs.exec.Execute; /** * Chmod equivalent for unix-like environments. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 02fc716fd..e2f72e584 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -8,9 +8,9 @@ package org.apache.tools.ant.taskdefs; import java.io.File; +import java.util.ArrayList; import java.util.Date; import java.util.Iterator; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index 5e596695e..344d78c60 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java index 7ebb05e30..f6167cd4c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -13,8 +13,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Date; import java.util.ArrayList; +import java.util.Date; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import org.apache.avalon.excalibur.io.FileUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java index 71a8ff590..71311b275 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java @@ -37,7 +37,7 @@ public class GUnzip extends Unpack if( source.lastModified() > dest.lastModified() ) { getLogger().info( "Expanding " + source.getAbsolutePath() + " to " - + dest.getAbsolutePath() ); + + dest.getAbsolutePath() ); FileOutputStream out = null; GZIPInputStream zIn = null; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index d56548c3d..f7fb5b7a8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -7,13 +7,12 @@ */ package org.apache.tools.ant.taskdefs; -import java.util.Iterator; 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; -import org.apache.tools.ant.types.Commandline; /** * Generates a key. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java index fb9caa95d..54567783e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -271,7 +271,7 @@ public class Get extends Task { Date t = new Date( remoteTimestamp ); getLogger().info( "last modified = " + t.toString() - + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) ); + + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) ); } if( remoteTimestamp != 0 ) touchFile( dest, remoteTimestamp ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java index 3de4cacd0..7a6716a96 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.util.StringTokenizer; import java.util.ArrayList; +import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java index 5ea5d4776..15a2fcac1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -17,8 +17,8 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; -import java.util.Iterator; import java.util.Enumeration; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java index b7657f263..7c8c9375f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -16,11 +16,11 @@ 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.PumpStreamHandler; import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; +import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.EnvironmentData; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; @@ -166,7 +166,7 @@ public class Java extends Task * * @param sysp The feature to be added to the Sysproperty attribute */ - public void addSysproperty( Environment.Variable sysp ) + public void addSysproperty( EnvironmentData.Variable sysp ) { cmdl.addSysproperty( sysp ); } @@ -385,8 +385,6 @@ public class Java extends Task exe = new Execute( new PumpStreamHandler( fos ), null ); } - exe.setAntRun( getProject() ); - if( dir == null ) { dir = getBaseDirectory(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java index f7c9ce31b..473c59c39 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; @@ -774,9 +774,9 @@ public class Javac extends MatchingTask CompilerAdapter adapter = CompilerAdapterFactory.getCompiler( compiler, this ); getLogger().info( "Compiling " + compileList.length + - " source file" - + ( compileList.length == 1 ? "" : "s" ) - + ( destDir != null ? " to " + destDir : "" ) ); + " source file" + + ( compileList.length == 1 ? "" : "s" ) + + ( destDir != null ? " to " + destDir : "" ) ); // now we need to populate the compiler adapter adapter.setJavac( this ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 688974681..c12e4c51a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -12,9 +12,9 @@ import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; @@ -28,7 +28,6 @@ import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.util.FileUtils; /** * This task makes it easy to generate Javadoc documentation for a collection of @@ -918,7 +917,6 @@ public class Javadoc extends Task JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO ); JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN ); Execute exe = new Execute( new PumpStreamHandler( out, err ) ); - exe.setAntRun( getProject() ); /* * No reason to change the working directory as all filenames and diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java index 47d374f83..085b63147 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -18,10 +18,10 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -735,15 +735,15 @@ public class Manifest extends Task if( attribute.getName().equalsIgnoreCase( ATTRIBUTE_NAME ) ) { warnings.add( "\"" + ATTRIBUTE_NAME + "\" attributes should not occur in the " + - "main section and must be the first element in all " + - "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); + "main section and must be the first element in all " + + "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); return attribute.getValue(); } if( attribute.getName().toLowerCase().startsWith( ATTRIBUTE_FROM.toLowerCase() ) ) { warnings.add( "Manifest attributes should not start with \"" + - ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); + ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); } else { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java index 1bd93b760..33e7119f6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java @@ -143,7 +143,7 @@ public class Recorder extends Task throw new TaskException( "No filename specified" ); log( "setting a recorder for name " + filename, - Project.MSG_DEBUG ); + Project.MSG_DEBUG ); // get the recorder entry RecorderEntry recorder = getRecorder( filename, getProject() ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java index bcc84dab1..e2eb07cd8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -20,12 +20,11 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; -import java.util.Properties; import java.util.ArrayList; +import java.util.Properties; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileUtils; /** * Replaces all occurrences of one or more string tokens with given values in diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index a78615e73..0dd282bae 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -26,10 +26,10 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.Statement; +import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.DirectoryScanner; @@ -366,7 +366,7 @@ public class SQLExec extends Task * @return Description of the Returned Value */ public Path createClasspath() - throws TaskException + throws TaskException { if( this.classpath == null ) { @@ -580,7 +580,7 @@ public class SQLExec extends Task } getLogger().info( goodSql + " of " + totalSql + - " SQL statements executed successfully" ); + " SQL statements executed successfully" ); } /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java index 22fdd1f98..b56282f64 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java @@ -12,9 +12,9 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintStream; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java index ca298c126..1ad90b413 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.util.Iterator; import java.util.ArrayList; import java.util.Enumeration; import java.util.zip.ZipEntry; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java index dd3976cb5..f1c89eae3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java index 75c624685..8b38d1117 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -12,8 +12,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; -import java.util.Locale; import java.util.ArrayList; +import java.util.Locale; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index 1a056e1ae..de3e6f905 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -8,15 +8,15 @@ package org.apache.tools.ant.taskdefs; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; import java.util.Locale; import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TimeZone; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 074b757db..c9f9681a0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java index 299b94ad2..541dc5b91 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java @@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException; 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.Environment; +import org.apache.tools.ant.types.EnvironmentData; /** * Executes a given command if the os platform is appropriate. @@ -35,7 +35,7 @@ public class ExecTask extends Task protected boolean failOnError = false; protected boolean newEnvironment = false; private Integer timeout = null; - private Environment env = new Environment(); + private EnvironmentData env = new EnvironmentData(); protected Commandline cmdl = new Commandline(); private FileOutputStream fos = null; private ByteArrayOutputStream baos = null; @@ -173,7 +173,7 @@ public class ExecTask extends Task * * @param var The feature to be added to the Env attribute */ - public void addEnv( Environment.Variable var ) + public void addEnv( EnvironmentData.Variable var ) { env.addVariable( var ); } @@ -393,7 +393,6 @@ public class ExecTask extends Task log( cmdl.toString(), Project.MSG_VERBOSE ); Execute exe = new Execute( createHandler(), createWatchdog() ); - exe.setAntRun( getProject() ); exe.setWorkingDirectory( dir ); exe.setVMLauncher( vmLauncher ); String[] environment = env.getVariables(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 5711b89f9..53280ce12 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -15,8 +15,8 @@ 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.exec.Execute; import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; @@ -229,7 +229,6 @@ public class ANTLR extends Task { Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), null ); - exe.setAntRun( getProject() ); if( workingdir != null ) { exe.setWorkingDirectory( workingdir ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index 0877e19b4..a754c8dce 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -12,8 +12,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index 73fa29015..63eca29e7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -22,8 +22,8 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.taskdefs.file.Mkdir; import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter; +import org.apache.tools.ant.taskdefs.file.Mkdir; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index f39cd0a27..48081cb4a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -8,9 +8,9 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java index bb64be067..806f36be5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java @@ -17,7 +17,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.ListIterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index 946ee63fc..9aa80cef5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -11,11 +11,11 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; -import java.util.ArrayList; import netrexx.lang.Rexx; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java index 2b640f1ea..b8aa771d6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java @@ -20,12 +20,12 @@ import java.text.DateFormat; import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.Iterator; import java.util.GregorianCalendar; +import java.util.Iterator; import java.util.Properties; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -247,7 +247,7 @@ public class PropertyFile extends Task else { getLogger().info( "Creating new property file: " + - m_propertyfile.getAbsolutePath() ); + m_propertyfile.getAbsolutePath() ); FileOutputStream out = null; try { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java index d19fa2389..e8a630dbf 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java @@ -189,7 +189,6 @@ public class Rpm extends Task Execute exe = new Execute( streamhandler, null ); - exe.setAntRun( getProject() ); if( topDir == null ) topDir = getBaseDirectory(); exe.setWorkingDirectory( topDir ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java index 1770c628d..a29ad0145 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java @@ -12,8 +12,8 @@ import com.ibm.bsf.BSFManager; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index cb875064f..66394a759 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -112,7 +112,6 @@ public abstract class Continuus extends Task try { Execute exe = new Execute( handler ); - exe.setAntRun( getProject() ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index e2f8a11d7..68f43672a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -7,13 +7,13 @@ */ package org.apache.tools.ant.taskdefs.optional.clearcase; +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.LogStreamHandler; import org.apache.tools.ant.types.Commandline; -import java.io.IOException; /** * A base class for creating tasks for executing commands on ClearCase.

@@ -110,7 +110,6 @@ public abstract class ClearCase extends Task { Project aProj = getProject(); Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) ); - exe.setAntRun( aProj ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java index be6616ab9..da9d574b2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java @@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.depend; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.Stack; -import java.util.ArrayList; /** * An iterator which iterates through the contents of a java directory. The diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java index 5befcb8d0..87c0bd093 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java @@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.depend.constantpool; import java.io.DataInputStream; import java.io.IOException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; /** * The constant pool of a Java class. The constant pool is a collection of diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index 7ed524f48..a3d5fe9e7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -204,7 +204,6 @@ public class NetCommand ExecuteStreamHandler handler = new LogStreamHandler( _owner, Project.MSG_INFO, Project.MSG_WARN ); _exe = new Execute( handler, null ); - _exe.setAntRun( _owner.getProject() ); _exe.setWorkingDirectory( dir ); } }//class diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 713614e3b..e5ff74888 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -13,14 +13,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler; -import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; @@ -361,7 +361,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec execTask = new Execute( this ); Project project = getTask().getProject(); - execTask.setAntRun( project ); execTask.setWorkingDirectory( project.getBaseDir() ); Commandline commandline = new Commandline(); @@ -418,7 +417,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec { //UGLY HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //getTask().getProject().addTaskDefinition( "internal_bas_generateclient", - //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class ); + //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class ); org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null; log( "generate client for " + sourceJar, Project.MSG_INFO ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index caef7e82e..7f48ff72c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -11,8 +11,8 @@ import java.io.File; 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; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.taskdefs.exec.ExecTask; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index bf5654d95..83c11e814 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -160,7 +160,7 @@ public class Ejbc extends MatchingTask String systemClassPath = System.getProperty( "java.class.path" ); String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath + - ":" + generatedFilesDirectory ); + ":" + generatedFilesDirectory ); // get all the files in the descriptor directory DirectoryScanner ds = super.getDirectoryScanner( descriptorDirectory ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 7c762fbf0..2a58a130d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -12,7 +12,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 81416cabe..fb7feeb0d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -11,7 +11,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; @@ -23,7 +22,7 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.EnvironmentData; import org.apache.tools.ant.types.Path; /** @@ -965,9 +964,9 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool - // Set the Environment variable + // Set the EnvironmentData variable - Environment.Variable var = new Environment.Variable(); + EnvironmentData.Variable var = new EnvironmentData.Variable(); var.setKey( "websphere.lib.dir" ); var.setValue( getTask().getProject().getProperty( "websphere.home" ) + "/lib" ); javaTask.addSysproperty( var ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 85ce0a417..44ecf1634 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -15,9 +15,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.util.ArrayList; import java.util.Hashtable; import java.util.Locale; -import java.util.ArrayList; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index afef951e1..650dfac0f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -38,12 +38,12 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.StringUtils; -import org.apache.avalon.framework.ExceptionUtil; /** * This is a simple grafical user interface to provide the information needed by diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java index 8b8cef43a..5c08797af 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java @@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index 1b7d15fe2..d11063490 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.lang.reflect.Field; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index 17a7eb5ac..ad49719e8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -17,8 +17,8 @@ import com.ibm.ivj.util.base.ToolEnv; import com.ibm.ivj.util.base.Type; import com.ibm.ivj.util.base.Workspace; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java index 64f97d9e7..0fc762a37 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java @@ -14,8 +14,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 5adaa2ee7..13c25b491 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -12,9 +12,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.util.StringUtils; -import org.apache.avalon.framework.ExceptionUtil; /** * Abstract base class to provide common services for the VAJ tool API servlets diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java index 7f96ba672..aa385548b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java @@ -11,9 +11,9 @@ import com.ibm.ivj.util.base.IvjException; import com.ibm.ivj.util.base.Package; import com.ibm.ivj.util.base.Project; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.tools.ant.DirectoryScanner; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 207ba2592..fdc46a7fe 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -9,9 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.javacc; import java.io.File; import java.io.IOException; -import java.util.Iterator; -import java.util.Hashtable; 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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 494883e51..c36fe7688 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -8,9 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.javacc; import java.io.File; -import java.util.Iterator; -import java.util.Hashtable; 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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index c5b7a43c0..2ccb3947d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -340,7 +340,6 @@ public class JDependTask extends Task if( getDir() != null ) { execute.setWorkingDirectory( getDir() ); - execute.setAntRun( getProject() ); } if( getOutputFile() != null ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index bc60f7505..2ac50789f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -13,9 +13,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; import java.util.ArrayList; import java.util.Enumeration; +import java.util.Iterator; import java.util.zip.CRC32; import java.util.zip.Deflater; import java.util.zip.ZipEntry; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 36da08dc0..749e9574e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.jsp; import java.io.File; -import java.util.Date; import java.util.ArrayList; +import java.util.Date; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -389,9 +389,9 @@ public class JspC extends MatchingTask CompilerAdapter adapter = CompilerAdapterFactory.getCompiler( compiler, this ); getLogger().info( "Compiling " + compileList.size() + - " source file" - + ( compileList.size() == 1 ? "" : "s" ) - + ( destDir != null ? " to " + destDir : "" ) ); + " source file" + + ( compileList.size() == 1 ? "" : "s" ) + + ( destDir != null ? " to " + destDir : "" ) ); // now we need to populate the compiler adapter adapter.setJspc( this ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 54e8446b7..148c2d32b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -8,9 +8,9 @@ package org.apache.tools.ant.taskdefs.optional.jsp;//java imports import java.io.File; +import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java index 30b66eaca..cc72227a5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java @@ -7,8 +7,8 @@ */ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index 8fdc3e7c8..7b08972e5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 8dddbdfcf..3aabbc1fb 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -12,11 +12,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.net.URL; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; import java.util.Random; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; @@ -28,7 +28,7 @@ import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.EnvironmentData; import org.apache.tools.ant.types.Path; /** @@ -319,7 +319,7 @@ public class JUnitTask extends Task * * @param sysp The feature to be added to the Sysproperty attribute */ - public void addSysproperty( Environment.Variable sysp ) + public void addSysproperty( EnvironmentData.Variable sysp ) { commandline.addSysproperty( sysp ); } @@ -675,7 +675,6 @@ public class JUnitTask extends Task Execute execute = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), watchdog ); execute.setCommandline( cmd.getCommandline() ); - execute.setAntRun( getProject() ); if( dir != null ) { execute.setWorkingDirectory( dir ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java index c5290c33c..77dc08133 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java @@ -7,10 +7,10 @@ */ package org.apache.tools.ant.taskdefs.optional.junit; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; -import java.util.ArrayList; import org.apache.tools.ant.Project; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 92191cdfd..7104b7abf 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -17,20 +17,20 @@ import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.lang.reflect.Method; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; -import java.util.ArrayList; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestListener; import junit.framework.TestResult; import junit.framework.TestSuite; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.StringUtils; -import org.apache.avalon.framework.ExceptionUtil; /** * Simple Testrunner for JUnit that runs all tests of a testsuite.

@@ -541,7 +541,7 @@ public class JUnitTestRunner implements TestListener for( int i = 0; i < formatters.size(); i++ ) { ( (TestListener)formatters.get( i ) ).addError( null, - exception ); + exception ); } junitTest.setCounts( 1, 0, 1 ); junitTest.setRunTime( 0 ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index 5df30ef5e..f1c527d3b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -11,8 +11,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 42ac57909..0ee0c66c3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.excalibur.io.FileUtil; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 1dd2cb875..d75b37424 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -11,10 +11,10 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Random; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index 5187cc8f8..c5fc76d33 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -14,9 +14,9 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 02cbffda8..47e57ea84 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -16,10 +16,10 @@ import java.io.OutputStreamWriter; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.ParseException; +import java.util.ArrayList; import java.util.EmptyStackException; import java.util.Iterator; import java.util.Stack; -import java.util.ArrayList; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index cbf2df467..2b8e5d8f4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Random; 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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 8b6294507..2696aee16 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -20,8 +20,8 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Locale; import java.util.ArrayList; +import java.util.Locale; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.FileScanner; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java index c8c38d7c2..398a00416 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.optional.net; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Properties; import java.util.ArrayList; +import java.util.Properties; import javax.activation.DataHandler; import javax.activation.FileDataSource; import javax.mail.Message; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index 6efb2bd1f..9e86c7b62 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -11,9 +11,9 @@ import com.oroinc.net.telnet.TelnetClient; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index f05edb4b2..d5530cf9b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -167,8 +167,6 @@ public abstract class P4Base extends org.apache.tools.ant.Task Execute exe = new Execute( handler, null ); - exe.setAntRun( getProject() ); - exe.setCommandline( commandline.getCommandline() ); try diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index 09bb149c4..ed83945a5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -17,9 +17,9 @@ import java.io.FileWriter; import java.io.IOException; import java.text.MessageFormat; import java.text.ParseException; +import java.util.ArrayList; import java.util.Iterator; import java.util.Random; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.exec.Execute; @@ -452,7 +452,6 @@ public class Pvcs extends org.apache.tools.ant.Task { Project aProj = getProject(); Execute exe = new Execute( out ); - exe.setAntRun( aProj ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index 1196c24c6..0811c2268 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -998,7 +998,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task if( getVerbose() && getFolderName() != null ) { getLogger().info( "Found " + getProjectName() + delim + getViewName() + - delim + getFolderName() + delim + "\n" ); + delim + getFolderName() + delim + "\n" ); } // For performance reasons, it is important to pre-fetch all the diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index aec4fb40f..e161a784a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Random; import java.util.ArrayList; +import java.util.Random; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index b3bfdb2a2..276fbcbde 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.Random; 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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java index 9ff4d3873..476a87871 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java @@ -7,8 +7,8 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java index 2d14fe0ba..1aa4e24a4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import java.io.File; import java.io.FileInputStream; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.NoSuchElementException; -import java.util.ArrayList; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java index 763603f13..3cbdfff5a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java @@ -15,11 +15,11 @@ import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import java.util.ArrayList; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java index af96f17a3..0ee1f1113 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.sound; import java.io.File; -import java.util.Random; 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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 2441de660..19b20483e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -227,7 +227,6 @@ public abstract class MSVSS extends Task exe.setEnvironment( newEnv ); } - exe.setAntRun( getProject() ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java index 9a96006c8..bb788dbbb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java @@ -14,9 +14,8 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java index c78cbc037..1a04a2106 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java @@ -37,7 +37,7 @@ public class BUnzip2 extends Unpack if( source.lastModified() > dest.lastModified() ) { getLogger().info( "Expanding " + source.getAbsolutePath() + " to " - + dest.getAbsolutePath() ); + + dest.getAbsolutePath() ); FileOutputStream out = null; CBZip2InputStream zIn = null; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java index 7b5f426c6..23f109998 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java @@ -17,10 +17,9 @@ import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; import java.util.Enumeration; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java index 5cbab9e58..6f85cd68b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java @@ -11,9 +11,9 @@ import java.io.File; import java.io.IOException; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; +import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.PatternSet; -import org.apache.tools.ant.taskdefs.exec.Execute; /** * Chmod equivalent for unix-like environments. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java index 02fc716fd..e2f72e584 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java @@ -8,9 +8,9 @@ package org.apache.tools.ant.taskdefs; import java.io.File; +import java.util.ArrayList; import java.util.Date; import java.util.Iterator; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java index 5e596695e..344d78c60 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java index 7ebb05e30..f6167cd4c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java @@ -13,8 +13,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Date; import java.util.ArrayList; +import java.util.Date; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import org.apache.avalon.excalibur.io.FileUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java index 71a8ff590..71311b275 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java @@ -37,7 +37,7 @@ public class GUnzip extends Unpack if( source.lastModified() > dest.lastModified() ) { getLogger().info( "Expanding " + source.getAbsolutePath() + " to " - + dest.getAbsolutePath() ); + + dest.getAbsolutePath() ); FileOutputStream out = null; GZIPInputStream zIn = null; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java index d56548c3d..f7fb5b7a8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -7,13 +7,12 @@ */ package org.apache.tools.ant.taskdefs; -import java.util.Iterator; 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; -import org.apache.tools.ant.types.Commandline; /** * Generates a key. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java index fb9caa95d..54567783e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java @@ -271,7 +271,7 @@ public class Get extends Task { Date t = new Date( remoteTimestamp ); getLogger().info( "last modified = " + t.toString() - + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) ); + + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) ); } if( remoteTimestamp != 0 ) touchFile( dest, remoteTimestamp ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java index 3de4cacd0..7a6716a96 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.util.StringTokenizer; import java.util.ArrayList; +import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java index 5ea5d4776..15a2fcac1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java @@ -17,8 +17,8 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; -import java.util.Iterator; import java.util.Enumeration; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java index b7657f263..7c8c9375f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java @@ -16,11 +16,11 @@ 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.PumpStreamHandler; import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; +import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.EnvironmentData; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; @@ -166,7 +166,7 @@ public class Java extends Task * * @param sysp The feature to be added to the Sysproperty attribute */ - public void addSysproperty( Environment.Variable sysp ) + public void addSysproperty( EnvironmentData.Variable sysp ) { cmdl.addSysproperty( sysp ); } @@ -385,8 +385,6 @@ public class Java extends Task exe = new Execute( new PumpStreamHandler( fos ), null ); } - exe.setAntRun( getProject() ); - if( dir == null ) { dir = getBaseDirectory(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java index f7c9ce31b..473c59c39 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; @@ -774,9 +774,9 @@ public class Javac extends MatchingTask CompilerAdapter adapter = CompilerAdapterFactory.getCompiler( compiler, this ); getLogger().info( "Compiling " + compileList.length + - " source file" - + ( compileList.length == 1 ? "" : "s" ) - + ( destDir != null ? " to " + destDir : "" ) ); + " source file" + + ( compileList.length == 1 ? "" : "s" ) + + ( destDir != null ? " to " + destDir : "" ) ); // now we need to populate the compiler adapter adapter.setJavac( this ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java index 688974681..c12e4c51a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java @@ -12,9 +12,9 @@ import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; @@ -28,7 +28,6 @@ import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.util.FileUtils; /** * This task makes it easy to generate Javadoc documentation for a collection of @@ -918,7 +917,6 @@ public class Javadoc extends Task JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO ); JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN ); Execute exe = new Execute( new PumpStreamHandler( out, err ) ); - exe.setAntRun( getProject() ); /* * No reason to change the working directory as all filenames and diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java index 47d374f83..085b63147 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java @@ -18,10 +18,10 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -735,15 +735,15 @@ public class Manifest extends Task if( attribute.getName().equalsIgnoreCase( ATTRIBUTE_NAME ) ) { warnings.add( "\"" + ATTRIBUTE_NAME + "\" attributes should not occur in the " + - "main section and must be the first element in all " + - "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); + "main section and must be the first element in all " + + "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); return attribute.getValue(); } if( attribute.getName().toLowerCase().startsWith( ATTRIBUTE_FROM.toLowerCase() ) ) { warnings.add( "Manifest attributes should not start with \"" + - ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); + ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" ); } else { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java index 1bd93b760..33e7119f6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java @@ -143,7 +143,7 @@ public class Recorder extends Task throw new TaskException( "No filename specified" ); log( "setting a recorder for name " + filename, - Project.MSG_DEBUG ); + Project.MSG_DEBUG ); // get the recorder entry RecorderEntry recorder = getRecorder( filename, getProject() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java index bcc84dab1..e2eb07cd8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java @@ -20,12 +20,11 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; -import java.util.Properties; import java.util.ArrayList; +import java.util.Properties; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileUtils; /** * Replaces all occurrences of one or more string tokens with given values in diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java index a78615e73..0dd282bae 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java @@ -26,10 +26,10 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.Statement; +import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.DirectoryScanner; @@ -366,7 +366,7 @@ public class SQLExec extends Task * @return Description of the Returned Value */ public Path createClasspath() - throws TaskException + throws TaskException { if( this.classpath == null ) { @@ -580,7 +580,7 @@ public class SQLExec extends Task } getLogger().info( goodSql + " of " + totalSql + - " SQL statements executed successfully" ); + " SQL statements executed successfully" ); } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SendEmail.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SendEmail.java index 22fdd1f98..b56282f64 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SendEmail.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SendEmail.java @@ -12,9 +12,9 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintStream; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java index ca298c126..1ad90b413 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.util.Iterator; import java.util.ArrayList; import java.util.Enumeration; import java.util.zip.ZipEntry; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java index dd3976cb5..f1c89eae3 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java index 75c624685..8b38d1117 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java @@ -12,8 +12,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; -import java.util.Locale; import java.util.ArrayList; +import java.util.Locale; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java index 1a056e1ae..de3e6f905 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java @@ -8,15 +8,15 @@ package org.apache.tools.ant.taskdefs; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; import java.util.Locale; import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TimeZone; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java index 074b757db..c9f9681a0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java index 299b94ad2..541dc5b91 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java @@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException; 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.Environment; +import org.apache.tools.ant.types.EnvironmentData; /** * Executes a given command if the os platform is appropriate. @@ -35,7 +35,7 @@ public class ExecTask extends Task protected boolean failOnError = false; protected boolean newEnvironment = false; private Integer timeout = null; - private Environment env = new Environment(); + private EnvironmentData env = new EnvironmentData(); protected Commandline cmdl = new Commandline(); private FileOutputStream fos = null; private ByteArrayOutputStream baos = null; @@ -173,7 +173,7 @@ public class ExecTask extends Task * * @param var The feature to be added to the Env attribute */ - public void addEnv( Environment.Variable var ) + public void addEnv( EnvironmentData.Variable var ) { env.addVariable( var ); } @@ -393,7 +393,6 @@ public class ExecTask extends Task log( cmdl.toString(), Project.MSG_VERBOSE ); Execute exe = new Execute( createHandler(), createWatchdog() ); - exe.setAntRun( getProject() ); exe.setWorkingDirectory( dir ); exe.setVMLauncher( vmLauncher ); String[] environment = env.getVariables(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 5711b89f9..53280ce12 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -15,8 +15,8 @@ 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.exec.Execute; import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; @@ -229,7 +229,6 @@ public class ANTLR extends Task { Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), null ); - exe.setAntRun( getProject() ); if( workingdir != null ) { exe.setWorkingDirectory( workingdir ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java index 0877e19b4..a754c8dce 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -12,8 +12,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java index 73fa29015..63eca29e7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -22,8 +22,8 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.taskdefs.file.Mkdir; import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter; +import org.apache.tools.ant.taskdefs.file.Mkdir; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java index f39cd0a27..48081cb4a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -8,9 +8,9 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ManifestFile.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ManifestFile.java index bb64be067..806f36be5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ManifestFile.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ManifestFile.java @@ -17,7 +17,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.ListIterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index 946ee63fc..9aa80cef5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -11,11 +11,11 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; import java.util.StringTokenizer; -import java.util.ArrayList; import netrexx.lang.Rexx; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/PropertyFile.java index 2b640f1ea..b8aa771d6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/PropertyFile.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/PropertyFile.java @@ -20,12 +20,12 @@ import java.text.DateFormat; import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.Iterator; import java.util.GregorianCalendar; +import java.util.Iterator; import java.util.Properties; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.EnumeratedAttribute; @@ -247,7 +247,7 @@ public class PropertyFile extends Task else { getLogger().info( "Creating new property file: " + - m_propertyfile.getAbsolutePath() ); + m_propertyfile.getAbsolutePath() ); FileOutputStream out = null; try { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java index d19fa2389..e8a630dbf 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java @@ -189,7 +189,6 @@ public class Rpm extends Task Execute exe = new Execute( streamhandler, null ); - exe.setAntRun( getProject() ); if( topDir == null ) topDir = getBaseDirectory(); exe.setWorkingDirectory( topDir ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java index 1770c628d..a29ad0145 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java @@ -12,8 +12,8 @@ import com.ibm.bsf.BSFManager; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index cb875064f..66394a759 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -112,7 +112,6 @@ public abstract class Continuus extends Task try { Execute exe = new Execute( handler ); - exe.setAntRun( getProject() ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index e2f8a11d7..68f43672a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -7,13 +7,13 @@ */ package org.apache.tools.ant.taskdefs.optional.clearcase; +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.LogStreamHandler; import org.apache.tools.ant.types.Commandline; -import java.io.IOException; /** * A base class for creating tasks for executing commands on ClearCase.

@@ -110,7 +110,6 @@ public abstract class ClearCase extends Task { Project aProj = getProject(); Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) ); - exe.setAntRun( aProj ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java index be6616ab9..da9d574b2 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java @@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.depend; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.Stack; -import java.util.ArrayList; /** * An iterator which iterates through the contents of a java directory. The diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java index 5befcb8d0..87c0bd093 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java @@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.depend.constantpool; import java.io.DataInputStream; import java.io.IOException; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; /** * The constant pool of a Java class. The constant pool is a collection of diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index 7ed524f48..a3d5fe9e7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -204,7 +204,6 @@ public class NetCommand ExecuteStreamHandler handler = new LogStreamHandler( _owner, Project.MSG_INFO, Project.MSG_WARN ); _exe = new Execute( handler, null ); - _exe.setAntRun( _owner.getProject() ); _exe.setWorkingDirectory( dir ); } }//class diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 713614e3b..e5ff74888 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -13,14 +13,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.util.ArrayList; import java.util.Hashtable; import java.util.Iterator; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler; -import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; @@ -361,7 +361,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec execTask = new Execute( this ); Project project = getTask().getProject(); - execTask.setAntRun( project ); execTask.setWorkingDirectory( project.getBaseDir() ); Commandline commandline = new Commandline(); @@ -418,7 +417,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec { //UGLY HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //getTask().getProject().addTaskDefinition( "internal_bas_generateclient", - //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class ); + //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class ); org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null; log( "generate client for " + sourceJar, Project.MSG_INFO ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index caef7e82e..7f48ff72c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -11,8 +11,8 @@ import java.io.File; 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; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.taskdefs.exec.ExecTask; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index bf5654d95..83c11e814 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -160,7 +160,7 @@ public class Ejbc extends MatchingTask String systemClassPath = System.getProperty( "java.class.path" ); String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath + - ":" + generatedFilesDirectory ); + ":" + generatedFilesDirectory ); // get all the files in the descriptor directory DirectoryScanner ds = super.getDirectoryScanner( descriptorDirectory ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index 7c762fbf0..2a58a130d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -12,7 +12,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 81416cabe..fb7feeb0d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -11,7 +11,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; import java.util.Hashtable; import java.util.Iterator; import java.util.jar.JarEntry; @@ -23,7 +22,7 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.EnvironmentData; import org.apache.tools.ant.types.Path; /** @@ -965,9 +964,9 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool - // Set the Environment variable + // Set the EnvironmentData variable - Environment.Variable var = new Environment.Variable(); + EnvironmentData.Variable var = new EnvironmentData.Variable(); var.setKey( "websphere.lib.dir" ); var.setValue( getTask().getProject().getProperty( "websphere.home" ) + "/lib" ); javaTask.addSysproperty( var ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 85ce0a417..44ecf1634 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -15,9 +15,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.util.ArrayList; import java.util.Hashtable; import java.util.Locale; -import java.util.ArrayList; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index afef951e1..650dfac0f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -38,12 +38,12 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.StringUtils; -import org.apache.avalon.framework.ExceptionUtil; /** * This is a simple grafical user interface to provide the information needed by diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java index 8b8cef43a..5c08797af 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java @@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index 1b7d15fe2..d11063490 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.lang.reflect.Field; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index 17a7eb5ac..ad49719e8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -17,8 +17,8 @@ import com.ibm.ivj.util.base.ToolEnv; import com.ibm.ivj.util.base.Type; import com.ibm.ivj.util.base.Workspace; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java index 64f97d9e7..0fc762a37 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java @@ -14,8 +14,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 5adaa2ee7..13c25b491 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -12,9 +12,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.util.StringUtils; -import org.apache.avalon.framework.ExceptionUtil; /** * Abstract base class to provide common services for the VAJ tool API servlets diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java index 7f96ba672..aa385548b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java @@ -11,9 +11,9 @@ import com.ibm.ivj.util.base.IvjException; import com.ibm.ivj.util.base.Package; import com.ibm.ivj.util.base.Project; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.tools.ant.DirectoryScanner; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 207ba2592..fdc46a7fe 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -9,9 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.javacc; import java.io.File; import java.io.IOException; -import java.util.Iterator; -import java.util.Hashtable; 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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 494883e51..c36fe7688 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -8,9 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.javacc; import java.io.File; -import java.util.Iterator; -import java.util.Hashtable; 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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index c5b7a43c0..2ccb3947d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -340,7 +340,6 @@ public class JDependTask extends Task if( getDir() != null ) { execute.setWorkingDirectory( getDir() ); - execute.setAntRun( getProject() ); } if( getOutputFile() != null ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index bc60f7505..2ac50789f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -13,9 +13,9 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; import java.util.ArrayList; import java.util.Enumeration; +import java.util.Iterator; import java.util.zip.CRC32; import java.util.zip.Deflater; import java.util.zip.ZipEntry; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 36da08dc0..749e9574e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.jsp; import java.io.File; -import java.util.Date; import java.util.ArrayList; +import java.util.Date; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -389,9 +389,9 @@ public class JspC extends MatchingTask CompilerAdapter adapter = CompilerAdapterFactory.getCompiler( compiler, this ); getLogger().info( "Compiling " + compileList.size() + - " source file" - + ( compileList.size() == 1 ? "" : "s" ) - + ( destDir != null ? " to " + destDir : "" ) ); + " source file" + + ( compileList.size() == 1 ? "" : "s" ) + + ( destDir != null ? " to " + destDir : "" ) ); // now we need to populate the compiler adapter adapter.setJspc( this ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 54e8446b7..148c2d32b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -8,9 +8,9 @@ package org.apache.tools.ant.taskdefs.optional.jsp;//java imports import java.io.File; +import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java index 30b66eaca..cc72227a5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java @@ -7,8 +7,8 @@ */ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index 8fdc3e7c8..7b08972e5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.File; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 8dddbdfcf..3aabbc1fb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -12,11 +12,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.net.URL; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; import java.util.Random; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; @@ -28,7 +28,7 @@ import org.apache.tools.ant.taskdefs.exec.LogStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.EnvironmentData; import org.apache.tools.ant.types.Path; /** @@ -319,7 +319,7 @@ public class JUnitTask extends Task * * @param sysp The feature to be added to the Sysproperty attribute */ - public void addSysproperty( Environment.Variable sysp ) + public void addSysproperty( EnvironmentData.Variable sysp ) { commandline.addSysproperty( sysp ); } @@ -675,7 +675,6 @@ public class JUnitTask extends Task Execute execute = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), watchdog ); execute.setCommandline( cmd.getCommandline() ); - execute.setAntRun( getProject() ); if( dir != null ) { execute.setWorkingDirectory( dir ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java index c5290c33c..77dc08133 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java @@ -7,10 +7,10 @@ */ package org.apache.tools.ant.taskdefs.optional.junit; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; -import java.util.ArrayList; import org.apache.tools.ant.Project; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 92191cdfd..7104b7abf 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -17,20 +17,20 @@ import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.lang.reflect.Method; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; -import java.util.ArrayList; import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestListener; import junit.framework.TestResult; import junit.framework.TestSuite; +import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.StringUtils; -import org.apache.avalon.framework.ExceptionUtil; /** * Simple Testrunner for JUnit that runs all tests of a testsuite.

@@ -541,7 +541,7 @@ public class JUnitTestRunner implements TestListener for( int i = 0; i < formatters.size(); i++ ) { ( (TestListener)formatters.get( i ) ).addError( null, - exception ); + exception ); } junitTest.setCounts( 1, 0, 1 ); junitTest.setRunTime( 0 ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index 5df30ef5e..f1c527d3b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -11,8 +11,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 42ac57909..0ee0c66c3 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.util.Iterator; import java.util.ArrayList; +import java.util.Iterator; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.excalibur.io.FileUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 1dd2cb875..d75b37424 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -11,10 +11,10 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.Random; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index 5187cc8f8..c5fc76d33 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -14,9 +14,9 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.util.Iterator; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; +import java.util.Iterator; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 02cbffda8..47e57ea84 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -16,10 +16,10 @@ import java.io.OutputStreamWriter; import java.text.DecimalFormat; import java.text.NumberFormat; import java.text.ParseException; +import java.util.ArrayList; import java.util.EmptyStackException; import java.util.Iterator; import java.util.Stack; -import java.util.ArrayList; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index cbf2df467..2b8e5d8f4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Random; 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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 8b6294507..2696aee16 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -20,8 +20,8 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Locale; import java.util.ArrayList; +import java.util.Locale; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.FileScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java index c8c38d7c2..398a00416 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java @@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.optional.net; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Properties; import java.util.ArrayList; +import java.util.Properties; import javax.activation.DataHandler; import javax.activation.FileDataSource; import javax.mail.Message; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index 6efb2bd1f..9e86c7b62 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -11,9 +11,9 @@ import com.oroinc.net.telnet.TelnetClient; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index f05edb4b2..d5530cf9b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -167,8 +167,6 @@ public abstract class P4Base extends org.apache.tools.ant.Task Execute exe = new Execute( handler, null ); - exe.setAntRun( getProject() ); - exe.setCommandline( commandline.getCommandline() ); try diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index 09bb149c4..ed83945a5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -17,9 +17,9 @@ import java.io.FileWriter; import java.io.IOException; import java.text.MessageFormat; import java.text.ParseException; +import java.util.ArrayList; import java.util.Iterator; import java.util.Random; -import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.exec.Execute; @@ -452,7 +452,6 @@ public class Pvcs extends org.apache.tools.ant.Task { Project aProj = getProject(); Execute exe = new Execute( out ); - exe.setAntRun( aProj ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index 1196c24c6..0811c2268 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -998,7 +998,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task if( getVerbose() && getFolderName() != null ) { getLogger().info( "Found " + getProjectName() + delim + getViewName() + - delim + getFolderName() + delim + "\n" ); + delim + getFolderName() + delim + "\n" ); } // For performance reasons, it is important to pre-fetch all the diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index aec4fb40f..e161a784a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -11,8 +11,8 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.Random; import java.util.ArrayList; +import java.util.Random; import org.apache.myrmidon.api.TaskException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index b3bfdb2a2..276fbcbde 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; -import java.util.Random; 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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java index 9ff4d3873..476a87871 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java @@ -7,8 +7,8 @@ */ package org.apache.tools.ant.taskdefs.optional.sitraka; -import java.util.Hashtable; import java.util.ArrayList; +import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java index 2d14fe0ba..1aa4e24a4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java @@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import java.io.File; import java.io.FileInputStream; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.NoSuchElementException; -import java.util.ArrayList; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.tools.ant.Project; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java index 763603f13..3cbdfff5a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java @@ -15,11 +15,11 @@ import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; -import java.util.Iterator; +import java.util.ArrayList; import java.util.Hashtable; +import java.util.Iterator; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import java.util.ArrayList; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java index af96f17a3..0ee1f1113 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java @@ -8,8 +8,8 @@ package org.apache.tools.ant.taskdefs.optional.sound; import java.io.File; -import java.util.Random; 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; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 2441de660..19b20483e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -227,7 +227,6 @@ public abstract class MSVSS extends Task exe.setEnvironment( newEnv ); } - exe.setAntRun( getProject() ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd.getCommandline() ); return exe.execute();