ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1045279 [11/12] - in /ant/core/branches/ANT_SITE: ./ docs/ docs/antlibs/ docs/antlibs/antunit/ docs/antlibs/compress/ docs/antlibs/dotnet/ docs/antlibs/props/ docs/antlibs/svn/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ doc...
Date Mon, 13 Dec 2010 18:34:09 GMT
Modified: ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/secure-input.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/secure-input.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/secure-input.xml (original)
+++ ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/secure-input.xml Mon Dec 13 18:34:00 2010
@@ -20,7 +20,6 @@
 	<import file="../antunit-base.xml"/>
 	
 	<target name="setUp">
-		<available property="jdk1.6+" classname="java.util.ServiceLoader"/>
 	</target>
 		
 	<target name="test-secure-input" if="jdk1.6+">

Modified: ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/zip-test.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/zip-test.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/zip-test.xml (original)
+++ ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/zip-test.xml Mon Dec 13 18:34:00 2010
@@ -122,4 +122,36 @@
       <au:assertDestIsOutofdate src="${output}/jar.jar"
                                dest="${output}/reference.jar"/>
     </target>
+
+    <target name="testFilesetInsideResources"
+            description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50115">
+      <mkdir dir="${input}/test2"/>
+      <touch file="${input}/test1.txt"/>
+      <mkdir dir="${output}"/>
+      <mkdir dir="${output}/expand"/>
+      <zip destfile="${output}/test.zip" whenempty="skip">
+        <resources>
+          <fileset dir="${input}" includes="test**"/>
+        </resources>
+      </zip>
+      <au:assertLogDoesntContain text="skipping zip archive"/>
+      <unzip src="${output}/test.zip" dest="${output}/expand"/>
+      <au:assertFileExists file="${output}/expand/test1.txt"/>
+      <!--au:assertFileExists file="${output}/expand/test2"/-->
+    </target>
+
+    <target name="testWhenEmptyChecksNonFileSets"
+            description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50115">
+      <mkdir dir="${input}/"/>
+      <touch file="${input}/test1.txt"/>
+      <mkdir dir="${output}"/>
+      <mkdir dir="${output}/expand"/>
+      <zip destfile="${output}/test.zip" whenempty="fail">
+        <resources>
+          <fileset dir="${input}" includes="test**"/>
+        </resources>
+      </zip>
+      <unzip src="${output}/test.zip" dest="${output}/expand"/>
+      <au:assertFileExists file="${output}/expand/test1.txt"/>
+    </target>
 </project>

Modified: ant/core/branches/ANT_SITE/src/tests/antunit/types/path-test.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/antunit/types/path-test.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/antunit/types/path-test.xml (original)
+++ ant/core/branches/ANT_SITE/src/tests/antunit/types/path-test.xml Mon Dec 13 18:34:00 2010
@@ -39,4 +39,13 @@
     </path>
   </target>
 
+  <target name="test-wildcard"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=46842">
+    <path id="with-wildcard">
+      <pathelement location="*"/>
+    </path>
+    <au:assertEquals expected="${basedir}${file.separator}*"
+                     actual="${toString:with-wildcard}"/>
+  </target>
+
 </project>

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java Mon Dec 13 18:34:00 2010
@@ -21,7 +21,6 @@ package org.apache.tools.ant;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java Mon Dec 13 18:34:00 2010
@@ -31,24 +31,24 @@ public class DefaultLoggerTest extends T
     private static String msg(Throwable error, boolean verbose) {
         StringBuffer m = new StringBuffer();
         DefaultLogger.throwableMessage(m, error, verbose);
-        return m.toString().replace(StringUtils.LINE_SEP.charAt(0), '\n');
+        return m.toString();
     }
 
     public void testThrowableMessage() throws Exception { // #43398
         BuildException be = new BuildException("oops", new Location("build.xml", 1, 0));
         assertEquals(
-                "build.xml:1: oops\n",
+                "build.xml:1: oops" + StringUtils.LINE_SEP,
                 msg(be, false));
         be = ProjectHelper.addLocationToBuildException(be, new Location("build.xml", 2, 0));
         assertEquals(
-                "build.xml:2: The following error occurred while executing this line:\n" +
-                "build.xml:1: oops\n",
+                "build.xml:2: The following error occurred while executing this line:" + StringUtils.LINE_SEP +
+                "build.xml:1: oops" + StringUtils.LINE_SEP,
                 msg(be, false));
         be = ProjectHelper.addLocationToBuildException(be, new Location("build.xml", 3, 0));
         assertEquals(
-                "build.xml:3: The following error occurred while executing this line:\n" +
-                "build.xml:2: The following error occurred while executing this line:\n" +
-                "build.xml:1: oops\n",
+                "build.xml:3: The following error occurred while executing this line:" + StringUtils.LINE_SEP +
+                "build.xml:2: The following error occurred while executing this line:" + StringUtils.LINE_SEP +
+                "build.xml:1: oops" + StringUtils.LINE_SEP,
                 msg(be, false));
         Exception x = new Exception("problem") {
             public void printStackTrace(PrintWriter w) {
@@ -57,19 +57,19 @@ public class DefaultLoggerTest extends T
             }
         };
         assertEquals(
-                "problem\n" +
-                "  at p.C.m\n",
+                "problem" + StringUtils.LINE_SEP +
+                "  at p.C.m" + StringUtils.LINE_SEP,
                 msg(x, false));
         be = new BuildException(x, new Location("build.xml", 1, 0));
         assertEquals(
-                "build.xml:1: problem\n" +
-                "  at p.C.m\n",
+                "build.xml:1: problem" + StringUtils.LINE_SEP +
+                "  at p.C.m" + StringUtils.LINE_SEP,
                 msg(be, false));
         be = ProjectHelper.addLocationToBuildException(be, new Location("build.xml", 2, 0));
         assertEquals(
-                "build.xml:2: The following error occurred while executing this line:\n" +
-                "build.xml:1: problem\n" +
-                "  at p.C.m\n",
+                "build.xml:2: The following error occurred while executing this line:" + StringUtils.LINE_SEP +
+                "build.xml:1: problem" + StringUtils.LINE_SEP +
+                "  at p.C.m" + StringUtils.LINE_SEP,
                 msg(be, false));
     }
 

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java Mon Dec 13 18:34:00 2010
@@ -19,10 +19,9 @@
 package org.apache.tools.ant;
 
 import org.apache.tools.ant.taskdefs.condition.Os;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.types.selectors.TokenizedPath;
 import org.apache.tools.ant.util.SymbolicLinkUtils;
 
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
@@ -555,4 +554,15 @@ public class DirectoryScannerTest extend
                    files.contains("alpha/beta/gamma/gamma.xml"
                                   .replace('/', File.separatorChar)));
     }
+
+    public void testContentsExcluded() {
+        DirectoryScanner ds = new DirectoryScanner();
+        ds.setBasedir(new File("."));
+        ds.setIncludes(new String[] {"**"});
+        ds.addDefaultExcludes();
+        ds.ensureNonPatternSetsReady();
+        File f = new File(".svn");
+        TokenizedPath p = new TokenizedPath(f.getAbsolutePath());
+        assertTrue(ds.contentsExcluded(p));
+    }
 }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java Mon Dec 13 18:34:00 2010
@@ -137,7 +137,9 @@ public class LocatorTest extends TestCas
      */
     public void testAntOnRemoteShare() throws Throwable {
         String resolved=Locator.fromJarURI(SHARED_JAR_URI);
-        assertResolved(SHARED_JAR_URI, LAUNCHER_JAR,resolved,true);
+        assertResolved(SHARED_JAR_URI, LAUNCHER_JAR, resolved, unix);
+        assertResolved(SHARED_JAR_URI, LAUNCHER_JAR.replace('/', '\\'),
+                       resolved, windows);
     }
 
     /**
@@ -147,8 +149,7 @@ public class LocatorTest extends TestCas
      */
     public void testFileFromRemoteShare() throws Throwable {
         String resolved = Locator.fromJarURI(SHARED_JAR_URI);
-        assertResolved(SHARED_JAR_URI, LAUNCHER_JAR, resolved, true);
-        File f=new File(resolved);
+        File f = new File(resolved);
         String path = f.getAbsolutePath();
         if (windows) {
             assertEquals(0, path.indexOf("\\\\"));

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java Mon Dec 13 18:34:00 2010
@@ -101,7 +101,6 @@ public class AntTest extends BuildFileTe
     public void testDoNotInheritBasedir() {
         File dir1 = getProjectDir();
         File dir2 = project.resolveFile("ant");
-        String basedir = getProjectDir().getAbsolutePath();
         testBaseDirs("doNotInheritBasedir",
                      new String[] {dir1.getAbsolutePath(),
                                    dir2.getAbsolutePath()

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java Mon Dec 13 18:34:00 2010
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.bzip2.CBZip2InputStream;
 
 import java.io.BufferedInputStream;
@@ -32,9 +31,6 @@ import java.io.IOException;
  */
 public class BZip2Test extends BuildFileTest {
 
-    /** Utilities used for file operations */
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
     public BZip2Test(String name) {
         super(name);
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java Mon Dec 13 18:34:00 2010
@@ -178,6 +178,13 @@ public class ConcatTest
         assertEquals(size, 0);
     }
 
+    public void testOverwrite() {
+        executeTarget("testoverwrite");
+        File file2 = new File(getProjectDir(), tempFile2);
+        long size = file2.length();
+        assertTrue(size > 0);
+    }
+
     public void testheaderfooter() {
         test3();
         expectLog("testheaderfooter", "headerHello, World!footer");

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java Mon Dec 13 18:34:00 2010
@@ -53,6 +53,20 @@ public class DefaultExcludesTest extends
                           "**/vssver.scc",
                           "**/.svn",
                           "**/.svn/**",
+                          "**/.git",
+                          "**/.git/**",
+                          "**/.gitattributes",
+                          "**/.gitignore",
+                          "**/.gitmodules",
+                          "**/.hg",
+                          "**/.hg/**",
+                          "**/.hgignore",
+                          "**/.hgsub",
+                          "**/.hgsubstate",
+                          "**/.hgtags",
+                          "**/.bzr",
+                          "**/.bzr/**",
+                          "**/.bzrignore",
                           "**/.DS_Store"};
         project.executeTarget("test1");
         assertEquals("current default excludes", expected, DirectoryScanner.getDefaultExcludes());
@@ -74,6 +88,20 @@ public class DefaultExcludesTest extends
                           "**/vssver.scc",
                           "**/.svn",
                           "**/.svn/**",
+                          "**/.git",
+                          "**/.git/**",
+                          "**/.gitattributes",
+                          "**/.gitignore",
+                          "**/.gitmodules",
+                          "**/.hg",
+                          "**/.hg/**",
+                          "**/.hgignore",
+                          "**/.hgsub",
+                          "**/.hgsubstate",
+                          "**/.hgtags",
+                          "**/.bzr",
+                          "**/.bzr/**",
+                          "**/.bzrignore",
                           "**/.DS_Store",
                           "foo"};
         project.executeTarget("test2");
@@ -96,6 +124,20 @@ public class DefaultExcludesTest extends
                           "**/vssver.scc",
                           "**/.svn",
                           "**/.svn/**",
+                          "**/.git",
+                          "**/.git/**",
+                          "**/.gitattributes",
+                          "**/.gitignore",
+                          "**/.gitmodules",
+                          "**/.hg",
+                          "**/.hg/**",
+                          "**/.hgignore",
+                          "**/.hgsub",
+                          "**/.hgsubstate",
+                          "**/.hgtags",
+                          "**/.bzr",
+                          "**/.bzr/**",
+                          "**/.bzrignore",
                           "**/.DS_Store"};
         project.executeTarget("test3");
         assertEquals("current default excludes", expected, DirectoryScanner.getDefaultExcludes());

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java Mon Dec 13 18:34:00 2010
@@ -21,10 +21,14 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 
 import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.input.DefaultInputHandler;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.TeeOutputStream;
 
@@ -58,7 +62,6 @@ public class JavaTest extends BuildFileT
         //final String propname="tests-classpath.value";
         //String testClasspath=System.getProperty(propname);
         //System.out.println("Test cp="+testClasspath);
-        String propname="tests-classpath.value";
         String runFatal=System.getProperty("junit.run.fatal.tests");
         if(runFatal!=null)
             runFatalTests=true;
@@ -214,6 +217,49 @@ public class JavaTest extends BuildFileT
         executeTarget("redirector2");
     }
 
+    public void testReleasedInput() throws Exception {
+        PipedOutputStream out = new PipedOutputStream();
+        final PipedInputStream in = new PipedInputStream(out);
+        project.setInputHandler(new DefaultInputHandler() {
+            protected InputStream getInputStream() {
+                return in;
+            }
+        });
+        project.setDefaultInputStream(in);
+
+        Java java = new Java();
+        java.setProject(project);
+        java.setClassname("org.apache.tools.ant.Main");
+        java.setArgs("-version");
+        java.setFork(true);
+        // note: due to the missing classpath it will fail, but the input stream
+        // reader will be read
+        java.execute();
+
+        Thread inputThread = new Thread(new Runnable() {
+            public void run() {
+                Input input = new Input();
+                input.setProject(project);
+                input.setAddproperty("input.value");
+                input.execute();
+            }
+        });
+        inputThread.start();
+
+        // wait a little bit for the task to wait for input
+        Thread.sleep(100);
+
+        // write some stuff in the input stream to be catched by the input task
+        out.write("foo\n".getBytes());
+        out.flush();
+        out.write("bar\n".getBytes());
+        out.flush();
+
+        inputThread.join(2000);
+
+        assertEquals("foo", project.getProperty("input.value"));
+    }
+
     /**
      * entry point class with no dependencies other
      * than normal JRE runtime
@@ -317,6 +363,7 @@ public class JavaTest extends BuildFileT
             }
             if (os != null) {
                 Thread t = new Thread(new StreamPumper(System.in, os, true));
+                t.setName("PipeEntryPoint " + args[0]);
                 t.start();
                 try {
                     t.join();

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java Mon Dec 13 18:34:00 2010
@@ -85,7 +85,6 @@ public class MakeUrlTest extends BuildFi
     public void testFileset() {
         executeTarget("testFileset");
         assertPropertyContains("testFileset", ".xml ");
-        String result = getProperty("testFileset");
         assertPropertyEndsWith("testFileset", ".xml");
     }
 

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java Mon Dec 13 18:34:00 2010
@@ -24,6 +24,7 @@ import java.sql.DriverPropertyInfo;
 import java.util.Properties;
 import java.io.File;
 import java.net.URL;
+import java.util.logging.Logger;
 
 import junit.framework.TestCase;
 
@@ -232,6 +233,10 @@ public class SQLExecTest extends TestCas
         public boolean jdbcCompliant() {
             return false;
         }
+
+        public Logger getParentLogger() /*throws SQLFeatureNotSupportedException*/ {
+            return Logger.getAnonymousLogger();
+        }
     }
 
     public void testLastDelimiterPositionNormalModeStrict() {

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java Mon Dec 13 18:34:00 2010
@@ -46,14 +46,11 @@ public class SignJarTest extends BuildFi
 
     /**
      * check for being offline
-     * @return true iff the system property "offline" is "true"
+     * @return true if the system property "offline" is "true"
      */
     private boolean isOffline() {
         return Boolean.getBoolean("offline");
     }
-    public void testBasicSigning() {
-        executeTarget("basic");
-    }
 
     public void testSigFile() {
         executeTarget("sigfile");
@@ -91,10 +88,6 @@ public class SignJarTest extends BuildFi
         }
     }
 
-    public void testMaxMemory() {
-        executeTarget("maxmemory");
-    }
-
     public void testURLKeystoreFile() {
         executeTarget("urlKeystoreFile");
     }
@@ -105,104 +98,6 @@ public class SignJarTest extends BuildFi
         }
     }
 
-    public void testPreserveLastModified() {
-        executeTarget("preserveLastModified");
-    }
-
-    public void testFileset() {
-        executeTarget("testFileset");
-    }
-
-    public void testFilesetAndJar() {
-        executeTarget("testFilesetAndJar");
-    }
-
-    public void testFilesetAndSignedJar() {
-        expectBuildExceptionContaining("testFilesetAndSignedJar",
-                "incompatible attributes",
-                SignJar.ERROR_SIGNEDJAR_AND_PATHS);
-    }
-
-    public void testPath() {
-        executeTarget("testPath");
-    }
-
-    public void testPathAndJar() {
-        executeTarget("testPathAndJar");
-    }
-
-    public void testPathAndSignedJar() {
-        expectBuildExceptionContaining("testPathAndSignedJar",
-                "incompatible attributes",
-                SignJar.ERROR_SIGNEDJAR_AND_PATHS);
-    }
-
-    public void testSignedJar() {
-        executeTarget("testSignedJar");
-    }
-
-    public void testDestDir() {
-        executeTarget("testDestDir");
-    }
-
-    public void testDestDirAndSignedJar() {
-        expectBuildExceptionContaining("testFilesetAndSignedJar",
-                "incompatible attributes",
-                SignJar.ERROR_SIGNEDJAR_AND_PATHS);
-    }
-
-    public void testDestDirAndSignedJar2() {
-        expectBuildExceptionContaining("testPathAndSignedJar",
-                "incompatible attributes",
-                SignJar.ERROR_SIGNEDJAR_AND_PATHS);
-    }
-
-    public void testDestDirFileset() {
-        executeTarget("testDestDirFileset");
-    }
-
-    public void testMapperFileset() {
-        executeTarget("testMapperFileset");
-    }
-
-    public void testDestDirPath() {
-        executeTarget("testDestDirPath");
-    }
-
-    public void testMapperPath() {
-        executeTarget("testMapperPath");
-    }
-
-    public void testMapperNoDest() {
-        expectBuildExceptionContaining("testMapperNoDest",
-                "two mappers",
-                SignJar.ERROR_MAPPER_WITHOUT_DEST);
-    }
-
-    public void testTwoMappers() {
-        expectBuildExceptionContaining("testTwoMappers",
-                "two mappers",
-                SignJar.ERROR_TOO_MANY_MAPPERS);
-    }
-
-    public void testNoAlias() {
-        expectBuildExceptionContaining("testNoAlias",
-                "no alias",
-                SignJar.ERROR_NO_ALIAS);
-    }
-
-    public void testNoFiles() {
-        expectBuildExceptionContaining("testNoFiles",
-                "no files",
-                SignJar.ERROR_NO_SOURCE);
-    }
-
-    public void testNoStorePass() {
-        expectBuildExceptionContaining("testNoStorePass",
-                "no password",
-                SignJar.ERROR_NO_STOREPASS);
-    }
-
     public void testTsaLocalhost() {
         //only test on java1.5+
         if(JavaEnvUtils.getJavaVersionNumber()>=15) {
@@ -212,38 +107,24 @@ public class SignJarTest extends BuildFi
         }
     }
 
-    public void testSysProperty() {
-        executeTarget("testSysProperty");
-    }
-
-    public void testVerifyJar() {
-        executeTarget("testVerifyJar");
-    }
-
-    public void testVerifyNoArgs() {
-        expectBuildExceptionContaining("testVerifyNoArgs",
-                "no args",
-                AbstractJarSignerTask.ERROR_NO_SOURCE);
-    }
-
-    public void testVerifyJarUnsigned() {
-        expectBuildExceptionContaining("testVerifyJarUnsigned",
-                "unsigned JAR file",
-                VerifyJar.ERROR_NO_VERIFY);
-    }
-
-    public void NotestVerifyJarNotInKeystore() {
-        expectBuildExceptionContaining("testVerifyJarNotInKeystore",
-                "signature not in keystore",
-                VerifyJar.ERROR_NO_VERIFY);
-    }
-
-    public void testVerifyFileset() {
-        executeTarget("testVerifyFileset");
-    }
-
-    public void testVerifyPath() {
-        executeTarget("testVerifyPath");
+    /**
+     * @see https://issues.apache.org/bugzilla/show_bug.cgi?id=50081
+     */
+    public void testSignUnnormalizedJar() throws Exception {
+        executeTarget("jar");
+        File testJar = new File(getProject().getProperty("test.jar"));
+        File testJarParent = testJar.getParentFile();
+        File f = new File(testJarParent,
+                          "../" + testJarParent.getName() + "/"
+                          + testJar.getName());
+        assertFalse(testJar.equals(f));
+        assertEquals(testJar.getCanonicalPath(), f.getCanonicalPath());
+        SignJar s = new SignJar();
+        s.setProject(getProject());
+        s.setJar(f);
+        s.setAlias("testonly");
+        s.setStorepass("apacheant");
+        s.setKeystore("testkeystore");
+        s.execute();
     }
-
 }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java Mon Dec 13 18:34:00 2010
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.Reader;
 
 import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.taskdefs.optional.XsltTest;
 import org.apache.tools.ant.util.FileUtils;
 
 

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java Mon Dec 13 18:34:00 2010
@@ -17,8 +17,6 @@
  */
 package org.apache.tools.ant.taskdefs.condition;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 
 /**

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java Mon Dec 13 18:34:00 2010
@@ -43,7 +43,6 @@ public class EchoPropertiesTest extends 
     private static final String GOOD_OUTFILE_XML = "test.xml";
     private static final String PREFIX_OUTFILE = "test-prefix.properties";
     private static final String TEST_VALUE = "isSet";
-    private static final String BAD_OUTFILE = ".";
 
     public EchoPropertiesTest(String name) {
         super(name);

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java Mon Dec 13 18:34:00 2010
@@ -45,18 +45,21 @@ public class JUnitTestListenerTest exten
     }
 
     public void testFullLogOutput() {
+        getProject().setProperty("enableEvents", "true");
         executeTarget(PASS_TEST_TARGET);
         assertTrue("expecting full log to have BuildListener events", 
                    hasBuildListenerEvents(getFullLog()));
     }
     
     public void testNoLogOutput() {
+        getProject().setProperty("enableEvents", "true");
         executeTarget(PASS_TEST_TARGET);
         assertFalse("expecting log to not have BuildListener events", 
                     hasBuildListenerEvents(getLog()));
     }
 
     public void testTestCountFired() {
+        getProject().setProperty("enableEvents", "true");
         executeTarget(PASS_TEST_TARGET);
 	assertTrue("expecting test count message",
 		   hasEventMessage(JUnitTask.TESTLISTENER_PREFIX + 
@@ -64,6 +67,7 @@ public class JUnitTestListenerTest exten
     }
     
     public void testStartTestFired() {
+        getProject().setProperty("enableEvents", "true");
         executeTarget(PASS_TEST_TARGET);
 	assertTrue("expecting test started message",
 		   hasEventMessage(JUnitTask.TESTLISTENER_PREFIX + 
@@ -71,12 +75,34 @@ public class JUnitTestListenerTest exten
     }
     
     public void testEndTestFired() {
+        getProject().setProperty("enableEvents", "true");
         executeTarget(PASS_TEST_TARGET);
 	assertTrue("expecting test ended message",
 		   hasEventMessage(JUnitTask.TESTLISTENER_PREFIX + 
 				   "endTest(" + PASS_TEST + ")"));
     }
     
+    public void testNoFullLogOutputByDefault() {
+        executeTarget(PASS_TEST_TARGET);
+        assertFalse("expecting full log to not have BuildListener events", 
+                    hasBuildListenerEvents(getFullLog()));
+    }
+    
+    public void testFullLogOutputMagicProperty() {
+        getProject().setProperty(JUnitTask.ENABLE_TESTLISTENER_EVENTS, "true");
+        executeTarget(PASS_TEST_TARGET);
+        assertTrue("expecting full log to have BuildListener events", 
+                   hasBuildListenerEvents(getFullLog()));
+    }
+    
+    public void testNoFullLogOutputMagicPropertyWins() {
+        getProject().setProperty(JUnitTask.ENABLE_TESTLISTENER_EVENTS, "false");
+        getProject().setProperty("enableEvents", "true");
+        executeTarget(PASS_TEST_TARGET);
+        assertFalse("expecting full log to not have BuildListener events", 
+                    hasBuildListenerEvents(getFullLog()));
+    }
+    
     private boolean hasBuildListenerEvents(String log) {
         return log.indexOf(JUnitTask.TESTLISTENER_PREFIX) >= 0;
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java Mon Dec 13 18:34:00 2010
@@ -33,6 +33,22 @@ public class JUnitTestRunnerTest extends
         super(name);
     }
 
+    // check that a valid method name generates no errors
+    public void testValidMethod(){
+        TestRunner runner = createRunnerForTestMethod(ValidMethodTestCase.class,"testA");
+        runner.run();
+        assertEquals(runner.getFormatter().getError(), JUnitTestRunner.SUCCESS, runner.getRetCode());
+    }
+
+    // check that having an invalid method name generates an error
+    public void testInvalidMethod(){
+        TestRunner runner = createRunnerForTestMethod(InvalidMethodTestCase.class,"testInvalid");
+        runner.run();
+        String error = runner.getFormatter().getError();
+        // might be FAILURES or ERRORS depending on JUnit version?
+        assertTrue(error, runner.getRetCode() != JUnitTestRunner.SUCCESS);
+    }    
+    
     // check that having no suite generates no errors
     public void testNoSuite(){
         TestRunner runner = createRunner(NoSuiteTestCase.class);
@@ -87,14 +103,22 @@ public class JUnitTestRunnerTest extends
     }
 
     protected TestRunner createRunner(Class clazz){
-        return new TestRunner(new JUnitTest(clazz.getName()), true, true, true);
+        return new TestRunner(new JUnitTest(clazz.getName()), null, 
+                                            true, true, true);
     }
 
+    protected TestRunner createRunnerForTestMethod(Class clazz, String method){
+        return new TestRunner(new JUnitTest(clazz.getName()), new String[] {method},
+                                            true, true, true);
+    }    
+    
     // the test runner that wrap the dummy formatter that interests us
     private final static class TestRunner extends JUnitTestRunner {
         private ResultFormatter formatter = new ResultFormatter();
-        TestRunner(JUnitTest test, boolean haltonerror, boolean filtertrace, boolean haltonfailure){
-            super(test, haltonerror, filtertrace,  haltonfailure, TestRunner.class.getClassLoader());
+        TestRunner(JUnitTest test, String[] methods, boolean haltonerror,
+                   boolean filtertrace, boolean haltonfailure){
+            super(test, methods, haltonerror, filtertrace,  haltonfailure, 
+                  false, false, TestRunner.class.getClassLoader());
             // use the classloader that loaded this class otherwise
             // it will not be able to run inner classes if this test
             // is ran in non-forked mode.
@@ -133,6 +157,24 @@ public class JUnitTestRunnerTest extends
     public static class NoTestCase {
     }
 
+    public static class InvalidMethodTestCase extends TestCase {
+        public InvalidMethodTestCase(String name){ super(name); }
+        public void testA(){
+            throw new NullPointerException("thrown on purpose");
+        }
+    }
+
+    public static class ValidMethodTestCase extends TestCase {
+        public ValidMethodTestCase(String name){ super(name); }
+        public void testA(){
+            // expected to be executed
+        }
+        public void testB(){
+            // should not be executed
+            throw new NullPointerException("thrown on purpose");
+        }
+    }    
+    
     public static class InvalidTestCase extends TestCase {
         public InvalidTestCase(String name){
             super(name);

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java Mon Dec 13 18:34:00 2010
@@ -38,7 +38,7 @@ public class SplashScreenTest {
 
         // give it some time to display
         try {
-            Thread.currentThread().sleep(2000);
+            Thread.sleep(2000);
         } catch (InterruptedException e) {
         } // end of try-catch
 
@@ -46,7 +46,7 @@ public class SplashScreenTest {
         System.err.println("finished");
 
         try {
-            Thread.currentThread().sleep(2000);
+            Thread.sleep(2000);
         } catch (InterruptedException e) {
         } // end of try-catch
         System.err.println("exiting");

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java Mon Dec 13 18:34:00 2010
@@ -38,13 +38,11 @@ public class MSVSSTest extends BuildFile
 
     private Commandline commandline;
 
-    private static final String VSS_SERVER_PATH = "\\\\server\\vss\\srcsafe.ini";
     private static final String VSS_PROJECT_PATH = "/SourceRoot/Project";
     private static final String DS_VSS_PROJECT_PATH = "$/SourceRoot/Project";
     private static final String VSS_USERNAME = "ant";
     private static final String VSS_PASSWORD = "rocks";
     private static final String LOCAL_PATH = "testdir";
-    private static final String SRC_FILE = "Class1.java";
     private static final String SRC_LABEL = "label1";
     private static final String LONG_LABEL = "123456789012345678901234567890";
     private static final String SRC_COMMENT = "I fixed a bug";

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -19,13 +19,8 @@
 package org.apache.tools.ant.types.selectors;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Parameter;
 
-import java.text.SimpleDateFormat;
-import java.text.ParsePosition;
-import java.util.Date;
-
 
 /**
  * Tests Date Selectors.
@@ -33,8 +28,6 @@ import java.util.Date;
  */
 public class DateSelectorTest extends BaseSelectorTest {
 
-    private Project project;
-
     public DateSelectorTest(String name) {
         super(name);
     }
@@ -175,8 +168,6 @@ public class DateSelectorTest extends Ba
 
             s = (DateSelector)getInstance();
             s.setDatetime("11/21/2001 4:55 AM");
-            SimpleDateFormat formatter = new SimpleDateFormat();
-            Date d = formatter.parse("11/21/2001 4:55 AM",new ParsePosition(0));
 
             long milliseconds = s.getMillis();
             s.setWhen(equal);

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.types.selectors;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Mapper;
 
 import java.io.File;
@@ -31,8 +30,6 @@ import java.io.File;
  */
 public class DependSelectorTest extends BaseSelectorTest {
 
-    private Project project;
-
     public DependSelectorTest(String name) {
         super(name);
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.types.selectors;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Parameter;
 
 /**
@@ -28,8 +27,6 @@ import org.apache.tools.ant.types.Parame
  */
 public class DepthSelectorTest extends BaseSelectorTest {
 
-    private Project project;
-
     public DepthSelectorTest(String name) {
         super(name);
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.types.selectors;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Parameter;
 
 /**
@@ -28,8 +27,6 @@ import org.apache.tools.ant.types.Parame
  */
 public class FilenameSelectorTest extends BaseSelectorTest {
 
-    private Project project;
-
     public FilenameSelectorTest(String name) {
         super(name);
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -55,9 +55,6 @@ public class ModifiedSelectorTest extend
     //  =====================  attributes  =====================
 
 
-    /** Package of the CacheSelector classes. */
-    private static String pkg = "org.apache.tools.ant.types.selectors.modifiedselector";
-
     /** Path where the testclasses are. */
     private Path testclasses = null;
 
@@ -459,7 +456,7 @@ public class ModifiedSelectorTest extend
         // clear the cache
         cache.delete();
         Iterator it3 = cache.iterator();
-        assertFalse("Cache is not empty", it1.hasNext());
+        assertFalse("Cache is not empty", it3.hasNext());
     }
 
 

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.types.selectors;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Mapper;
 
 import java.io.File;
@@ -31,8 +30,6 @@ import java.io.File;
  */
 public class PresentSelectorTest extends BaseSelectorTest {
 
-    private Project project;
-
     public PresentSelectorTest(String name) {
         super(name);
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java Mon Dec 13 18:34:00 2010
@@ -20,7 +20,6 @@ package org.apache.tools.ant.types.selec
 
 import java.util.Locale;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Parameter;
 
 /**
@@ -29,8 +28,6 @@ import org.apache.tools.ant.types.Parame
  */
 public class SizeSelectorTest extends BaseSelectorTest {
 
-    private Project project;
-
     public SizeSelectorTest(String name) {
         super(name);
     }

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java Mon Dec 13 18:34:00 2010
@@ -53,21 +53,55 @@ public class DOMElementWriterTest extend
     }
 
     public void testEncode() {
-        assertEquals("&#20;", w.encode("&#20;"));
-        assertEquals("&#x20;", w.encode("&#x20;"));
-        assertEquals("&#xA0;", w.encode("&#xA0;"));
+        assertEquals("&amp;#20;", w.encode("&#20;"));
+        assertEquals("&amp;#x20;", w.encode("&#x20;"));
+        assertEquals("&amp;#xA0;", w.encode("&#xA0;"));
         assertEquals("&amp;#A0;", w.encode("&#A0;"));
         assertEquals("20;", w.encode("20;"));
         assertEquals("&amp;#20", w.encode("&#20"));
-        assertEquals("&quot;", w.encode("&quot;"));
-        assertEquals("&apos;", w.encode("&apos;"));
-        assertEquals("&gt;", w.encode("&gt;"));
-        assertEquals("&lt;", w.encode("&lt;"));
-        assertEquals("&amp;", w.encode("&amp;"));
+        assertEquals("&amp;quot;", w.encode("&quot;"));
+        assertEquals("&amp;apos;", w.encode("&apos;"));
+        assertEquals("&amp;gt;", w.encode("&gt;"));
+        assertEquals("&amp;lt;", w.encode("&lt;"));
+        assertEquals("&amp;amp;", w.encode("&amp;"));
         assertEquals("&quot;", w.encode("\""));
         assertEquals("&lt;", w.encode("<"));
         assertEquals("&amp;", w.encode("&"));
         assertEquals("", w.encode("\u0017"));
+        assertEquals("\r\n\t", w.encode("\r\n\t"));
+    }
+
+    public void testEncodeAttributeValue() {
+        assertEquals("&amp;#20;", w.encodeAttributeValue("&#20;"));
+        assertEquals("&amp;#x20;", w.encodeAttributeValue("&#x20;"));
+        assertEquals("&amp;#xA0;", w.encodeAttributeValue("&#xA0;"));
+        assertEquals("&amp;#A0;", w.encodeAttributeValue("&#A0;"));
+        assertEquals("20;", w.encodeAttributeValue("20;"));
+        assertEquals("&amp;#20", w.encodeAttributeValue("&#20"));
+        assertEquals("&amp;quot;", w.encodeAttributeValue("&quot;"));
+        assertEquals("&amp;apos;", w.encodeAttributeValue("&apos;"));
+        assertEquals("&amp;gt;", w.encodeAttributeValue("&gt;"));
+        assertEquals("&amp;lt;", w.encodeAttributeValue("&lt;"));
+        assertEquals("&amp;amp;", w.encodeAttributeValue("&amp;"));
+        assertEquals("&quot;", w.encodeAttributeValue("\""));
+        assertEquals("&lt;", w.encodeAttributeValue("<"));
+        assertEquals("&amp;", w.encodeAttributeValue("&"));
+        assertEquals("", w.encodeAttributeValue("\u0017"));
+        assertEquals("&#xd;&#xa;&#x9;", w.encodeAttributeValue("\r\n\t"));
+    }
+
+    public void testAttributeWithWhitespace() throws IOException {
+        Document d = DOMUtils.newDocument();
+        Element root = d.createElement("root");
+        root.setAttribute("foo", "bar\nbaz");
+        StringWriter sw = new StringWriter();
+        DOMElementWriter w = new DOMElementWriter();
+        w.write(root, sw, 0, "  ");
+        assertEquals("<root foo=\"bar&#xa;baz\" />" + StringUtils.LINE_SEP,
+                     sw.toString());
+    }
+
+    public void testEncodeData() {
         assertEquals("&#20;\"20;&", w.encodedata("&#20;\"20;&"));
         assertEquals("", w.encodedata("\u0017"));
     }
@@ -90,11 +124,11 @@ public class DOMElementWriterTest extend
     public void testCDATAEndEncoding() {
         assertEquals("]>", w.encodedata("]>"));
         assertEquals("]]", w.encodedata("]]"));
-        assertEquals("&#x5d;&#x5d;&gt;", w.encodedata("]]>"));
-        assertEquals("&#x5d;&#x5d;&gt;A", w.encodedata("]]>A"));
-        assertEquals("A&#x5d;&#x5d;&gt;", w.encodedata("A]]>"));
-        assertEquals("A&#x5d;&#x5d;&gt;A", w.encodedata("A]]>A"));
-        assertEquals("A&#x5d;&#x5d;&gt;B&#x5d;&#x5d;&gt;C",
+        assertEquals("]]]]><![CDATA[>", w.encodedata("]]>"));
+        assertEquals("]]]]><![CDATA[>A", w.encodedata("]]>A"));
+        assertEquals("A]]]]><![CDATA[>", w.encodedata("A]]>"));
+        assertEquals("A]]]]><![CDATA[>A", w.encodedata("A]]>A"));
+        assertEquals("A]]]]><![CDATA[>B]]]]><![CDATA[>C",
                      w.encodedata("A]]>B]]>C"));
     }
 

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java Mon Dec 13 18:34:00 2010
@@ -125,15 +125,13 @@ public class LineOrientedOutputStreamTes
     private class DummyStream extends LineOrientedOutputStream {
         private boolean invoked;
         protected void processLine(String line) {
-            LineOrientedOutputStreamTest.this.assertFalse("Only one line",
-                                                          invoked);
-            LineOrientedOutputStreamTest.this.assertEquals(LINE, line);
+            assertFalse("Only one line", invoked);
+            assertEquals(LINE, line);
             invoked = true;
         }
 
         private void assertInvoked() {
-            LineOrientedOutputStreamTest.this.assertTrue("At least one line",
-                                                          invoked);
+            assertTrue("At least one line", invoked);
         }
     }
 }// LineOrientedOutputStreamTest

Propchange: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 13 18:34:00 2010
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip:904538-939797
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip:904538-939797,939803-1045116
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip:749906-749907

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java Mon Dec 13 18:34:00 2010
@@ -18,7 +18,6 @@
 
 package org.apache.tools.zip;
 
-import java.util.Arrays;
 import junit.framework.TestCase;
 
 /**
@@ -108,7 +107,6 @@ public class ExtraFieldUtilsTest extends
         assertTrue("type field 2", ze[1] instanceof UnparseableExtraFieldData);
         assertEquals("data length field 2", 4,
                      ze[1].getLocalFileDataLength().getValue());
-        byte[] expectedData = new byte[4];
         for (int i = 0; i < 4; i++) {
             assertEquals("byte number " + i,
                          data2[data.length - 5 + i],

Propchange: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 13 18:34:00 2010
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:904538-939797
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:904538-939797,939803-1045116
 /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:910483-910521
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:749906-749907

Modified: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java (original)
+++ ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java Mon Dec 13 18:34:00 2010
@@ -21,9 +21,6 @@ package org.apache.tools.zip;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.ByteBuffer;
 import java.util.Enumeration;
 import java.util.zip.CRC32;

Propchange: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 13 18:34:00 2010
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:904538-939797
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:904538-939797,939803-1045116
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java:749342-749344,749906-749907

Propchange: ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 13 18:34:00 2010
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:904538-939797
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:904538-939797,939803-1045116
 /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:896818
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:749603

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/antunit/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/antunit/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/antunit/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/antunit/index.xml Mon Dec 13 18:34:00 2010
@@ -19,12 +19,17 @@
 
   <properties>
     <index value="1"/>
-    <title>AntUnit</title>
+    <title>Apache AntUnit</title>
   </properties>
 
   <body>
 
-    <section name="AntUnit 1.1">
+    <section name="Apache AntUnit&amp;#x2122;">
+      <p>Apache AntUnit is an Antlib that provides a test framework
+        for Apache Ant tasks and types.</p>
+    </section>
+
+    <section name="Apache AntUnit 1.1">
       <h3>September 26, 2008 - Apache AntUnit 1.1 Released</h3>
 
       <p>Apache AntUnit 1.1 is now available for download as <a
@@ -56,12 +61,12 @@
     </section>
 
     <section name="Idea">
-      <p>Initially all tests for Ant tasks were written as individual
+      <p>Initially all tests for Apache Ant tasks were written as individual
       <a href="http://www.junit.org/">JUnit</a> test cases.  Pretty
       soon it was clear that most tests needed to perform common tasks
       like reading a build file, initializing a project instance with
       it and executing a target.  At this point <a
-      href="http://svn.apache.org/viewcvs.cgi/ant/core/trunk/src/testcases/org/apache/tools/ant/BuildFileTest.java">BuildFileTest</a>
+      href="http://svn.apache.org/viewvc/ant/core/trunk/src/testcases/org/apache/tools/ant/BuildFileTest.java">BuildFileTest</a>
       was invented, a base class for almost all task test cases.</p>
 
       <p>BuildFileTest works fine and in fact has been picked up by <a

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/bindownload.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/bindownload.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/bindownload.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/bindownload.xml Mon Dec 13 18:34:00 2010
@@ -24,9 +24,9 @@
 
 <body>
 
-<section name="Downloading Antlibs">
+<section name="Downloading Apache Antlibs">
 
-<p>Use the links below to download a binary distribution of Antlibs from
+<p>Use the links below to download a binary distribution of Apache Antlibs from
 one of our mirrors.  It is good practice to
 <a href="[location]#Verify Releases">verify the integrity</a>
 of the distribution files, especially if you are using one of our
@@ -128,19 +128,44 @@ mirrors for a few days.</div>
 [<a href="http://www.apache.org/dist/ant/antlibs/antunit/binaries/apache-ant-antunit-1.1-bin.tar.bz2.md5">MD5</a>]</li>
 </ul>
 </li>
+
+<li>Apache Compress Ant Library 1.0
+<ul>
+<li><code>.zip</code> archive:
+<a href="[preferred]/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.zip">apache-ant-compress-1.0-bin.zip</a>
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.zip.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.zip.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.zip.md5">MD5</a>]</li>
+
+<li><code>.tar.gz</code> archive:
+<a href="[preferred]/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.gz">apache-ant-compress-1.0-bin.tar.gz</a>
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.gz.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.gz.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.gz.md5">MD5</a>]</li>
+
+<li><code>.tar.bz2</code> archive:
+<a href="[preferred]/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.bz2">apache-ant-compress-1.0-bin.tar.bz2</a>
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.bz2.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.bz2.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/binaries/apache-ant-compress-1.0-bin.tar.bz2.md5">MD5</a>]</li>
+</ul>
+</li>
+
 </ul>
+
 </section>
 
-<!--section name="Old Ant Releases">
+<section name="Old Antlib Releases">
 
-<p>Older releases of Ant can be found <a
-href="http://archive.apache.org/dist/ant/binaries/">here</a>.  Those
-releases are only provided as <code>zip</code> archives that can be
-extracted by <code>jar xf </code><em>archive.zip</em> - we highly
-recommend to not use those releases but upgrade to Ant's <a
-href="[location]#Current Release of Ant">latest</a> release.</p>
+<p>Older releases of Ant Libraries can be found <a
+href="http://archive.apache.org/dist/ant/antlibs/">here</a>.
+We highly recommend to not use those releases but upgrade to the <a
+href="[location]#Current Antlib Releases">latest</a> releases.</p>
 
-</section-->
+</section>
 
 <section name="Verify Releases">
 

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/charter.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/charter.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/charter.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/charter.xml Mon Dec 13 18:34:00 2010
@@ -19,14 +19,14 @@
 
   <properties>
     <index value="1"/>
-    <title>Ant Libraries - Charter</title>
+    <title>Apache Ant Libraries - Charter</title>
   </properties>
 
   <body>
     <section name="Charter">
     
       <p>Below is the text of the proposal that has been accepted by
-      the Ant PMC.  Further amendments are expected.</p>
+      the Apache Ant PMC.  Further amendments are expected.</p>
 
       <source>
 Proposal to Create a Ant-Libraries Sub-Project in Apache Ant

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/compress/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/compress/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/compress/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/compress/index.xml Mon Dec 13 18:34:00 2010
@@ -19,19 +19,35 @@
 
   <properties>
     <index value="1"/>
-    <title>Compress Antlib</title>
+    <title>Apache Compress Antlib</title>
   </properties>
 
   <body>
-    <section name="Compress Antlib">
+    <section name="Apache Compress Antlib&amp;#x2122;">
       <p>This Antlib contains tasks and resources that provide
         compression/uncompression and archival/unarchival capabilities
         based on <a href="http://commons.apache.org/compress/">Apache
-        Commons Compress</a>.  Using Apache Commons Compress 1.0 this
-        Antlib supports gzip and bzip2 compression and ar, cpio, tar
-        and zip archives.</p>
+          Commons Compress</a>.  Using Apache Commons Compress 1.1
+        this.</p>
+    </section>
+
+    <section name="Compress Ant Library 1.0">
+      <h3>August 30, 2010 - Apache Compress Ant Library 1.0
+      Available</h3>
+
+      <p>Apache Compress Ant Library 1.0 is now available for
+      download as <a
+      href="http://ant.apache.org/antlibs/bindownload.cgi">binary</a>
+      or <a
+      href="http://ant.apache.org/antlibs/srcdownload.cgi">source</a>
+      release.</p>
+    </section>
+
+    <section name="Introduction">
+      <p>Using Apache Commons Compress this Antlib supports gzip and
+        bzip2 compression and ar, cpio, tar and zip archives.</p>
 
-      <p>The current code base is based on the 1.0 release of Commons
+      <p>The current code base is based on the 1.1 release of Commons
         Compress but it is expected that this Antlib follows Commons
         Compress' development and will add new compression or
         archiving formats as they are provided by the underlying

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/dotnet/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/dotnet/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/dotnet/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/dotnet/index.xml Mon Dec 13 18:34:00 2010
@@ -19,12 +19,17 @@
 
   <properties>
     <index value="1"/>
-    <title>.NET Ant Library</title>
+    <title>Apache .NET Ant Library</title>
   </properties>
 
   <body>
 
-    <section name=".NET Ant Library 1.0">
+    <section name="Apache .NET Ant Library&amp;#x2122;">
+      <p>The Apache .NET Antlib provides tasks that support
+        development of .NET software with Apache Ant.</p>
+    </section>
+
+    <section name="Apache .NET Ant Library 1.0">
       <h3>November 6, 2006 - Apache .NET Ant Library 1.0
       Available</h3>
 

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/index.xml Mon Dec 13 18:34:00 2010
@@ -19,15 +19,15 @@
 
   <properties>
     <index value="1"/>
-    <title>The Ant Libraries Subproject</title>
+    <title>The Apache Ant&amp;#x2122; Libraries Subproject</title>
   </properties>
 
   <body>
 
-    <section name="The Ant Libraries Subproject">
-      <h3>Ant Libraries - or Antlibs for short</h3>
+    <section name="The Apache Ant Libraries Subproject">
+      <h3>Apache Ant Libraries - or Antlibs for short</h3>
 
-      <p>With Ant 1.6.0 and the ant libraries concept creating
+      <p>With Apache Ant 1.6.0 and the ant libraries concept creating
       libraries of Ant tasks that are easy to get dropped into an
       existing Ant installation has become far easier.</p>
 

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/proper.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/proper.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/proper.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/proper.xml Mon Dec 13 18:34:00 2010
@@ -19,17 +19,17 @@
 
   <properties>
     <index value="1"/>
-    <title>Ant Libraries</title>
+    <title>Apache Ant&amp;#x2122; Libraries</title>
   </properties>
 
   <body>
 
-    <section name="Ant Libraries">
+    <section name="Apache Ant Libraries">
 
       <a name="antunit"/>
-      <subsection name="AntUnit - Unit Test Framework for Ant Tasks">
+      <subsection name="Apache AntUnit&amp;#x2122; - Unit Test Framework for Ant Tasks">
 
-        <p>AntUnit borrows ideas from JUnit 3.x and the &lt;junit&gt;
+        <p>Apache AntUnit borrows ideas from JUnit 3.x and the &lt;junit&gt;
         task.  It provides a task that runs build files as unit tests
         as well as a number of assertion tasks to support the
         idea.</p>
@@ -45,7 +45,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/antunit/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/antunit/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/">http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -67,8 +67,8 @@
       </subsection>
 
       <a name="compress"/>
-      <subsection name="Compress">
-        <p>The compress library offers tasks and types for additional
+      <subsection name="Apache Compress Antlib&amp;#x2122;">
+        <p>The Apache Compress Antlib offers tasks and types for additional
         archive formats like CPIO and AR supported
         by <a href="http://commons.apache.org/compress/">Apache
         Commons Compress</a>.</p>
@@ -79,11 +79,11 @@
           </tr>
           <tr>
             <th>SVN URL:</th>
-            <td><a href="https://svn.apache.org/repos/asf/ant/antlibs/compress/">https://svn.apache.org/repos/asf/ant/antlibs/compress/</a></td>
+            <td><a href="https://svn.apache.org/repos/asf/ant/antlibs/compress/trunk/">https://svn.apache.org/repos/asf/ant/antlibs/compress/trunk/</a></td>
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/compress/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/compress/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/">http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -99,7 +99,7 @@
           </tr>
           <tr>
             <th>Latest Release:</th>
-            <td>None</td>
+            <td>1.0 released on August 30, 2010</td>
           </tr>
         </table>
       </subsection>
@@ -126,7 +126,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/dotnet/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/dotnet/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/">http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -164,7 +164,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/props/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/props/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/props/trunk/">http://svn.apache.org/viewvc/ant/antlibs/props/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -185,9 +185,41 @@
         </table>
       </subsection>
 
+      <a name="vss"/>
+      <subsection name="VSS - Microsoft Visual SourceSafe Tasks">
 
-    </section>
+        <p>This antlib provides an interface to the Microsoft Visual SourceSafe SCM. The original tasks 
+        (org.apache.tools.ant.taskdefs.optional.vss) have been expanded upon in this antlib. 
+        Some fixes to issues in the original tasks have also been incorporated.</p>
 
+        <table>
+          <tr>
+            <th>SVN URL:</th>
+            <td><a href="http://svn.apache.org/repos/asf/ant/antlibs/vss/trunk/">http://svn.apache.org/repos/asf/ant/antlibs/vss/trunk/</a></td>
+          </tr>
+          <tr>
+            <th>ViewSVN:</th>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/vss/trunk/">http://svn.apache.org/viewvc/ant/antlibs/vss/trunk/</a></td>
+          </tr>
+          <tr>
+            <th>Ant compatibility:</th>
+            <td>Ant 1.7.x</td>
+          </tr>
+          <tr>
+            <th>Added to sandbox:</th>
+            <td>2006-04-26  </td>
+          </tr>
+          <tr>
+            <th>Promoted from sandbox:</th>
+            <td>2010-09-02</td>
+          </tr>
+          <tr>
+            <th>Latest Release:</th>
+            <td>None</td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
   </body>
 </document>
 

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/props/index.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/props/index.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/props/index.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/props/index.xml Mon Dec 13 18:34:00 2010
@@ -19,14 +19,14 @@
 
   <properties>
     <index value="1"/>
-    <title>Props Antlib</title>
+    <title>Apache Props Antlib</title>
   </properties>
 
   <body>
 
-    <section name="Props Antlib">
+    <section name="Apache Props Antlib&amp;#x2122;">
 
-      <p>This is a library of supplementary handlers for Ant
+      <p>This is a library of supplementary handlers for Apache Ant
         properties resolution.</p>
 
       <p>The types provided are instances of

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/sandbox.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/sandbox.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/sandbox.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/sandbox.xml Mon Dec 13 18:34:00 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -19,14 +19,14 @@
 
   <properties>
     <index value="1"/>
-    <title>Ant Libraries - The Sandbox</title>
+    <title>Apache Ant&amp;#x2122; Libraries - The Sandbox</title>
   </properties>
 
   <body>
 
-    <section name="Ant Libraries - The Sandbox">
+    <section name="Apache Ant Libraries - The Sandbox">
 
-      <p>The sandbox is the place where new Ant Libraries start their
+      <p>The sandbox is the place where new Apache Ant Libraries start their
       life, it is a playground for Ant committers and other
       contributors who find committers to sponsor their ideas.</p>
 
@@ -50,7 +50,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/dbpatch/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/dbpatch/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/dbpatch/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/dbpatch/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -78,7 +78,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/debian/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/debian/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -108,7 +108,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/fscache/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/fscache/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/fscache/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/fscache/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -195,7 +195,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/manual4eclipse/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/manual4eclipse/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -226,7 +226,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/minify/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/minify/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/minify/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/minify/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -252,7 +252,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/starteam/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/starteam/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/starteam/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/starteam/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -269,36 +269,6 @@
         </table>
       </subsection>
 
-      <subsection name="VSS - Microsoft Visual SourceSafe Tasks">
-
-        <p>This antlib provides an interface to the Microsoft Visual SourceSafe SCM. The original tasks 
-        (org.apache.tools.ant.taskdefs.optional.vss) have been expanded upon in this antlib. 
-        Some fixes to issues in the original tasks have also been incorporated.</p>
-
-        <table>
-          <tr>
-            <th>SVN URL:</th>
-            <td><a href="http://svn.apache.org/repos/asf/ant/sandbox/antlibs/vss/">http://svn.apache.org/repos/asf/ant/sandbox/antlibs/vss/</a></td>
-          </tr>
-          <tr>
-            <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/vss/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/vss/</a></td>
-          </tr>
-          <tr>
-            <th>Ant compatibility:</th>
-            <td>Ant 1.7.x</td>
-          </tr>
-          <tr>
-            <th>Added to sandbox:</th>
-            <td>2006-04-26  </td>
-          </tr>
-          <tr>
-            <th>Sponsoring Committers</th>
-            <td>  </td>
-          </tr>
-        </table>
-      </subsection>
-
       <subsection name="WebLogic">
         <p>This antlib provides tasks for working with the WebLogic app server.</p>
         <table>
@@ -308,7 +278,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/weblogic/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/weblogic/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/weblogic/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/weblogic/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -341,7 +311,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/antunit/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/antunit/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/antunit/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/antunit/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>

Modified: ant/core/branches/ANT_SITE/xdocs/antlibs/srcdownload.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/xdocs/antlibs/srcdownload.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/xdocs/antlibs/srcdownload.xml (original)
+++ ant/core/branches/ANT_SITE/xdocs/antlibs/srcdownload.xml Mon Dec 13 18:34:00 2010
@@ -24,9 +24,9 @@
 
 <body>
 
-<section name="Downloading Antlibs">
+<section name="Downloading Apache Antlibs">
 
-<p>Use the links below to download a source distribution of Antlibs from
+<p>Use the links below to download a source distribution of Apache Antlibs from
 one of our mirrors.  It is good practice to
 <a href="[location]#Verify Releases">verify the integrity</a>
 of the distribution files, especially if you are using one of our
@@ -128,19 +128,42 @@ mirrors for a few days.</div>
 [<a href="http://www.apache.org/dist/ant/antlibs/antunit/source/apache-ant-antunit-1.1-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
 </li>
+
+<li>Apache Compress Ant Library 1.0
+<ul>
+<li><code>.zip</code> archive:
+<a href="[preferred]/ant/antlibs/compress/source/apache-ant-compress-1.0-src.zip">apache-ant-compress-1.0-src.zip</a>
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.zip.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.zip.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.zip.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.zip.md5">MD5</a>]</li>
+
+<li><code>.tar.gz</code> archive:
+<a href="[preferred]/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.gz">apache-ant-compress-1.0-src.tar.gz</a>
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.gz.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.gz.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.gz.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.gz.md5">MD5</a>]</li>
+
+<li><code>.tar.bz2</code> archive:
+<a href="[preferred]/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.bz2">apache-ant-compress-1.0-src.tar.bz2</a>
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.bz2.asc">PGP</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.bz2.sha1">SHA1</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.bz2.sha512">SHA512</a>]
+[<a href="http://www.apache.org/dist/ant/antlibs/compress/source/apache-ant-compress-1.0-src.tar.bz2.md5">MD5</a>]</li>
+</ul>
+</li>
 </ul>
 </section>
 
-<!--section name="Old Ant Releases">
+<section name="Old Antlib Releases">
 
-<p>Older releases of Ant can be found <a
-href="http://archive.apache.org/dist/ant/source/">here</a>.  Those
-releases are only provided as <code>zip</code> archives that can be
-extracted by <code>jar xf </code><em>archive.zip</em> - we highly
-recommend to not use those releases but upgrade to Ant's <a
-href="[location]#Current Release of Ant">latest</a> release.</p>
+<p>Older releases of Ant Libraries can be found <a
+href="http://archive.apache.org/dist/ant/antlibs/">here</a>.
+We highly recommend to not use those releases but upgrade to the <a
+href="[location]#Current Antlib Releases">latest</a> releases.</p>
 
-</section-->
+</section>
 
 <section name="Verify Releases">
 



Mime
View raw message