From 9f4642716c6149bfbb2c4b3ebfaa07807cac3617 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 8 May 2001 09:35:31 +0000
Subject: [PATCH] Assorted patches:

(1) make Ant JDK 1.4 aware
(2) improved <style> debugging
(3) bring DesirableFilter in line with defualt excludes
(4) use correct URL syntax in <get>'s unit test
(5) improve JavaDoc comments in Path.java
(6) description for test target in Ant's build file

Submitted by:	Jesse Glick <Jesse.Glick@netbeans.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269014 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                              |  2 +-
 src/etc/testcases/taskdefs/get.xml                     |  4 ++--
 src/main/org/apache/tools/ant/DesirableFilter.java     | 10 ++++++++++
 src/main/org/apache/tools/ant/Project.java             |  5 ++++-
 .../org/apache/tools/ant/taskdefs/XSLTProcess.java     |  2 ++
 src/main/org/apache/tools/ant/types/Path.java          |  8 ++++----
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 425df378d..1ebce5c5b 100644
--- a/build.xml
+++ b/build.xml
@@ -604,7 +604,7 @@
          Run testcase                                                        
        =================================================================== 
   -->
-  <target name="test" depends="run-tests"/>
+  <target name="test" depends="run-tests" description="--> run JUnit tests"/>
 
   <target name="run-tests" depends="dump-info,compile-tests" if="junit.present">
 
diff --git a/src/etc/testcases/taskdefs/get.xml b/src/etc/testcases/taskdefs/get.xml
index c731288dd..3c6c20cc6 100644
--- a/src/etc/testcases/taskdefs/get.xml
+++ b/src/etc/testcases/taskdefs/get.xml
@@ -19,11 +19,11 @@
   </target>
 
   <target name="test5">
-    <get src="http://www.apache.org" dest=""/>
+    <get src="http://www.apache.org/" dest=""/>
   </target>
 
   <target name="test6">
-    <get src="http://www.apache.org" dest="get.tmp"/>
+    <get src="http://www.apache.org/" dest="get.tmp"/>
   </target>
 
 </project>
diff --git a/src/main/org/apache/tools/ant/DesirableFilter.java b/src/main/org/apache/tools/ant/DesirableFilter.java
index 9b051b20c..af348343e 100644
--- a/src/main/org/apache/tools/ant/DesirableFilter.java
+++ b/src/main/org/apache/tools/ant/DesirableFilter.java
@@ -103,6 +103,16 @@ public class DesirableFilter implements FilenameFilter {
         if (name.equals(".cvsignore")){
             return false;
         }
+
+        // CVS merge autosaves.
+        if (name.startsWith(".#")) {
+            return false;
+        }
+
+        // SCCS/CSSC/TeamWare:
+        if (name.equals("SCCS")) {
+            return false;
+        }
     
         // default
         return true;
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 21df69c6b..f04b700ba 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -89,6 +89,7 @@ public class Project {
     public static final String JAVA_1_1 = "1.1";
     public static final String JAVA_1_2 = "1.2";
     public static final String JAVA_1_3 = "1.3";
+    public static final String JAVA_1_4 = "1.4";
 
     public static final String TOKEN_START = "@";
     public static final String TOKEN_END = "@";
@@ -126,6 +127,8 @@ public class Project {
             javaVersion = JAVA_1_2;
             Class.forName("java.lang.StrictMath");
             javaVersion = JAVA_1_3;
+            Class.forName("java.lang.CharSequence");
+            javaVersion = JAVA_1_4;
         } catch (ClassNotFoundException cnfe) {
             // swallow as we've hit the max class version that
             // we have
@@ -348,7 +351,7 @@ public class Project {
             throw new BuildException("Ant cannot work on Java 1.0");
         }
 
-        log("Detected Java Version: " + javaVersion, MSG_VERBOSE);
+        log("Detected Java version: " + javaVersion + " in: " + System.getProperty("java.home"), MSG_VERBOSE);
 
         log("Detected OS: " + System.getProperty("os.name"), MSG_VERBOSE);
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 5128a44fb..b68007a36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -330,6 +330,8 @@ public class XSLTProcess extends MatchingTask {
                     try {
                         setProcessor("xalan");
                     } catch (Throwable e3) {
+                        e2.printStackTrace();
+                        e3.printStackTrace();
                         throw new BuildException(e1);
                     }
                 }
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index 6241cf198..8ea80fc6c 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -106,7 +106,7 @@ public class Path extends DataType implements Cloneable {
 
 
     /**
-     * Helper class, holds the nested <pathelement> values.
+     * Helper class, holds the nested <code>&lt;pathelement&gt;</code> values.
      */
     public class PathElement {
         private String[] parts;
@@ -186,7 +186,7 @@ public class Path extends DataType implements Cloneable {
     }
 
     /**
-     * Creates the nested <pathelement> element.
+     * Creates the nested <code>&lt;pathelement&gt;</code> element.
      */
     public PathElement createPathElement() throws BuildException {
         if (isReference()) {
@@ -198,7 +198,7 @@ public class Path extends DataType implements Cloneable {
     }
 
     /**
-     * Adds a nested <fileset> element.
+     * Adds a nested <code>&lt;fileset&gt;</code> element.
      */
     public void addFileset(FileSet fs) throws BuildException {
         if (isReference()) {
@@ -209,7 +209,7 @@ public class Path extends DataType implements Cloneable {
     }
 
     /**
-     * Creates a nested <path> element.
+     * Creates a nested <code>&lt;path&gt;</code> element.
      */
     public Path createPath() throws BuildException {
         if (isReference()) {