hgomez 2003/09/22 02:15:12
Modified: jk/jkant/java/org/apache/jk/ant/compilers GcjLinker.java
MwccCompiler.java MwldLinker.java
LibtoolCompiler.java CompilerAdapter.java
GcjCompiler.java LibtoolLinker.java
MsvcCompiler.java CcCompiler.java MsvcLinker.java
jk/jkant/java/org/apache/jk/ant Source.java JniConfig.java
ApacheConfig.java JkData.java
Log:
More clean import
Revision Changes Path
1.4 +9 -8
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjLinker.java
Index: GcjLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjLinker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GcjLinker.java 7 May 2002 19:45:08 -0000 1.3
+++ GcjLinker.java 22 Sep 2003 09:15:12 -0000 1.4
@@ -54,15 +54,16 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.apache.jk.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.JkData;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.GlobPatternMapper;
/**
* Link java using gcj.
1.9 +10 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java
Index: MwccCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MwccCompiler.java 11 Apr 2002 21:46:57 -0000 1.8
+++ MwccCompiler.java 22 Sep 2003 09:15:12 -0000 1.9
@@ -54,14 +54,17 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-import org.apache.jk.ant.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.Def;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
/**
* Compile using MetroWerks.
1.9 +12 -8
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MwldLinker.java 11 Apr 2002 21:46:57 -0000 1.8
+++ MwldLinker.java 22 Sep 2003 09:15:12 -0000 1.9
@@ -54,15 +54,19 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.apache.jk.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.JkData;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.GlobPatternMapper;
/**
* Link using libtool.
1.9 +6 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolCompiler.java
Index: LibtoolCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolCompiler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LibtoolCompiler.java 12 Jan 2002 05:33:03 -0000 1.8
+++ LibtoolCompiler.java 22 Sep 2003 09:15:12 -0000 1.9
@@ -54,14 +54,13 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-import org.apache.jk.ant.*;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
/**
* Compile using libtool.
1.9 +8 -8
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CompilerAdapter.java
Index: CompilerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CompilerAdapter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CompilerAdapter.java 12 Jan 2002 05:33:03 -0000 1.8
+++ CompilerAdapter.java 22 Sep 2003 09:15:12 -0000 1.9
@@ -54,15 +54,15 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildException;
-import org.apache.jk.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
-import java.util.*;
-import java.io.*;
+import org.apache.jk.ant.Def;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
/* Modeled after javac
*/
1.6 +4 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjCompiler.java
Index: GcjCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjCompiler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GcjCompiler.java 16 Nov 2001 22:26:50 -0000 1.5
+++ GcjCompiler.java 22 Sep 2003 09:15:12 -0000 1.6
@@ -54,14 +54,11 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-import org.apache.jk.ant.*;
+import java.io.File;
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
/**
* Compile using Gcj. This is ( even more ) experimental.
1.9 +9 -8
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolLinker.java
Index: LibtoolLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolLinker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LibtoolLinker.java 7 May 2002 19:45:08 -0000 1.8
+++ LibtoolLinker.java 22 Sep 2003 09:15:12 -0000 1.9
@@ -54,15 +54,16 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.apache.jk.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.JkData;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.GlobPatternMapper;
/**
* Link using libtool.
1.7 +11 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java
Index: MsvcCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MsvcCompiler.java 9 Jun 2002 00:10:02 -0000 1.6
+++ MsvcCompiler.java 22 Sep 2003 09:15:12 -0000 1.7
@@ -54,14 +54,18 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-import org.apache.jk.ant.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.Def;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.GlobPatternMapper;
/**
* Compile using Microsoft Visual C++ v6.0
1.10 +5 -8
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java
Index: CcCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CcCompiler.java 22 May 2002 23:34:53 -0000 1.9
+++ CcCompiler.java 22 Sep 2003 09:15:12 -0000 1.10
@@ -54,15 +54,12 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+import java.io.File;
-import org.apache.jk.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.GlobPatternMapper;
/**
* Compile using Gcc.
1.7 +12 -8
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java
Index: MsvcLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MsvcLinker.java 9 Jun 2002 00:10:02 -0000 1.6
+++ MsvcLinker.java 22 Sep 2003 09:15:12 -0000 1.7
@@ -54,15 +54,19 @@
package org.apache.jk.ant.compilers;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.apache.jk.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.jk.ant.JkData;
+import org.apache.jk.ant.SoTask;
+import org.apache.jk.ant.Source;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.GlobPatternMapper;
/**
* Link using MSVC Linker
1.2 +2 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/Source.java
Index: Source.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/Source.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Source.java 10 Nov 2001 16:31:48 -0000 1.1
+++ Source.java 22 Sep 2003 09:15:12 -0000 1.2
@@ -54,14 +54,9 @@
package org.apache.jk.ant;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-import org.apache.jk.ant.compilers.*;
+import java.io.File;
-import java.io.*;
-import java.util.*;
+import org.apache.tools.ant.util.GlobPatternMapper;
public class Source {
File dir;
1.2 +1 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/JniConfig.java
Index: JniConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/JniConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JniConfig.java 26 Oct 2001 22:28:27 -0000 1.1
+++ JniConfig.java 22 Sep 2003 09:15:12 -0000 1.2
@@ -54,13 +54,7 @@
package org.apache.jk.ant;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.tools.ant.BuildException;
/* Base task for 'config guessers'.
* Each guesser will set properties based on OS, environment,
1.2 +1 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/ApacheConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheConfig.java 26 Oct 2001 22:28:27 -0000 1.1
+++ ApacheConfig.java 22 Sep 2003 09:15:12 -0000 1.2
@@ -54,13 +54,7 @@
package org.apache.jk.ant;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.tools.ant.BuildException;
/**
* Set preferences for compiling Apache modules.
1.3 +1 -7
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/JkData.java
Index: JkData.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/JkData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JkData.java 4 Apr 2003 20:17:52 -0000 1.2
+++ JkData.java 22 Sep 2003 09:15:12 -0000 1.3
@@ -54,13 +54,7 @@
package org.apache.jk.ant;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.*;
-
-import java.io.*;
-import java.util.*;
+import org.apache.tools.ant.Project;
/**
* Set platform specific data. Can be used to specify files (fileName="value")
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
