donaldp 01/12/22 04:57:39
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
ANTLR.java Cab.java IContract.java Javah.java
ManifestFile.java NetRexxC.java PropertyFile.java
Rpm.java Script.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
Continuus.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend
DirectoryIterator.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool
ConstantPool.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
NetCommand.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java
BorlandGenerateClient.java Ejbc.java
WeblogicDeploymentTool.java
WebsphereDeploymentTool.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n
Translate.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJAntToolGUI.java VAJBuildInfo.java VAJImport.java
VAJLocalUtil.java VAJRemoteUtil.java
VAJToolsServlet.java VAJWorkspaceScanner.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java JavaCC.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink
jlink.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java WLJspc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
DefaultCompilerAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
BatchTest.java JUnitTask.java JUnitTest.java
JUnitTestRunner.java XMLJUnitResultFormatter.java
XMLResultAggregator.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
AbstractMetamataTask.java MAuditStreamHandler.java
MMetricsStreamHandler.java MParse.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net
FTP.java MimeMail.java TelnetTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Base.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm
AntStarTeamCheckOut.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovMerge.java Coverage.java Triggers.java
XMLReport.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
ClassPathLoader.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound
SoundTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
Log:
restyled
Removed setAntRun() calls from Execute class
Renamed Environment to EnvironmentData
Revision Changes Path
1.8 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ANTLR.java 2001/12/21 13:34:16 1.7
+++ ANTLR.java 2001/12/22 12:57:36 1.8
@@ -15,8 +15,8 @@
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 @@
{
Execute exe = new Execute( new LogStreamHandler( this,
Project.MSG_INFO,
Project.MSG_WARN ),
null );
- exe.setAntRun( getProject() );
if( workingdir != null )
{
exe.setWorkingDirectory( workingdir );
1.12 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Cab.java 2001/12/21 14:21:20 1.11
+++ Cab.java 2001/12/22 12:57:36 1.12
@@ -12,8 +12,8 @@
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;
1.9 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
Index: IContract.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IContract.java 2001/12/21 13:34:17 1.8
+++ IContract.java 2001/12/22 12:57:36 1.9
@@ -22,8 +22,8 @@
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;
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
Index: Javah.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Javah.java 2001/12/21 14:21:20 1.6
+++ Javah.java 2001/12/22 12:57:36 1.7
@@ -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;
1.6 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java
Index: ManifestFile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ManifestFile.java 2001/12/21 14:21:20 1.5
+++ ManifestFile.java 2001/12/22 12:57:36 1.6
@@ -17,7 +17,6 @@
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;
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
Index: NetRexxC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NetRexxC.java 2001/12/21 14:21:20 1.6
+++ NetRexxC.java 2001/12/22 12:57:36 1.7
@@ -11,11 +11,11 @@
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;
1.6 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
Index: PropertyFile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropertyFile.java 2001/12/21 14:21:20 1.5
+++ PropertyFile.java 2001/12/22 12:57:36 1.6
@@ -20,12 +20,12 @@
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 @@
else
{
getLogger().info( "Creating new property file: " +
- m_propertyfile.getAbsolutePath() );
+ m_propertyfile.getAbsolutePath() );
FileOutputStream out = null;
try
{
1.9 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Index: Rpm.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Rpm.java 2001/12/21 13:34:17 1.8
+++ Rpm.java 2001/12/22 12:57:36 1.9
@@ -189,7 +189,6 @@
Execute exe = new Execute( streamhandler, null );
- exe.setAntRun( getProject() );
if( topDir == null ) topDir = getBaseDirectory();
exe.setWorkingDirectory( topDir );
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
Index: Script.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Script.java 2001/12/21 14:21:20 1.7
+++ Script.java 2001/12/22 12:57:36 1.8
@@ -12,8 +12,8 @@
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;
1.9 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
Index: Continuus.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Continuus.java 2001/12/21 13:34:17 1.8
+++ Continuus.java 2001/12/22 12:57:37 1.9
@@ -112,7 +112,6 @@
try
{
Execute exe = new Execute( handler );
- exe.setAntRun( getProject() );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
1.8 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ClearCase.java 2001/12/21 13:34:17 1.7
+++ ClearCase.java 2001/12/22 12:57:37 1.8
@@ -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. <p>
@@ -110,7 +110,6 @@
{
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();
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
Index: DirectoryIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectoryIterator.java 2001/12/21 14:21:21 1.3
+++ DirectoryIterator.java 2001/12/22 12:57:37 1.4
@@ -10,9 +10,9 @@
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
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
Index: ConstantPool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConstantPool.java 2001/12/21 14:21:21 1.3
+++ ConstantPool.java 2001/12/22 12:57:37 1.4
@@ -9,9 +9,9 @@
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
1.9 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
Index: NetCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NetCommand.java 2001/12/17 09:50:12 1.8
+++ NetCommand.java 2001/12/22 12:57:37 1.9
@@ -204,7 +204,6 @@
ExecuteStreamHandler handler = new LogStreamHandler( _owner,
Project.MSG_INFO, Project.MSG_WARN );
_exe = new Execute( handler, null );
- _exe.setAntRun( _owner.getProject() );
_exe.setWorkingDirectory( dir );
}
}//class
1.9 +3 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BorlandDeploymentTool.java 2001/12/21 14:21:21 1.8
+++ BorlandDeploymentTool.java 2001/12/22 12:57:37 1.9
@@ -13,14 +13,14 @@
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 @@
execTask = new Execute( this );
Project project = getTask().getProject();
- execTask.setAntRun( project );
execTask.setWorkingDirectory( project.getBaseDir() );
Commandline commandline = new Commandline();
@@ -418,7 +417,7 @@
{
//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 );
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BorlandGenerateClient.java 2001/12/21 13:34:17 1.6
+++ BorlandGenerateClient.java 2001/12/22 12:57:37 1.7
@@ -11,8 +11,8 @@
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;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
Index: Ejbc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Ejbc.java 2001/12/21 13:34:17 1.4
+++ Ejbc.java 2001/12/22 12:57:37 1.5
@@ -160,7 +160,7 @@
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
);
1.8 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Index: WeblogicDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WeblogicDeploymentTool.java 2001/12/21 14:21:21 1.7
+++ WeblogicDeploymentTool.java 2001/12/22 12:57:37 1.8
@@ -12,7 +12,6 @@
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;
1.6 +3 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebsphereDeploymentTool.java 2001/12/21 14:21:21 1.5
+++ WebsphereDeploymentTool.java 2001/12/22 12:57:37 1.6
@@ -11,7 +11,6 @@
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.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 @@
- // 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 );
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
Index: Translate.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Translate.java 2001/12/21 14:21:21 1.6
+++ Translate.java 2001/12/22 12:57:37 1.7
@@ -15,9 +15,9 @@
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;
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
Index: VAJAntToolGUI.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VAJAntToolGUI.java 2001/12/21 14:21:21 1.5
+++ VAJAntToolGUI.java 2001/12/22 12:57:37 1.6
@@ -38,12 +38,12 @@
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
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
Index: VAJBuildInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VAJBuildInfo.java 2001/12/21 14:21:21 1.4
+++ VAJBuildInfo.java 2001/12/22 12:57:37 1.5
@@ -10,9 +10,9 @@
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;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
Index: VAJImport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VAJImport.java 2001/12/21 14:21:21 1.4
+++ VAJImport.java 2001/12/22 12:57:37 1.5
@@ -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;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
Index: VAJLocalUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VAJLocalUtil.java 2001/12/21 14:21:21 1.4
+++ VAJLocalUtil.java 2001/12/22 12:57:37 1.5
@@ -17,8 +17,8 @@
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;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java
Index: VAJRemoteUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VAJRemoteUtil.java 2001/12/21 14:21:21 1.4
+++ VAJRemoteUtil.java 2001/12/22 12:57:37 1.5
@@ -14,8 +14,8 @@
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;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
Index: VAJToolsServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VAJToolsServlet.java 2001/12/21 13:28:30 1.3
+++ VAJToolsServlet.java 2001/12/22 12:57:37 1.4
@@ -12,9 +12,9 @@
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
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
Index: VAJWorkspaceScanner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VAJWorkspaceScanner.java 2001/12/21 14:21:21 1.3
+++ VAJWorkspaceScanner.java 2001/12/22 12:57:37 1.4
@@ -11,9 +11,9 @@
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;
/**
1.8 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JJTree.java 2001/12/21 14:21:21 1.7
+++ JJTree.java 2001/12/22 12:57:38 1.8
@@ -9,9 +9,8 @@
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;
1.6 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaCC.java 2001/12/21 14:21:21 1.5
+++ JavaCC.java 2001/12/22 12:57:38 1.6
@@ -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;
1.7 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDependTask.java 2001/12/21 13:34:18 1.6
+++ JDependTask.java 2001/12/22 12:57:38 1.7
@@ -340,7 +340,6 @@
if( getDir() != null )
{
execute.setWorkingDirectory( getDir() );
- execute.setAntRun( getProject() );
}
if( getOutputFile() != null )
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
Index: jlink.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jlink.java 2001/12/21 14:21:22 1.3
+++ jlink.java 2001/12/22 12:57:38 1.4
@@ -13,9 +13,9 @@
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;
1.8 +5 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JspC.java 2001/12/21 14:21:22 1.7
+++ JspC.java 2001/12/22 12:57:38 1.8
@@ -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;
@@ -58,7 +58,7 @@
* </a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">J D Glanville</a>
- * @version $Revision: 1.7 $ $Date: 2001/12/21 14:21:22 $
+ * @version $Revision: 1.8 $ $Date: 2001/12/22 12:57:38 $
*/
public class JspC extends MatchingTask
{
@@ -389,9 +389,9 @@
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 );
1.10 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
Index: WLJspc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WLJspc.java 2001/12/21 14:21:22 1.9
+++ WLJspc.java 2001/12/22 12:57:38 1.10
@@ -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;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultCompilerAdapter.java 2001/12/21 14:21:22 1.3
+++ DefaultCompilerAdapter.java 2001/12/22 12:57:38 1.4
@@ -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;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
Index: BatchTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BatchTest.java 2001/12/21 14:21:22 1.3
+++ BatchTest.java 2001/12/22 12:57:38 1.4
@@ -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;
1.10 +4 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JUnitTask.java 2001/12/21 14:21:22 1.9
+++ JUnitTask.java 2001/12/22 12:57:38 1.10
@@ -12,11 +12,11 @@
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.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 @@
*
* @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 @@
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 );
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
Index: JUnitTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JUnitTest.java 2001/12/21 14:21:22 1.3
+++ JUnitTest.java 2001/12/22 12:57:38 1.4
@@ -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;
/**
1.5 +4 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JUnitTestRunner.java 2001/12/21 14:21:22 1.4
+++ JUnitTestRunner.java 2001/12/22 12:57:38 1.5
@@ -17,20 +17,20 @@
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. <p>
@@ -541,7 +541,7 @@
for( int i = 0; i < formatters.size(); i++ )
{
( (TestListener)formatters.get( i ) ).addError( null,
-
exception );
+ exception );
}
junitTest.setCounts( 1, 0, 1 );
junitTest.setRunTime( 0 );
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
Index: XMLJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLJUnitResultFormatter.java 2001/12/21 14:21:22 1.3
+++ XMLJUnitResultFormatter.java 2001/12/22 12:57:38 1.4
@@ -11,8 +11,8 @@
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;
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLResultAggregator.java 2001/12/21 14:21:22 1.7
+++ XMLResultAggregator.java 2001/12/22 12:57:38 1.8
@@ -13,8 +13,8 @@
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;
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractMetamataTask.java 2001/12/21 14:21:22 1.6
+++ AbstractMetamataTask.java 2001/12/22 12:57:38 1.7
@@ -11,10 +11,10 @@
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;
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java
Index: MAuditStreamHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MAuditStreamHandler.java 2001/12/21 14:21:22 1.5
+++ MAuditStreamHandler.java 2001/12/22 12:57:38 1.6
@@ -14,9 +14,9 @@
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;
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
Index: MMetricsStreamHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MMetricsStreamHandler.java 2001/12/21 14:21:22 1.4
+++ MMetricsStreamHandler.java 2001/12/22 12:57:38 1.5
@@ -16,10 +16,10 @@
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;
1.9 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MParse.java 2001/12/21 14:21:22 1.8
+++ MParse.java 2001/12/22 12:57:38 1.9
@@ -11,8 +11,8 @@
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;
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Index: FTP.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FTP.java 2001/12/21 14:21:22 1.6
+++ FTP.java 2001/12/22 12:57:38 1.7
@@ -20,8 +20,8 @@
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;
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
Index: MimeMail.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MimeMail.java 2001/12/21 14:21:22 1.6
+++ MimeMail.java 2001/12/22 12:57:38 1.7
@@ -10,8 +10,8 @@
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;
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
Index: TelnetTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TelnetTask.java 2001/12/21 14:21:22 1.4
+++ TelnetTask.java 2001/12/22 12:57:38 1.5
@@ -11,9 +11,9 @@
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;
@@ -22,7 +22,7 @@
* Class to provide automated telnet protocol support for the Ant build tool
*
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class TelnetTask extends Task
1.8 +0 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- P4Base.java 2001/12/21 13:34:18 1.7
+++ P4Base.java 2001/12/22 12:57:38 1.8
@@ -167,8 +167,6 @@
Execute exe = new Execute( handler, null );
- exe.setAntRun( getProject() );
-
exe.setCommandline( commandline.getCommandline() );
try
1.8 +1 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
Index: Pvcs.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Pvcs.java 2001/12/21 14:21:23 1.7
+++ Pvcs.java 2001/12/22 12:57:39 1.8
@@ -17,9 +17,9 @@
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 @@
{
Project aProj = getProject();
Execute exe = new Execute( out );
- exe.setAntRun( aProj );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
Index: AntStarTeamCheckOut.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntStarTeamCheckOut.java 2001/12/16 05:44:57 1.3
+++ AntStarTeamCheckOut.java 2001/12/22 12:57:39 1.4
@@ -998,7 +998,7 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CovMerge.java 2001/12/21 14:21:23 1.5
+++ CovMerge.java 2001/12/22 12:57:39 1.6
@@ -11,8 +11,8 @@
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;
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Coverage.java 2001/12/21 14:21:23 1.6
+++ Coverage.java 2001/12/22 12:57:39 1.7
@@ -13,8 +13,8 @@
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;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java
Index: Triggers.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Triggers.java 2001/12/21 14:21:23 1.3
+++ Triggers.java 2001/12/22 12:57:39 1.4
@@ -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;
/**
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
Index: XMLReport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLReport.java 2001/12/21 14:21:23 1.3
+++ XMLReport.java 2001/12/22 12:57:39 1.4
@@ -9,10 +9,10 @@
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;
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java
Index: ClassPathLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassPathLoader.java 2001/12/21 14:21:23 1.3
+++ ClassPathLoader.java 2001/12/22 12:57:39 1.4
@@ -15,11 +15,11 @@
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;
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java
Index: SoundTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SoundTask.java 2001/12/21 14:21:23 1.5
+++ SoundTask.java 2001/12/22 12:57:39 1.6
@@ -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;
@@ -25,7 +25,7 @@
* in xml and have Ant play them back
*
* @author Nick Pellow
- * @version $Revision: 1.5 $, $Date: 2001/12/21 14:21:23 $
+ * @version $Revision: 1.6 $, $Date: 2001/12/22 12:57:39 $
*/
public class SoundTask extends Task
1.8 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MSVSS.java 2001/12/21 13:34:19 1.7
+++ MSVSS.java 2001/12/22 12:57:39 1.8
@@ -227,7 +227,6 @@
exe.setEnvironment( newEnv );
}
- exe.setAntRun( getProject() );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
