ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bugzi...@apache.org
Subject DO NOT REPLY [Bug 22326] - [PATCH] remove deprecated / 1.1 issues all packages
Date Fri, 15 Aug 2003 11:32:47 GMT
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326

[PATCH] remove deprecated / 1.1 issues all packages

ant@kruithof.xs4all.nl changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|remove deprecated / 1.1     |[PATCH] remove deprecated /
                   |issues all packages except  |1.1 issues all packages
                   |for taskdefs                |



------- Additional Comments From ant@kruithof.xs4all.nl  2003-08-15 11:32 -------
I have updated the patch to 

1) remove the already applied parts

2) also include the taskdefs, except for the optional/sirtaka/Coverage one as I
cannot compile that package because of an lack of sirtaka, I have had a look at
all optional packages though and only found the sirtaka one. The Sirtaka one is
inline here.

3) Still to be done: testcode.

4) Files actually updated by the 4 th patch
main/org/apache/tools/ant/AntClassLoader.java
main/org/apache/tools/ant/Diagnostics.java
main/org/apache/tools/ant/Main.java
main/org/apache/tools/ant/Project.java
main/org/apache/tools/ant/ProjectHelper.java
main/org/apache/tools/ant/input/DefaultInputHandler.java
main/org/apache/tools/ant/taskdefs/Ant.java
main/org/apache/tools/ant/taskdefs/Available.java
main/org/apache/tools/ant/taskdefs/BuildNumber.java
main/org/apache/tools/ant/taskdefs/Classloader.java
main/org/apache/tools/ant/taskdefs/Concat.java
main/org/apache/tools/ant/taskdefs/Copy.java
main/org/apache/tools/ant/taskdefs/Execute.java
main/org/apache/tools/ant/taskdefs/Expand.java
main/org/apache/tools/ant/taskdefs/GenerateKey.java
main/org/apache/tools/ant/taskdefs/Get.java
main/org/apache/tools/ant/taskdefs/Javac.java
main/org/apache/tools/ant/taskdefs/Javadoc.java
main/org/apache/tools/ant/taskdefs/Manifest.java
main/org/apache/tools/ant/taskdefs/Move.java
main/org/apache/tools/ant/taskdefs/Parallel.java
main/org/apache/tools/ant/taskdefs/Property.java
main/org/apache/tools/ant/taskdefs/Redirector.java
main/org/apache/tools/ant/taskdefs/Replace.java
main/org/apache/tools/ant/taskdefs/SQLExec.java
main/org/apache/tools/ant/taskdefs/SignJar.java
main/org/apache/tools/ant/taskdefs/TempFile.java
main/org/apache/tools/ant/taskdefs/Touch.java
main/org/apache/tools/ant/taskdefs/Untar.java
main/org/apache/tools/ant/taskdefs/XSLTProcess.java
main/org/apache/tools/ant/taskdefs/Zip.java
main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
main/org/apache/tools/ant/taskdefs/optional/Javah.java
main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java
main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java
main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
main/org/apache/tools/ant/types/AbstractFileSet.java
main/org/apache/tools/ant/types/Path.java
main/org/apache/tools/ant/util/FileUtils.java
main/org/apache/tools/ant/util/LoaderUtils.java
main/org/apache/tools/ant/util/WeakishReference.java
main/org/apache/tools/ant/util/optional/WeakishReference12.java
main/org/apache/tools/zip/ZipEntry.java
main/org/apache/tools/zip/ZipOutputStream.java

Patch for sitraka only, unverified!:
Index: main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
retrieving revision 1.18
diff -u -r1.18 Coverage.java
--- main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java   25 Jul
2003 12:14:44 -0000      1.18
+++ main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java   15 Aug
2003 09:47:35 -0000
@@ -371,12 +371,10 @@
         // check for info, do your best to select the java executable.
         // JProbe 3.0 fails if there is no javaexe option. So
         if (javaExe == null && (vm == null || "java2".equals(vm))) {
-            if (!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
-                if (vm == null) {
-                    vm = "java2";
-                }
-                javaExe = new File(JavaEnvUtils.getJreExecutable("java"));
+            if (vm == null) {
+                vm = "java2";
             }
+            javaExe = new File(JavaEnvUtils.getJreExecutable("java"));
         }
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message