svn commit: r950083 - /ant/sandbox/usertests/env/build.xml
Author: bodewig
Date: Tue Jun 1 14:20:20 2010
New Revision: 950083
URL: http://svn.apache.org/viewvc?rev=950083view=rev
Log:
typo
Modified:
ant/sandbox/usertests/env/build.xml
Modified: ant/sandbox/usertests/env/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/usertests/env/build.xml?rev=950083r1=950082r2=950083view=diff
==
--- ant/sandbox/usertests/env/build.xml (original)
+++ ant/sandbox/usertests/env/build.xml Tue Jun 1 14:20:20 2010
@@ -39,7 +39,7 @@
/target
target name=zip depends=antlib
-zip destfile=build.lib/${artifact.stub}.zip
+zip destfile=${build.lib}/${artifact.stub}.zip
zipfileset file=${jarname} fullpath=${artifact.stub}.jar/
zipfileset prefix=bin dir=src/script
include name=*.bat/
svn commit: r952674 - /ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
Author: bodewig
Date: Tue Jun 8 15:06:00 2010
New Revision: 952674
URL: http://svn.apache.org/viewvc?rev=952674view=rev
Log:
failing test for issue 49404
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml?rev=952674r1=952673r2=952674view=diff
==
---
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
(original)
+++
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
Tue Jun 8 15:06:00 2010
@@ -50,4 +50,43 @@ public class A extends TestCase {
xmlvalidate file=${output}/TEST-org.example.A.xml
lenient=true/
/target
+
+ target name=testEntities
+
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=49404;
+mkdir dir=${input}/org/example/
+echo file=${input}/org/example/A.java![CDATA[
+package org.example;
+import junit.framework.TestCase;
+public class A extends TestCase {
+public void testX() {
+ assertTrue(amp;, false);
+}
+}
+]]/echo
+mkdir dir=${output}/
+javac srcdir=${input} destdir=${output}
+ classpath refid=junit/
+/javac
+junit fork=true
+ classpath refid=junit/
+ classpath location=${output}/
+ batchtest todir=${output}
+fileset dir=${output}
+ include name=**/A.class /
+/fileset
+ /batchtest
+ formatter type=xml/
+/junit
+xmlvalidate file=${output}/TEST-org.example.A.xml
+ lenient=true/
+!--
+au:assertResourceContains
+resource=${output}/TEST-org.example.A.xml
+value=message=quot;amp;amp;amp;amp;amp;/
+au:assertResourceContains
+resource=${output}/TEST-org.example.A.xml
+value=message=AssertionFailedError: amp;amp;amp;/
+--
+ /target
+
/project
svn commit: r952676 - /ant/core/trunk/docs/manual/tasklist.html
Author: bodewig Date: Tue Jun 8 15:11:34 2010 New Revision: 952676 URL: http://svn.apache.org/viewvc?rev=952676view=rev Log: sort by task name rather than page name Modified: ant/core/trunk/docs/manual/tasklist.html Modified: ant/core/trunk/docs/manual/tasklist.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/tasklist.html?rev=952676r1=952675r2=952676view=diff == --- ant/core/trunk/docs/manual/tasklist.html (original) +++ ant/core/trunk/docs/manual/tasklist.html Tue Jun 8 15:11:34 2010 @@ -46,6 +46,8 @@ lia href=Tasks/available.htmlAvailable/a/li lia href=Tasks/basename.htmlBasename/a/li lia href=Tasks/buildnumber.htmlBuildNumber/a/li +lia href=Tasks/unpack.htmlBUnzip2/a/li +lia href=Tasks/pack.htmlBZip2/a/li lia href=Tasks/cab.htmlCab/a/li lia href=Tasks/ccm.htmlContinuus/Synergy Tasks/a/li lia href=Tasks/changelog.htmlCvsChangeLog/a/li @@ -86,6 +88,8 @@ lia href=Tasks/ftp.htmlFTP/a/li lia href=Tasks/genkey.htmlGenKey/a/li lia href=Tasks/get.htmlGet/a/li +lia href=Tasks/unpack.htmlGUnzip/a/li +lia href=Tasks/pack.htmlGZip/a/li lia href=Tasks/hostinfo.htmlHostinfo/a/li lia href=Tasks/image.htmlImage/a/li lia href=Tasks/import.htmlImport/a/li @@ -124,8 +128,6 @@ lia href=Tasks/native2ascii.htmlNative2Ascii/a/li lia href=Tasks/netrexxc.htmlNetRexxC/a/li lia href=Tasks/nice.htmlNice/a/li -lia href=Tasks/pack.htmlBZip2/a/li -lia href=Tasks/pack.htmlGZip/a/li lia href=Tasks/parallel.htmlParallel/a/li lia href=Tasks/patch.htmlPatch/a/li lia href=Tasks/pathconvert.htmlPathConvert/a/li @@ -160,7 +162,6 @@ lia href=Tasks/sql.htmlSql/a/li lia href=Tasks/sshexec.htmlSshexec/a/li lia href=Tasks/sshsession.htmlSshsession/a/li -lia href=Tasks/style.htmlXSLT/iStyle/i/a/li lia href=Tasks/subant.htmlSubant/a/li lia href=Tasks/symlink.htmlSymlink/a/li lia href=Tasks/sync.htmlSync/a/li @@ -173,8 +174,6 @@ lia href=Tasks/truncate.htmlTruncate/a/li lia href=Tasks/tstamp.htmlTStamp/a/li lia href=Tasks/typedef.htmlTypedef/a/li -lia href=Tasks/unpack.htmlBUnzip2/a/li -lia href=Tasks/unpack.htmlGUnzip/a/li lia href=Tasks/unzip.htmlUnjar/a/li lia href=Tasks/unzip.htmlUntar/a/li lia href=Tasks/unzip.htmlUnwar/a/li @@ -187,6 +186,7 @@ lia href=Tasks/wljspc.htmlWeblogic JSP Compiler/a/li lia href=Tasks/xmlproperty.htmlXmlProperty/a/li lia href=Tasks/xmlvalidate.htmlXmlValidate/a/li +lia href=Tasks/style.htmlXSLT/iStyle/i/a/li lia href=Tasks/zip.htmlZip/a/li /ul /body
svn commit: r953001 - in /ant/antlibs/common/trunk: build.xml ivy.xml ivysettings-nexus.xml upload.xml
Author: bodewig
Date: Wed Jun 9 13:41:23 2010
New Revision: 953001
URL: http://svn.apache.org/viewvc?rev=953001view=rev
Log:
first cut at providing nexus upload support for Antlibs based on Antoine's work
for Ant. Will be tested by compress-antlib release someday
Added:
ant/antlibs/common/trunk/ivysettings-nexus.xml
- copied unchanged from r952673, ant/core/trunk/release/ivysettings.xml
ant/antlibs/common/trunk/upload.xml
- copied, changed from r952673, ant/core/trunk/release/upload.xml
Modified:
ant/antlibs/common/trunk/build.xml
ant/antlibs/common/trunk/ivy.xml
Modified: ant/antlibs/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=953001r1=953000r2=953001view=diff
==
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Wed Jun 9 13:41:23 2010
@@ -34,6 +34,8 @@
property name=build.classes value=${build}/classes/
property name=build.testclasses value=${build}/test-classes/
property name=build.lib value=${build}/lib/
+property name=build.javarepository
+ value=${build}/java-repository/
property name=src.junit location=src/tests/junit/
property name=src.antunit location=src/tests/antunit/
@@ -430,4 +432,36 @@
target name=create-readable-documents
depends=style-contributors,style-changes/
+
+ !-- uploading of releases --
+ import file=${common.basedir}/upload.xml/
+
+ target name=prepare-upload depends=bindist
+property name=upload.dir
+
value=${build.javarepository}/org/apache/ant/${artifact.name}/${artifact.version}/
+mkdir dir=${upload.dir}/
+copy file=${jarname} todir=${upload.dir}/
+copy file=${target.pom} todir=${upload.dir}/
+ /target
+
+ target name=check-sigs depends=prepare-upload
+uptodate property=jar.sig.ok
+ srcfile=${upload.dir}/${artifact.stub}.jar
+ targetfile=${upload.dir}/${artifact.stub}.jar.asc/
+uptodate property=pom.sig.ok
+ srcfile=${upload.dir}/${artifact.stub}.pom
+ targetfile=${upload.dir}/${artifact.stub}.pom.asc/
+fail message=Your OpenPGP signature of the artifacts is too old or
missing
+ condition
+not
+ and
+isset property=jar.sig.ok/
+isset property=pom.sig.ok/
+ /and
+/not
+ /condition
+/fail
+ /target
+
+ target name=upload depends=check-sigs,perform-nexus-upload/
/project
Modified: ant/antlibs/common/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivy.xml?rev=953001r1=953000r2=953001view=diff
==
--- ant/antlibs/common/trunk/ivy.xml (original)
+++ ant/antlibs/common/trunk/ivy.xml Wed Jun 9 13:41:23 2010
@@ -28,7 +28,7 @@
!-- == --
target name=ivy-init
depends=setup
-property name=ivy.organization value=apache/
+property name=ivy.organization value=org/apache/
property name=target.ivy.xml
location=${build.lib}/${artifact.stub}-ivy.xml/
tstamp
@@ -59,7 +59,7 @@
echoxml file=${target.ivy.xml}
ivy-module version=1.3
info organization=${ivy.organization}
- module=${artifact.name}
+ module=ant
revision=${artifact.version}
publication=${publication.datetime}
license name=Apache Software License 2.0
@@ -67,6 +67,12 @@
ivy-author name=Apache Ant Development Team
url=http://ant.apache.org//
/info
+publications
+ artifact name=${artifact.name} type=pom ext=pom/
+ artifact name=${artifact.name} type=pom.asc ext=pom.asc/
+ artifact name=${artifact.name} type=jar ext=jar/
+ artifact name=${artifact.name} type=jar.asc ext=jar.asc/
+/publications
/ivy-module
/echoxml
/target
Copied: ant/antlibs/common/trunk/upload.xml (from r952673,
ant/core/trunk/release/upload.xml)
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/upload.xml?p2=ant/antlibs/common/trunk/upload.xmlp1=ant/core/trunk/release/upload.xmlr1=952673r2=953001rev=953001view=diff
==
--- ant/core/trunk/release/upload.xml (original)
+++ ant/antlibs/common/trunk/upload.xml Wed Jun 9 13:41:23 2010
@@ -1,3 +1,4 @@
+?xml version=1.0?
!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,12 +16,25 @@
limitations under the License.
--
project name=upload xmlns:ivy=antlib:org.apache.ivy.ant
- fail unless=upload.user message=supply upload.user on the command line/
- fail unless=upload.password message=supply upload.password on the
command line
svn commit: r953003 - /ant/antlibs/common/trunk/build.xml
Author: bodewig
Date: Wed Jun 9 13:43:01 2010
New Revision: 953003
URL: http://svn.apache.org/viewvc?rev=953003view=rev
Log:
bad target name
Modified:
ant/antlibs/common/trunk/build.xml
Modified: ant/antlibs/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=953003r1=953002r2=953003view=diff
==
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Wed Jun 9 13:43:01 2010
@@ -436,7 +436,7 @@
!-- uploading of releases --
import file=${common.basedir}/upload.xml/
- target name=prepare-upload depends=bindist
+ target name=prepare-upload depends=bin-dist
property name=upload.dir
value=${build.javarepository}/org/apache/ant/${artifact.name}/${artifact.version}/
mkdir dir=${upload.dir}/
svn commit: r953004 - /ant/antlibs/antunit/trunk/changes.xml
Author: bodewig Date: Wed Jun 9 13:46:06 2010 New Revision: 953004 URL: http://svn.apache.org/viewvc?rev=953004view=rev Log: typo Modified: ant/antlibs/antunit/trunk/changes.xml Modified: ant/antlibs/antunit/trunk/changes.xml URL: http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=953004r1=953003r2=953004view=diff == --- ant/antlibs/antunit/trunk/changes.xml (original) +++ ant/antlibs/antunit/trunk/changes.xml Wed Jun 9 13:46:06 2010 @@ -40,7 +40,7 @@ release version=1.2 date=not-released action type=add issue=49168 It is now possible to pass references from the build file - containing the lt:antunitgt; task to the build files under + containing the lt;antunitgt; task to the build files under test. /action action type=add
svn commit: r953008 - /ant/antlibs/compress/trunk/project-template.ivy.xml
Author: bodewig
Date: Wed Jun 9 13:52:48 2010
New Revision: 953008
URL: http://svn.apache.org/viewvc?rev=953008view=rev
Log:
Update template Ivy file with publications
Modified:
ant/antlibs/compress/trunk/project-template.ivy.xml
Modified: ant/antlibs/compress/trunk/project-template.ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/project-template.ivy.xml?rev=953008r1=953007r2=953008view=diff
==
--- ant/antlibs/compress/trunk/project-template.ivy.xml (original)
+++ ant/antlibs/compress/trunk/project-template.ivy.xml Wed Jun 9 13:52:48 2010
@@ -19,7 +19,7 @@
--
ivy-module version=2.0
info organization=${ivy.organization}
-module=compress-antlib
+module=ant
revision=${artifact.version}
publication=${publication.datetime}
license name=Apache Software License 2.0
@@ -32,6 +32,12 @@
Apache Commons Compress.
/description
/info
+ publications
+artifact name=${artifact.name} type=pom ext=pom/
+artifact name=${artifact.name} type=pom.asc ext=pom.asc/
+artifact name=${artifact.name} type=jar ext=jar/
+artifact name=${artifact.name} type=jar.asc ext=jar.asc/
+ /publications
dependencies
dependency org=org.apache.ant name=ant revision=[1.8.0,)/
dependency org=org.apache.commons name=commons-compress
svn commit: r953046 - in /ant/core/trunk/src: main/org/apache/tools/ant/DirectoryScanner.java tests/junit/org/apache/tools/ant/DirectoryScannerTest.java tests/junit/org/apache/tools/ant/types/selector
Author: bodewig
Date: Wed Jun 9 15:44:46 2010
New Revision: 953046
URL: http://svn.apache.org/viewvc?rev=953046view=rev
Log:
some JUnit tests to verify/falsify
http://mail-archives.apache.org/mod_mbox/ant-user/201006.mbox/%3c28829117.p...@talk.nabble.com%3e
Added:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
(with props)
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=953046r1=953045r2=953046view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Wed Jun
9 15:44:46 2010
@@ -1458,7 +1458,7 @@ public class DirectoryScanner
* @param path the path to check.
* @return whether all the specified directory's contents are excluded.
*/
-private boolean contentsExcluded(TokenizedPath path) {
+/* package */ boolean contentsExcluded(TokenizedPath path) {
for (int i = 0; i excludePatterns.length; i++) {
if (excludePatterns[i].endsWith(SelectorUtils.DEEP_TREE_MATCH)
excludePatterns[i].withoutLastToken()
@@ -1783,7 +1783,7 @@ public class DirectoryScanner
*
* @since Ant 1.6.3
*/
-private synchronized void ensureNonPatternSetsReady() {
+/* package */ synchronized void ensureNonPatternSetsReady() {
if (!areNonPatternSetsReady) {
includePatterns = fillNonPatternSet(includeNonPatterns, includes);
excludePatterns = fillNonPatternSet(excludeNonPatterns, excludes);
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java?rev=953046r1=953045r2=953046view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
Wed Jun 9 15:44:46 2010
@@ -19,10 +19,10 @@
package org.apache.tools.ant;
import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.selectors.TokenizedPath;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.SymbolicLinkUtils;
-
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
@@ -555,4 +555,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));
+}
}
Added:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java?rev=953046view=auto
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
(added)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/selectors/TokenizedPatternTest.java
Wed Jun 9 15:44:46 2010
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import java.io.File;
+import junit.framework.TestCase;
+
+public class TokenizedPatternTest extends TestCase
svn commit: r953257 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Author: bodewig
Date: Thu Jun 10 09:24:13 2010
New Revision: 953257
URL: http://svn.apache.org/viewvc?rev=953257view=rev
Log:
try a little harder when deleting temporary files in junit
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?rev=953257r1=953256r2=953257view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Thu Jun 10 09:24:13 2010
@@ -881,7 +881,7 @@ public class JUnitTask extends Task {
FILE_UTILS.close(writer);
try {
-casesFile.delete();
+FILE_UTILS.tryHardToDelete(casesFile);
} catch (Exception e) {
log(e.toString(), Project.MSG_ERR);
}
@@ -979,7 +979,7 @@ public class JUnitTask extends Task {
props.store(outstream, Ant JUnitTask generated properties file);
outstream.close();
} catch (java.io.IOException e) {
-propsFile.delete();
+FILE_UTILS.tryHardToDelete(propsFile);
throw new BuildException(Error creating temporary properties
+ file., e, getLocation());
}
@@ -1034,7 +1034,7 @@ public class JUnitTask extends Task {
} finally {
FileUtils.close(br);
if (vmWatcher.exists()) {
-vmWatcher.delete();
+FILE_UTILS.tryHardToDelete(vmWatcher);
}
}
@@ -1053,7 +1053,7 @@ public class JUnitTask extends Task {
logVmCrash(feArray, test, vmCrashString);
}
-if (!propsFile.delete()) {
+if (!FILE_UTILS.tryHardToDelete(propsFile)) {
throw new BuildException(Could not delete temporary
+ properties file.);
}
svn commit: r953261 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Author: bodewig
Date: Thu Jun 10 09:28:46 2010
New Revision: 953261
URL: http://svn.apache.org/viewvc?rev=953261view=rev
Log:
provide file name when you fail to delete the temporary file. PR 49419
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=953261r1=953260r2=953261view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jun 10 09:28:46 2010
@@ -41,6 +41,10 @@ Fixed bugs:
certain circumstances.
Bugzilla Report 49296.
+ * junit will now produce better diagnostics when it fails to delete
+ a temporary file.
+ Bugzilla Report 49419.
+
Other changes:
--
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?rev=953261r1=953260r2=953261view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Thu Jun 10 09:28:46 2010
@@ -1055,7 +1055,8 @@ public class JUnitTask extends Task {
if (!FILE_UTILS.tryHardToDelete(propsFile)) {
throw new BuildException(Could not delete temporary
- + properties file.);
+ + properties file '
+ + propsFile.getAbsolutePath() + '.);
}
}
svn commit: r953281 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/DirectoryScanner.java
Author: bodewig
Date: Thu Jun 10 11:30:57 2010
New Revision: 953281
URL: http://svn.apache.org/viewvc?rev=953281view=rev
Log:
don't scan directories that are excluded recursively - this used to be done
everywhere except for the (most common) case where the directory itself was not
explicitly included. PR 49420
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=953281r1=953280r2=953281view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jun 10 11:30:57 2010
@@ -45,6 +45,12 @@ Fixed bugs:
a temporary file.
Bugzilla Report 49419.
+ * Ant would often scan directories even though there were known to
+ only hold excluded files when evaluating filesets. This never
+ resulted in worng results but degraded performance of the scan
+ itself.
+ Bugzilla Report 49420.
+
Other changes:
--
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=953281r1=953280r2=953281view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Thu Jun
10 11:30:57 2010
@@ -1255,7 +1255,8 @@ public class DirectoryScanner
} else {
everythingIncluded = false;
dirsNotIncluded.addElement(name);
-if (fast couldHoldIncluded(newPath)) {
+if (fast couldHoldIncluded(newPath)
+ !contentsExcluded(newPath)) {
scandir(file, newPath, fast, children,
directoryNamesFollowed);
}
svn commit: r953366 - /ant/core/trunk/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
Author: bodewig
Date: Thu Jun 10 16:09:07 2010
New Revision: 953366
URL: http://svn.apache.org/viewvc?rev=953366view=rev
Log:
Test failed on Windows, don't know why I never noticed before
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java?rev=953366r1=953365r2=953366view=diff
==
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
Thu Jun 10 16:09:07 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));
}
svn commit: r953375 - /ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
Author: bodewig
Date: Thu Jun 10 16:26:25 2010
New Revision: 953375
URL: http://svn.apache.org/viewvc?rev=953375view=rev
Log:
test failed on Windows
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java?rev=953375r1=953374r2=953375view=diff
==
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
Thu Jun 10 16:26:25 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,7 +149,9 @@ 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);
+assertResolved(SHARED_JAR_URI, LAUNCHER_JAR, resolved, unix);
+assertResolved(SHARED_JAR_URI, LAUNCHER_JAR.replace('/', '\\'),
+ resolved, windows);
File f=new File(resolved);
String path = f.getAbsolutePath();
if (windows) {
svn commit: r953381 - /ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
Author: bodewig
Date: Thu Jun 10 16:32:50 2010
New Revision: 953381
URL: http://svn.apache.org/viewvc?rev=953381view=rev
Log:
remove redundant assertions, they are already contained in testantOnRemoteShare
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java?rev=953381r1=953380r2=953381view=diff
==
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
Thu Jun 10 16:32:50 2010
@@ -149,10 +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, unix);
-assertResolved(SHARED_JAR_URI, LAUNCHER_JAR.replace('/', '\\'),
- resolved, windows);
-File f=new File(resolved);
+File f = new File(resolved);
String path = f.getAbsolutePath();
if (windows) {
assertEquals(0, path.indexOf());
svn commit: r953594 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Author: bodewig
Date: Fri Jun 11 07:33:07 2010
New Revision: 953594
URL: http://svn.apache.org/viewvc?rev=953594view=rev
Log:
javac faild for long command lines on OS/2. PR 49425. Submitted by dmik
DOT for MINUS maillists AT hugaida DOT com
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=953594r1=953593r2=953594view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jun 11 07:33:07 2010
@@ -51,6 +51,9 @@ Fixed bugs:
itself.
Bugzilla Report 49420.
+ * javac failed for long command lines on OS/2.
+ Bugzilla Report 49425.
+
Other changes:
--
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java?rev=953594r1=953593r2=953594view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Fri Jun 11 07:33:07 2010
@@ -45,7 +45,15 @@ import org.apache.tools.ant.taskdefs.con
* @since Ant 1.3
*/
public abstract class DefaultCompilerAdapter implements CompilerAdapter {
-private static final int COMMAND_LINE_LIMIT = 4096; // 4K
+private static final int COMMAND_LINE_LIMIT;
+static {
+if (Os.isFamily(os/2)) {
+// OS/2 CMD.EXE has a much smaller limit around 1K
+COMMAND_LINE_LIMIT = 1000;
+} else {
+COMMAND_LINE_LIMIT = 4096; // 4K
+}
+}
// CheckStyle:VisibilityModifier OFF - bc
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
svn commit: r954537 - in /ant/antlibs/antunit/trunk: changes.xml src/etc/junit-frames.xsl src/etc/junit-noframes.xsl
Author: bodewig
Date: Mon Jun 14 16:13:56 2010
New Revision: 954537
URL: http://svn.apache.org/viewvc?rev=954537view=rev
Log:
merge err/out changes from Ant's trunk (output to HTML rather than plain text)
Modified:
ant/antlibs/antunit/trunk/changes.xml
ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl
ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl (contents, props
changed)
Modified: ant/antlibs/antunit/trunk/changes.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/changes.xml?rev=954537r1=954536r2=954537view=diff
==
--- ant/antlibs/antunit/trunk/changes.xml (original)
+++ ant/antlibs/antunit/trunk/changes.xml Mon Jun 14 16:13:56 2010
@@ -38,6 +38,11 @@
/properties
release version=1.2 date=not-released
+action type=fix breaks-bwc=true
+ The XSLT stylesheets now create HTML files instead of plain text
+ for logs sent to System.err and System.out. You can always get
+ back to your own reporting by providing custom stylesheets.
+/action
action type=add issue=49168
It is now possible to pass references from the build file
containing the lt;antunitgt; task to the build files under
Modified: ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl?rev=954537r1=954536r2=954537view=diff
==
--- ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl (original)
+++ ant/antlibs/antunit/trunk/src/etc/junit-frames.xsl Mon Jun 14 16:13:56 2010
@@ -1,9 +1,10 @@
+?xml version=1.0?
xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; version=1.0
xmlns:lxslt=http://xml.apache.org/xslt;
xmlns:redirect=http://xml.apache.org/xalan/redirect;
xmlns:stringutils=xalan://org.apache.tools.ant.util.StringUtils
extension-element-prefixes=redirect
-xsl:output method=html indent=yes encoding=US-ASCII/
+xsl:output method=html indent=yes encoding=UTF-8/
xsl:decimal-format decimal-separator=. grouping-separator=,/
!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -117,13 +118,27 @@ under the License.
xsl:apply-templates select=. mode=project.details/
/redirect:write
xsl:if test=string-length(./system-out)!=0
- redirect:write
file={$output.dir}/{$directory.dir}/{...@id}_{@name}-out.txt
-xsl:value-of disable-output-escaping=yes select=./system-out/
+ redirect:write
file={$output.dir}/{$directory.dir}/{...@id}_{@name}-out.html
+ html
+ head
+titleStandard Output from xsl:value-of select=@name//title
+ /head
+ body
+prexsl:value-of select=./system-out//pre
+ /body
+/html
/redirect:write
/xsl:if
xsl:if test=string-length(./system-err)!=0
- redirect:write
file={$output.dir}/{$directory.dir}/{...@id}_{@name}-err.txt
-xsl:value-of disable-output-escaping=yes select=./system-err/
+ redirect:write
file={$output.dir}/{$directory.dir}/{...@id}_{@name}-err.html
+ html
+ head
+titleStandard Error from xsl:value-of select=@name//title
+ /head
+ body
+prexsl:value-of select=./system-err//pre
+ /body
+/html
/redirect:write
/xsl:if
xsl:if test=failures/text() != 0
@@ -384,7 +399,7 @@ h6 {
xsl:if test=string-length(./system-out)!=0
div class=Properties
a
-xsl:attribute name=href./xsl:value-of
select=@id/_xsl:value-of select=@name/-out.txt/xsl:attribute
+xsl:attribute name=href./xsl:value-of
select=@id/_xsl:value-of select=@name/-out.html/xsl:attribute
System.out #187;
/a
/div
@@ -392,7 +407,7 @@ h6 {
xsl:if test=string-length(./system-err)!=0
div class=Properties
a
-xsl:attribute name=href./xsl:value-of
select=@id/_xsl:value-of select=@name/-err.txt/xsl:attribute
+xsl:attribute name=href./xsl:value-of
select=@id/_xsl:value-of select=@name/-err.html/xsl:attribute
System.err #187;
/a
/div
Modified: ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl?rev=954537r1=954536r2=954537view=diff
==
--- ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl (original)
+++ ant/antlibs/antunit/trunk/src/etc/junit-noframes.xsl Mon Jun 14 16:13:56
2010
@@ -1,7 +1,7 @@
xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; version=1.0
xmlns:lxslt=http://xml.apache.org/xslt
svn commit: r954767 - /ant/antlibs/common/trunk/build.xml
Author: bodewig
Date: Tue Jun 15 08:59:21 2010
New Revision: 954767
URL: http://svn.apache.org/viewvc?rev=954767view=rev
Log:
whitespace
Modified:
ant/antlibs/common/trunk/build.xml
Modified: ant/antlibs/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=954767r1=954766r2=954767view=diff
==
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Tue Jun 15 08:59:21 2010
@@ -42,8 +42,8 @@
!-- javac properties --
property name=javac.-source value=1.2/
property name=javac.-target value=1.2/
- property name=javac.test-source value=${javac.-source}/
- property name=javac.test-target value=${javac.-target}/
+property name=javac.test-source value=${javac.-source}/
+property name=javac.test-target value=${javac.-target}/
property name=javac.debug value=on/
!--you really need a proper version in version.properties--
svn commit: r954768 - /ant/antlibs/common/trunk/build.xml
Author: bodewig
Date: Tue Jun 15 09:00:03 2010
New Revision: 954768
URL: http://svn.apache.org/viewvc?rev=954768view=rev
Log:
create a -sources.jar
Modified:
ant/antlibs/common/trunk/build.xml
Modified: ant/antlibs/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=954768r1=954767r2=954768view=diff
==
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Tue Jun 15 09:00:03 2010
@@ -442,6 +442,11 @@
mkdir dir=${upload.dir}/
copy file=${jarname} todir=${upload.dir}/
copy file=${target.pom} todir=${upload.dir}/
+jar destfile=${upload.dir}/${artifact.stub}-sources.jar
+ fileset dir=src/main/
+ metainf file=NOTICE/
+ metainf file=${common.basedir}/LICENSE/
+/jar
/target
target name=check-sigs depends=prepare-upload
svn commit: r954778 - /ant/antlibs/common/trunk/build.xml
Author: bodewig
Date: Tue Jun 15 09:18:55 2010
New Revision: 954778
URL: http://svn.apache.org/viewvc?rev=954778view=rev
Log:
create javadocs and a -javadoc.jar
Modified:
ant/antlibs/common/trunk/build.xml
Modified: ant/antlibs/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=954778r1=954777r2=954778view=diff
==
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Tue Jun 15 09:18:55 2010
@@ -36,6 +36,7 @@
property name=build.lib value=${build}/lib/
property name=build.javarepository
value=${build}/java-repository/
+property name=build.javadoc value=${build}/javadoc/
property name=src.junit location=src/tests/junit/
property name=src.antunit location=src/tests/antunit/
@@ -233,6 +234,30 @@
delete dir=${src.dist.dir}/
/target
+ target name=javadoc_check
+uptodate property=javadoc.notrequired
+ targetfile=${build.javadoc}/package-list
+ srcfiles dir=src/main includes=**/*.java,**/*.html/
+/uptodate
+ /target
+
+ target name=javadoc depends=setup-properties, javadoc_check
+ description=-- creates the API documentation
+ unless=javadoc.notrequired
+mkdir dir=${build.javadoc}/
+javadoc useexternalfile=yes
+ maxmemory=1000M
+ destdir=${build.javadoc}
+ version=true
+ locale=en
+ windowtitle=${artifact.name} API
+ doctitle=${artifact.name}
+ failonerror=true
+ verbose=false
+ packageset dir=src/main/
+/javadoc
+ /target
+
!--copy the target to the destination. Only allowed if the tests pass!--
target name=install depends=test
@@ -280,7 +305,7 @@
/antcall
/target
- target name=bin-dist depends=checksum-target-jar,m2-pom,ivy.xml
+ target name=bin-dist depends=checksum-target-jar,m2-pom,ivy.xml,javadoc
mkdir dir=${bin.dist.dir}/
copy todir=${bin.dist.dir}
@@ -299,6 +324,9 @@
fileset file=${jarname}*/
fileset file=${target.pom}/
/copy
+copy todir=${bin.dist.dir}/javadoc
+ fileset dir=${build.javadoc}/
+/copy
copy todir=${bin.dist.dir}/ includeemptydirs=false
fileset dir=src
include name=etc//
@@ -447,6 +475,11 @@
metainf file=NOTICE/
metainf file=${common.basedir}/LICENSE/
/jar
+jar destfile=${upload.dir}/${artifact.stub}-javadoc.jar
+ fileset dir=${build.javadoc}/
+ metainf file=NOTICE/
+ metainf file=${common.basedir}/LICENSE/
+/jar
/target
target name=check-sigs depends=prepare-upload
svn commit: r954780 - /ant/antlibs/common/trunk/build.xml
Author: bodewig
Date: Tue Jun 15 09:21:22 2010
New Revision: 954780
URL: http://svn.apache.org/viewvc?rev=954780view=rev
Log:
check OpenPGP sigs for -sources.jar and -javadoc.jar as well
Modified:
ant/antlibs/common/trunk/build.xml
Modified: ant/antlibs/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/build.xml?rev=954780r1=954779r2=954780view=diff
==
--- ant/antlibs/common/trunk/build.xml (original)
+++ ant/antlibs/common/trunk/build.xml Tue Jun 15 09:21:22 2010
@@ -489,12 +489,20 @@
uptodate property=pom.sig.ok
srcfile=${upload.dir}/${artifact.stub}.pom
targetfile=${upload.dir}/${artifact.stub}.pom.asc/
+uptodate property=sources.sig.ok
+ srcfile=${upload.dir}/${artifact.stub}-sources.jar
+ targetfile=${upload.dir}/${artifact.stub}-sources.jar.asc/
+uptodate property=javadoc.sig.ok
+ srcfile=${upload.dir}/${artifact.stub}-javadoc.jar
+ targetfile=${upload.dir}/${artifact.stub}-javadoc.jar.asc/
fail message=Your OpenPGP signature of the artifacts is too old or
missing
condition
not
and
isset property=jar.sig.ok/
isset property=pom.sig.ok/
+isset property=sources.sig.ok/
+isset property=javadoc.sig.ok/
/and
/not
/condition
svn commit: r954781 - /incubator/ivy/
Author: bodewig Date: Tue Jun 15 09:30:40 2010 New Revision: 954781 URL: http://svn.apache.org/viewvc?rev=954781view=rev Log: Ivy has become part of Ant long ago Removed: incubator/ivy/
svn commit: r954785 - in /ant/core/trunk/src/main/org/apache/tools/ant: taskdefs/Move.java util/FileUtils.java
Author: bodewig
Date: Tue Jun 15 10:08:49 2010
New Revision: 954785
URL: http://svn.apache.org/viewvc?rev=954785view=rev
Log:
allow file names to be 'fixed in case' on Windows. PR 41948
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Move.java
ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Move.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Move.java?rev=954785r1=954784r2=954785view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Move.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Move.java Tue Jun 15
10:08:49 2010
@@ -349,7 +349,7 @@ public class Move extends Copy {
} else if (destFile.isFile()) {
sourceFile =
getFileUtils().normalize(sourceFile.getAbsolutePath()).getCanonicalFile();
destFile = getFileUtils().normalize(destFile.getAbsolutePath());
-if (destFile.equals(sourceFile)) {
+if
(destFile.getAbsolutePath().equals(sourceFile.getAbsolutePath())) {
//no point in renaming a file to its own canonical version...
log(Rename of + sourceFile + to + destFile
+ is a no-op., Project.MSG_VERBOSE);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java?rev=954785r1=954784r2=954785view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java Tue Jun 15
10:08:49 2010
@@ -1273,7 +1273,7 @@ public class FileUtils {
System.err.println(Cannot rename nonexistent file + from);
return;
}
-if (from.equals(to)) {
+if (from.getAbsolutePath().equals(to.getAbsolutePath())) {
System.err.println(Rename of + from + to + to + is a
no-op.);
return;
}
svn commit: r954802 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/util/DOMElementWriter.java src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml src/tests/junit/org/apache/t
Author: bodewig
Date: Tue Jun 15 10:43:37 2010
New Revision: 954802
URL: http://svn.apache.org/viewvc?rev=954802view=rev
Log:
unconditionally encode as amp; in DOMElementWriter. PR 49404
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=954802r1=954801r2=954802view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Jun 15 10:43:37 2010
@@ -16,6 +16,14 @@ Changes that could break older environme
* Removed ant-nodeps.jar; it is now merged into ant.jar.
+ * DOMElementWriter#encode used to employ special code before encoding
+ ampersands so that #123; remained #123; rather than being turned
+ into amp;#123;. This is no longer the case, ampersands will now
+ be encoded unconditionally.
+ This affects echoxml task as well as the XML logger or JUnit
+ formatter where ampersands will now always get encoded.
+ Bugzilla Report 49404.
+
Fixed bugs:
---
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java?rev=954802r1=954801r2=954802view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java Tue
Jun 15 10:43:37 2010
@@ -429,13 +429,7 @@ public class DOMElementWriter {
sb.append(quot;);
break;
case '':
-int nextSemi = value.indexOf(;, i);
-if (nextSemi 0
-|| !isReference(value.substring(i, nextSemi + 1))) {
-sb.append(amp;);
-} else {
-sb.append('');
-}
+sb.append(amp;);
break;
default:
if (isLegalCharacter(c)) {
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml?rev=954802r1=954801r2=954802view=diff
==
---
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
(original)
+++
ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
Tue Jun 15 10:43:37 2010
@@ -79,14 +79,12 @@ public class A extends TestCase {
/junit
xmlvalidate file=${output}/TEST-org.example.A.xml
lenient=true/
-!--
au:assertResourceContains
resource=${output}/TEST-org.example.A.xml
value=message=quot;amp;amp;amp;amp;amp;/
au:assertResourceContains
resource=${output}/TEST-org.example.A.xml
-value=message=AssertionFailedError: amp;amp;amp;/
---
+value=AssertionFailedError: amp;amp;amp;amp;/
/target
/project
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java?rev=954802r1=954801r2=954802view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Tue Jun 15 10:43:37 2010
@@ -53,17 +53,17 @@ 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
svn commit: r954807 - /ant/antlibs/compress/trunk/project-template.ivy.xml
Author: bodewig
Date: Tue Jun 15 10:56:48 2010
New Revision: 954807
URL: http://svn.apache.org/viewvc?rev=954807view=rev
Log:
additional artifacts
Modified:
ant/antlibs/compress/trunk/project-template.ivy.xml
Modified: ant/antlibs/compress/trunk/project-template.ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/project-template.ivy.xml?rev=954807r1=954806r2=954807view=diff
==
--- ant/antlibs/compress/trunk/project-template.ivy.xml (original)
+++ ant/antlibs/compress/trunk/project-template.ivy.xml Tue Jun 15 10:56:48 2010
@@ -37,6 +37,18 @@
artifact name=${artifact.name} type=pom.asc ext=pom.asc/
artifact name=${artifact.name} type=jar ext=jar/
artifact name=${artifact.name} type=jar.asc ext=jar.asc/
+artifact name=${artifact.name} type=source ext=jar
+ classifier=sources/
+artifact name=${artifact.name} type=source.asc ext=jar.asc
+ classifier=sources/
+artifact name=${artifact.name} type=javadoc ext=jar
+ classifier=javadoc/
+artifact name=${artifact.name} type=javadoc.asc ext=jar.asc
+ classifier=javadoc/
+artifact name=${artifact.name} type=ivy ext=xml
+ classifier=ivy/
+artifact name=${artifact.name} type=ivy.asc ext=xml.asc
+ classifier=ivy/
/publications
dependencies
dependency org=org.apache.ant name=ant revision=[1.8.0,)/
svn commit: r954820 - /ant/antlibs/common/trunk/upload.xml
Author: bodewig
Date: Tue Jun 15 11:06:00 2010
New Revision: 954820
URL: http://svn.apache.org/viewvc?rev=954820view=rev
Log:
one more place with an artifact pattern
Modified:
ant/antlibs/common/trunk/upload.xml
Modified: ant/antlibs/common/trunk/upload.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/upload.xml?rev=954820r1=954819r2=954820view=diff
==
--- ant/antlibs/common/trunk/upload.xml (original)
+++ ant/antlibs/common/trunk/upload.xml Tue Jun 15 11:06:00 2010
@@ -34,7 +34,7 @@
ivy:retrieve/
ivy:deliver/
ivy:publish publishivy=false
-
artifactspattern=${build.javarepository}/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision].[ext]
+
artifactspattern=${build.javarepository}/[organisation]/[module]/[artifact]/[revision]/[artifact]-[revision](-[classifier]).[ext]
resolver=nexus/
/target
/project
\ No newline at end of file
svn commit: r954887 - /ant/core/trunk/build.xml
Author: bodewig
Date: Tue Jun 15 13:56:08 2010
New Revision: 954887
URL: http://svn.apache.org/viewvc?rev=954887view=rev
Log:
only ignore system classes if not running in Gump or similar environments.
Hopefully fixes test-ant in Gump
Modified:
ant/core/trunk/build.xml
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=954887r1=954886r2=954887view=diff
==
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Tue Jun 15 13:56:08 2010
@@ -343,83 +343,89 @@
===
--
target name=check_for_optional_packages
+condition property=ignoresystemclasses
+ not
+equals arg1=${build.sysclasspath} arg2=only/
+ /not
+/condition
+property name=ignoresystemclasses value=false/
available property=jdk1.5+ classname=java.net.Proxy/
available property=jdk1.6+ classname=java.util.ServiceLoader/
available property=kaffe classname=kaffe.util.NotImplemented/
available property=bsf.present
classname=org.apache.bsf.BSFManager
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=netrexx.present
classname=netrexx.lang.Rexx
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=apache.resolver.present
classname=org.apache.xml.resolver.tools.CatalogResolver
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=recent.xalan2.present
classname=org.apache.xalan.trace.TraceListenerEx3
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=junit.present
classname=junit.framework.TestCase
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
condition property=junit4.present
and
!-- Need JDK 5+ to compile since junit-4*.jar uses new bytecode
format --
available classname=java.net.Proxy/
available
classname=org.junit.Test
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath
ignoresystemclasses=${ignoresystemclasses}/
/and
/condition
available property=antunit.present
classname=org.apache.ant.antunit.AntUnit
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=commons.net.present
classname=org.apache.commons.net.ftp.FTPClient
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=antlr.present
classname=antlr.Tool
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=apache.regexp.present
classname=org.apache.regexp.RE
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=apache.oro.present
classname=org.apache.oro.text.regex.Perl5Matcher
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=jmf.present
classname=javax.sound.sampled.Clip
classpathref=classpath/
available property=jai.present
classname=javax.media.jai.JAI
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=jdepend.present
classname=jdepend.framework.JDepend
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=log4j.present
classname=org.apache.log4j.Logger
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=commons.logging.present
classname=org.apache.commons.logging.LogFactory
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=xalan.envcheck
classname=org.apache.xalan.xslt.EnvironmentCheck
- classpathref=classpath ignoresystemclasses=true/
+ classpathref=classpath ignoresystemclasses=${ignoresystemclasses}/
available property=which.present
classname=org.apache.env.Which
- classpathref=classpath
svn commit: r954939 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/Main.java src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
Author: bodewig
Date: Tue Jun 15 15:46:16 2010
New Revision: 954939
URL: http://svn.apache.org/viewvc?rev=954939view=rev
Log:
resolve properties defined via -propertyfile against each other. PR 18732
Added:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
(with props)
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/Main.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=954939r1=954938r2=954939view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Jun 15 15:46:16 2010
@@ -78,6 +78,12 @@ Other changes:
* You can now specify a list of methods to run in a JUnit test case.
Bugzilla Report 34748.
+ * properties in files read because of the -propertyfile command line
+ option will get now resolved against other properties that are
+ defined before the project starts executing (those from the same or
+ other propertfiles or defined via the -D option).
+ Bugzilla Report 18732.
+
Changes from Ant 1.8.0 TO Ant 1.8.1
===
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Main.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Main.java?rev=954939r1=954938r2=954939view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/Main.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Main.java Tue Jun 15 15:46:16
2010
@@ -37,6 +37,7 @@ import java.util.Vector;
import org.apache.tools.ant.input.DefaultInputHandler;
import org.apache.tools.ant.input.InputHandler;
import org.apache.tools.ant.launch.AntMain;
+import org.apache.tools.ant.property.ResolvePropertyMap;
import org.apache.tools.ant.util.ClasspathUtils;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.ProxySetup;
@@ -762,12 +763,20 @@ public class Main implements AntMain {
project.init();
+// resolve properties
+PropertyHelper propertyHelper
+= (PropertyHelper)
PropertyHelper.getPropertyHelper(project);
+HashMap props = new HashMap(definedProps);
+new ResolvePropertyMap(project, propertyHelper,
+ propertyHelper.getExpanders())
+.resolveAllProperties(props, null);
+
// set user-define properties
-Enumeration e = definedProps.keys();
-while (e.hasMoreElements()) {
-String arg = (String) e.nextElement();
-String value = (String) definedProps.get(arg);
-project.setUserProperty(arg, value);
+for (Iterator e = props.entrySet().iterator(); e.hasNext(); ) {
+Map.Entry ent = (Map.Entry) e.next();
+String arg = (String) ent.getKey();
+Object value = ent.getValue();
+project.setUserProperty(arg, String.valueOf(value));
}
project.setUserProperty(MagicNames.ANT_FILE,
Added:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java?rev=954939view=auto
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
(added)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
Tue Jun 15 15:46:16 2010
@@ -0,0 +1,62 @@
+/*
+ * 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
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintStream;
+import junit.framework.TestCase;
+
+public class PropertyFileCLITest extends TestCase {
+
+public void testPropertyResolution() throws Exception {
+File props = File.createTempFile(propertyfilecli, .properties
svn commit: r955145 - /ant/antlibs/common/trunk/ivy.xml
Author: bodewig
Date: Wed Jun 16 07:30:43 2010
New Revision: 955145
URL: http://svn.apache.org/viewvc?rev=955145view=rev
Log:
use a separate NS for the classifier attribute
Modified:
ant/antlibs/common/trunk/ivy.xml
Modified: ant/antlibs/common/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivy.xml?rev=955145r1=955144r2=955145view=diff
==
--- ant/antlibs/common/trunk/ivy.xml (original)
+++ ant/antlibs/common/trunk/ivy.xml Wed Jun 16 07:30:43 2010
@@ -67,23 +67,23 @@
ivy-author name=Apache Ant Development Team
url=http://ant.apache.org//
/info
-publications
+publications xmlns:e=urn:ant.apache.org:ivy-extras
artifact name=${artifact.name} type=pom ext=pom/
artifact name=${artifact.name} type=pom.asc ext=pom.asc/
artifact name=${artifact.name} type=jar ext=jar/
artifact name=${artifact.name} type=jar.asc ext=jar.asc/
artifact name=${artifact.name} type=source ext=jar
-classifier=sources/
+e:classifier=sources/
artifact name=${artifact.name} type=source.asc ext=jar.asc
-classifier=sources/
+e:classifier=sources/
artifact name=${artifact.name} type=javadoc ext=jar
-classifier=javadoc/
+e:classifier=javadoc/
artifact name=${artifact.name} type=javadoc.asc ext=jar.asc
-classifier=javadoc/
+e:classifier=javadoc/
artifact name=${artifact.name} type=ivy ext=xml
-classifier=ivy/
+e:classifier=ivy/
artifact name=${artifact.name} type=ivy.asc ext=xml.asc
-classifier=ivy/
+e:classifier=ivy/
/publications
/ivy-module
/echoxml
svn commit: r955146 - /ant/antlibs/common/trunk/ivy.xml
Author: bodewig
Date: Wed Jun 16 07:31:39 2010
New Revision: 955146
URL: http://svn.apache.org/viewvc?rev=955146view=rev
Log:
whitespace
Modified:
ant/antlibs/common/trunk/ivy.xml
Modified: ant/antlibs/common/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivy.xml?rev=955146r1=955145r2=955146view=diff
==
--- ant/antlibs/common/trunk/ivy.xml (original)
+++ ant/antlibs/common/trunk/ivy.xml Wed Jun 16 07:31:39 2010
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -40,7 +40,7 @@
available property=project.has-ivy.xml? file=${project.ivy.xml}/
/target
-
+
!-- == --
!-- ivy.xml creation/copy, depending on whether it exists or not --
!-- == --
@@ -67,7 +67,7 @@
ivy-author name=Apache Ant Development Team
url=http://ant.apache.org//
/info
-publications xmlns:e=urn:ant.apache.org:ivy-extras
+publications xmlns:e=urn:ant.apache.org:ivy-extras
artifact name=${artifact.name} type=pom ext=pom/
artifact name=${artifact.name} type=pom.asc ext=pom.asc/
artifact name=${artifact.name} type=jar ext=jar/
svn commit: r955147 - /ant/antlibs/compress/trunk/project-template.ivy.xml
Author: bodewig
Date: Wed Jun 16 07:33:05 2010
New Revision: 955147
URL: http://svn.apache.org/viewvc?rev=955147view=rev
Log:
use a separate NS for the classifier attribute
Modified:
ant/antlibs/compress/trunk/project-template.ivy.xml
Modified: ant/antlibs/compress/trunk/project-template.ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/project-template.ivy.xml?rev=955147r1=955146r2=955147view=diff
==
--- ant/antlibs/compress/trunk/project-template.ivy.xml (original)
+++ ant/antlibs/compress/trunk/project-template.ivy.xml Wed Jun 16 07:33:05 2010
@@ -32,23 +32,23 @@
Apache Commons Compress.
/description
/info
- publications
+ publications xmlns:e=urn:ant.apache.org:ivy-extras
artifact name=${artifact.name} type=pom ext=pom/
artifact name=${artifact.name} type=pom.asc ext=pom.asc/
artifact name=${artifact.name} type=jar ext=jar/
artifact name=${artifact.name} type=jar.asc ext=jar.asc/
artifact name=${artifact.name} type=source ext=jar
- classifier=sources/
+ e:classifier=sources/
artifact name=${artifact.name} type=source.asc ext=jar.asc
- classifier=sources/
+ e:classifier=sources/
artifact name=${artifact.name} type=javadoc ext=jar
- classifier=javadoc/
+ e:classifier=javadoc/
artifact name=${artifact.name} type=javadoc.asc ext=jar.asc
- classifier=javadoc/
+ e:classifier=javadoc/
artifact name=${artifact.name} type=ivy ext=xml
- classifier=ivy/
+ e:classifier=ivy/
artifact name=${artifact.name} type=ivy.asc ext=xml.asc
- classifier=ivy/
+ e:classifier=ivy/
/publications
dependencies
dependency org=org.apache.ant name=ant revision=[1.8.0,)/
svn commit: r955166 - /ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
Author: bodewig
Date: Wed Jun 16 09:36:08 2010
New Revision: 955166
URL: http://svn.apache.org/viewvc?rev=955166view=rev
Log:
use a more robust approach that doesn't rely on stream redirections
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java?rev=955166r1=955165r2=955166view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/PropertyFileCLITest.java
Wed Jun 16 09:36:08 2010
@@ -19,40 +19,44 @@
package org.apache.tools.ant;
import java.io.File;
+import java.io.FileReader;
import java.io.FileWriter;
-import java.io.PrintStream;
import junit.framework.TestCase;
+import org.apache.tools.ant.util.FileUtils;
public class PropertyFileCLITest extends TestCase {
public void testPropertyResolution() throws Exception {
-File props = File.createTempFile(propertyfilecli, .properties);
-props.deleteOnExit();
-FileWriter fw = new FileWriter(props);
-fw.write(w=world\nmessage=Hello, ${w}\n);
-fw.close();
-File build = File.createTempFile(propertyfilecli, .xml);
-build.deleteOnExit();
-fw = new FileWriter(build);
-fw.write(projectecho${message}/echo/project);
-fw.close();
-PrintStream sysOut = System.out;
-StringBuffer sb = new StringBuffer();
+FileUtils fu = FileUtils.getFileUtils();
+File props = fu.createTempFile(propertyfilecli, .properties,
+ null, true, true);
+File build = fu.createTempFile(propertyfilecli, .xml, null, true,
+ true);
+File log = fu.createTempFile(propertyfilecli, .log, null, true,
+ true);
+FileWriter fw = null;
+FileReader fr = null;
try {
-PrintStream out =
-new PrintStream(new BuildFileTest.AntOutputStream(sb));
-System.setOut(out);
+fw = new FileWriter(props);
+fw.write(w=world\nmessage=Hello, ${w}\n);
+fw.close();
+fw = new FileWriter(build);
+fw.write(projectecho${message}/echo/project);
+fw.close();
+fw = null;
Main m = new NoExitMain();
m.startAnt(new String[] {
-propertyfile, props.getAbsolutePath(),
--f, build.getAbsolutePath()
+-f, build.getAbsolutePath(),
+-l, log.getAbsolutePath()
}, null, null);
+String l = FileUtils.safeReadFully(fr = new FileReader(log));
+assertTrue(expected log to contain 'Hello, world' but was + l,
+ l.indexOf(Hello, world) -1);
} finally {
-System.setOut(sysOut);
+FileUtils.close(fw);
+FileUtils.close(fr);
}
-String log = sb.toString();
-assertTrue(expected log to contain 'Hello, world' but was + log,
- log.indexOf(Hello, world) -1);
}
private static class NoExitMain extends Main {
svn commit: r955226 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/util/DOMElementWriter.java src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Author: bodewig
Date: Wed Jun 16 13:42:39 2010
New Revision: 955226
URL: http://svn.apache.org/viewvc?rev=955226view=rev
Log:
use a better approach to encode CDATA end markers in CDATA sections as
suggested by Mark Lassau and Wikipedia. PR 49404
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=955226r1=955225r2=955226view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Jun 16 13:42:39 2010
@@ -20,6 +20,9 @@ Changes that could break older environme
ampersands so that #123; remained #123; rather than being turned
into amp;#123;. This is no longer the case, ampersands will now
be encoded unconditionally.
+ Also DOMElementWriter#encodeData will treat CDATA sections containing a
+ literal ]] sequence different now - it will split the CDATA
+ section between the second ] and and create two sections.
This affects echoxml task as well as the XML logger or JUnit
formatter where ampersands will now always get encoded.
Bugzilla Report 49404.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java?rev=955226r1=955225r2=955226view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java Wed
Jun 16 13:42:39 2010
@@ -467,19 +467,7 @@ public class DOMElementWriter {
}
}
-String result = sb.substring(0);
-int cdEnd = result.indexOf(]]);
-while (cdEnd != -1) {
-sb.setLength(cdEnd);
-// CheckStyle:MagicNumber OFF
-sb.append(#x5d;#x5d;gt;)
-.append(result.substring(cdEnd + 3));
-// CheckStyle:MagicNumber ON
-result = sb.substring(0);
-cdEnd = result.indexOf(]]);
-}
-
-return result;
+return sb.toString().replace(]], ![CDATA[);
}
/**
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java?rev=955226r1=955225r2=955226view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Wed Jun 16 13:42:39 2010
@@ -90,11 +90,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));
}
svn commit: r955266 - /ant/core/trunk/WHATSNEW
Author: bodewig Date: Wed Jun 16 15:27:02 2010 New Revision: 955266 URL: http://svn.apache.org/viewvc?rev=955266view=rev Log: typos Modified: ant/core/trunk/WHATSNEW Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=955266r1=955265r2=955266view=diff == --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Wed Jun 16 15:27:02 2010 @@ -61,7 +61,7 @@ Fixed bugs: * Ant would often scan directories even though there were known to only hold excluded files when evaluating filesets. This never - resulted in worng results but degraded performance of the scan + resulted in wrong results but degraded performance of the scan itself. Bugzilla Report 49420. @@ -82,9 +82,9 @@ Other changes: Bugzilla Report 34748. * properties in files read because of the -propertyfile command line - option will get now resolved against other properties that are + option will now get resolved against other properties that are defined before the project starts executing (those from the same or - other propertfiles or defined via the -D option). + earlier -propertfiles or defined via the -D option). Bugzilla Report 18732. Changes from Ant 1.8.0 TO Ant 1.8.1
svn commit: r955506 - /ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
Author: bodewig
Date: Thu Jun 17 08:40:37 2010
New Revision: 955506
URL: http://svn.apache.org/viewvc?rev=955506view=rev
Log:
Java 1.4
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java?rev=955506r1=955505r2=955506view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java Thu
Jun 17 08:40:37 2010
@@ -411,8 +411,8 @@ public class DOMElementWriter {
* @return the encoded string.
*/
public String encode(String value) {
-StringBuffer sb = new StringBuffer();
int len = value.length();
+StringBuffer sb = new StringBuffer(len);
for (int i = 0; i len; i++) {
char c = value.charAt(i);
switch (c) {
@@ -458,8 +458,8 @@ public class DOMElementWriter {
*/
public String encodedata(final String value) {
-StringBuffer sb = new StringBuffer();
int len = value.length();
+StringBuffer sb = new StringBuffer(len);
for (int i = 0; i len; ++i) {
char c = value.charAt(i);
if (isLegalCharacter(c)) {
@@ -467,7 +467,7 @@ public class DOMElementWriter {
}
}
-return sb.toString().replace(]], ![CDATA[);
+return StringUtils.replace(sb.substring(0), ]], ![CDATA[);
}
/**
svn commit: r955532 - /ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml
Author: bodewig
Date: Thu Jun 17 10:03:15 2010
New Revision: 955532
URL: http://svn.apache.org/viewvc?rev=955532view=rev
Log:
adapt to modified CDATA section escaping in trunk
Modified:
ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml
Modified: ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml?rev=955532r1=955531r2=955532view=diff
==
--- ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml
(original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/listener/xmllistener.xml Thu
Jun 17 10:03:15 2010
@@ -264,13 +264,26 @@ under the License.
clean/
/target
- target name=badcharacters depends=-createreport
+ target name=-readbadcharsreport depends=-createreport
loadfile property=reportxml srcFile=${reportfile} /
+condition property=182+
+ antversion atleast=1.8.2/
+/condition
+ /target
+
+ target name=badcharacters depends=badchars181,badchars182
+clean/
+ /target
+
+ target name=badchars181 depends=-readbadcharsreport unless=182+
au:assertMatches string=${reportxml}
pattern=${systemoutstart}.*amp;#x5d;amp;#x5d;amp;gt;.*${systemoutend}
singleline=true
message=Bad characters not escaped /
-clean/
/target
+ target name=badchars182 depends=-readbadcharsreport if=182+
+au:assertMatches string=${reportxml}
pattern=${systemoutstart}.*gt;lt;!\[CDATA\[gt;.*${systemoutend}
singleline=true
+message=Bad characters not escaped /
+ /target
target name=suiteSetUp
echosuiteSetUp/echo
svn commit: r955574 - /ant/core/trunk/docs/manual/Tasks/attrib.html
Author: bodewig Date: Thu Jun 17 12:39:27 2010 New Revision: 955574 URL: http://svn.apache.org/viewvc?rev=955574view=rev Log: attrib doesn't support parallel/maxparallel. On my Win7 box it looks as if the attrib command could deal with multiple files at once, though, could be a valid enhancement request. Modified: ant/core/trunk/docs/manual/Tasks/attrib.html Modified: ant/core/trunk/docs/manual/Tasks/attrib.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/attrib.html?rev=955574r1=955573r2=955574view=diff == --- ant/core/trunk/docs/manual/Tasks/attrib.html (original) +++ ant/core/trunk/docs/manual/Tasks/attrib.html Thu Jun 17 12:39:27 2010 @@ -43,13 +43,13 @@ nested codelt;filesetgt;/code, co href=../Types/resources.html#collectionResource Collection/as as nested elements./p -pBy default this task will use a single invocation of the underlying +!--pBy default this task will use a single invocation of the underlying attrib command. If you are working on a large number of files this may result in a command line that is too long for your operating system. If you encounter such problems, you should set the maxparallel attribute of this task to a non-zero value. The number to use highly depends on the length of your file names (the depth of your -directory tree), so you'll have to experiment a little./p +directory tree), so you'll have to experiment a little./p-- pBy default this task won't do anything unless it detects it is running on a Windows system. If you know for sure that you have a @@ -104,7 +104,7 @@ directory tree), so you'll have to exper Defaults to codefalse/code./td td align=center valign=topNo/td /tr - tr + !--tr td valign=topparallel/td td valign=topprocess all specified files using a single codechmod/code command. Defaults to true./td @@ -116,7 +116,7 @@ directory tree), so you'll have to exper most this many sourcefiles at once. Set it to lt;= 0 for unlimited. Defaults to unlimited. emSince Ant 1.6./em/td td align=center valign=topNo/td - /tr + /tr-- tr td valign=topos/td td valign=toplist of Operating Systems on which the command may be
svn commit: r955633 - /ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml
Author: bodewig
Date: Thu Jun 17 15:19:54 2010
New Revision: 955633
URL: http://svn.apache.org/viewvc?rev=955633view=rev
Log:
some more tests
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml
Modified: ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml?rev=955633r1=955632r2=955633view=diff
==
--- ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml Thu Jun 17
15:19:54 2010
@@ -87,5 +87,50 @@ y=$${x}
]]/echo
property file=${input}/x.properties/
au:assertPropertyEquals name=y value=x/
+echo file=${input}/y.properties![CDATA[
+x=y
+y=$${x}
+]]/echo
+property file=${input}/y.properties prefix=foo/
+!-- passes in Ant 1.8.0 and 1.7.1, fails in 1.8.1 --
+!--au:assertPropertyEquals name=foo.y value=x/--
+echo file=${input}/z.properties![CDATA[
+x=y
+y=$${bar.x}
+]]/echo
+property file=${input}/z.properties prefix=bar/
+!-- passes in Ant 1.7.1 and 1.8.1, fails in 1.8.0 --
+au:assertPropertyEquals name=bar.y value=y/
+ /target
+
+ !-- passes in Ant 1.7.1 and 1.8.1, fails in 1.8.0 --
+ target name=testMultiplePrefixes
+
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=48768;
+mkdir dir=${input}/
+echo file=${input}/x.properties![CDATA[
+x=1
+y=2
+]]/echo
+property file=${input}/x.properties/
+au:assertPropertyEquals name=x value=1/
+au:assertPropertyEquals name=y value=2/
+echo file=${input}/y.properties![CDATA[
+x=3
+]]/echo
+property file=${input}/y.properties prefix=foo/
+au:assertPropertyEquals name=foo.x value=3/
+ /target
+
+!-- passes in Ant 1.7.1 and 1.8.0, fails in 1.8.1 --
+ target name=NOtestNestedExpansionDoesntUsePrefix
+
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=49373;
+mkdir dir=${input}/
+property name=x value=x/
+echo file=${input}/x.properties![CDATA[
+x=y
+y=$${x}
+]]/echo
+property file=${input}/x.properties prefix=foo/
+au:assertPropertyEquals name=foo.y value=x/
/target
/project
svn commit: r955896 - in /ant/core/trunk: WHATSNEW docs/manual/using.html src/main/org/apache/tools/ant/types/Path.java src/tests/antunit/types/path-test.xml
Author: bodewig
Date: Fri Jun 18 09:03:34 2010
New Revision: 955896
URL: http://svn.apache.org/viewvc?rev=955896view=rev
Log:
Support wildcards in CLASSPATH. PR 46842. Based on patch by Mike Murray.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/using.html
ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java
ant/core/trunk/src/tests/antunit/types/path-test.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=955896r1=955895r2=955896view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jun 18 09:03:34 2010
@@ -87,6 +87,14 @@ Other changes:
earlier -propertfiles or defined via the -D option).
Bugzilla Report 18732.
+ * pathelements can now contain wildcards in order to use wildcard
+ CLASSPATH entries introduced with Java6.
+ The wildcards are not expanded or even evaluated by Ant and will be
+ used literally. The resulting path may be unusable as a CLASSPATH
+ for Java versions prior to Java6 and likely doesn't mean anything
+ when used in any other way than a CLASSPATH for a forked Java VM.
+ Bugzilla Report 46842.
+
Changes from Ant 1.8.0 TO Ant 1.8.1
===
Modified: ant/core/trunk/docs/manual/using.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/using.html?rev=955896r1=955895r2=955896view=diff
==
--- ant/core/trunk/docs/manual/using.html (original)
+++ ant/core/trunk/docs/manual/using.html Fri Jun 18 09:03:34 2010
@@ -262,6 +262,12 @@ or semicolon-separated lists of location
attribute is intended to be used with predefined paths - in any other
case, multiple elements with codelocation/code attributes should be
preferred./p
+pemSince Ant 1.8.2/em the location attribute can also contain a
+ wildcard in its last path component (i.e. it can end in a
+ quot;*quot;) in order to support wildcard CLASSPATHs introduced
+ with Java6. Ant will not expand or evaluate the wildcards and the
+ resulting path may not work as anything else but a CLASSPATH - or
+ even as a CLASSPATH for a Java VM prior to Java6./p
pAs a shortcut, the codelt;classpathgt;/code tag
supports codepath/code and
codelocation/code attributes of its own, so:/p
Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java?rev=955896r1=955895r2=955896view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/Path.java Fri Jun 18
09:03:34 2010
@@ -342,6 +342,12 @@ public class Path extends DataType imple
}
if (f.exists()) {
setLocation(f);
+} else if (f.getParentFile() != null f.getParentFile().exists()
+containsWildcards(f.getName())) {
+setLocation(f);
+log(adding + f + which contains wildcards and may not
++ do what you intend it to do depending on your OS or
++ version of Java, Project.MSG_VERBOSE);
} else {
log(dropping + f + from path as it doesn't exist,
Project.MSG_VERBOSE);
@@ -759,4 +765,14 @@ public class Path extends DataType imple
}
return preserveBC.booleanValue();
}
+
+/**
+ * Does the given file name contain wildcards?
+ * @since Ant 1.8.2
+ */
+private static boolean containsWildcards(String path) {
+return path != null
+ (path.indexOf(*) -1 || path.indexOf(?) -1);
+}
+
}
Modified: ant/core/trunk/src/tests/antunit/types/path-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/path-test.xml?rev=955896r1=955895r2=955896view=diff
==
--- ant/core/trunk/src/tests/antunit/types/path-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/types/path-test.xml Fri Jun 18 09:03:34
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
svn commit: r955909 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Author: bodewig
Date: Fri Jun 18 09:37:07 2010
New Revision: 955909
URL: http://svn.apache.org/viewvc?rev=955909view=rev
Log:
don't warn about multiple versions of Ant if the CLASSPATH entries really point
to the same JAR. PR 49041
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=955909r1=955908r2=955909view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jun 18 09:37:07 2010
@@ -71,6 +71,11 @@ Fixed bugs:
* junitreport did not handle encodings well for stdout/stderr.
Bugzilla Report 49418.
+ * junit could issue a warning about multiple versions of Ant on the
+ CLASSPATH if two CLASSPATH entries differed in case on a
+ case-insensitive file system.
+ Bugzilla Report 49041.
+
Other changes:
--
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?rev=955909r1=955908r2=955909view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Fri Jun 18 09:37:07 2010
@@ -1145,7 +1145,7 @@ public class JUnitTask extends Task {
for (Enumeration e = loader.getResources(projectResourceName);
e.hasMoreElements();) {
URL current = (URL) e.nextElement();
-if (previous != null !current.equals(previous)) {
+if (previous != null !urlEquals(current, previous)) {
log(WARNING: multiple versions of ant detected
+ in path for junit
+ LINE_SEP + + previous
@@ -1166,6 +1166,30 @@ public class JUnitTask extends Task {
}
/**
+ * Compares URLs for equality but takes case-sensitivity into
+ * account when comparing file URLs and ignores the jar specific
+ * part of the URL if present.
+ */
+private static boolean urlEquals(URL u1, URL u2) {
+String url1 = maybeStripJarAndClass(u1);
+String url2 = maybeStripJarAndClass(u2);
+if (url1.startsWith(file:) url2.startsWith(file:)) {
+return new File(FILE_UTILS.fromURI(url1))
+.equals(new File(FILE_UTILS.fromURI(url2)));
+}
+return u1.equals(u2);
+}
+
+private static String maybeStripJarAndClass(URL u) {
+String s = u.toString();
+if (s.startsWith(jar:)) {
+int pling = s.indexOf(!);
+s = s.substring(4, pling == -1 ? s.length() : pling);
+}
+return s;
+}
+
+/**
* Create a temporary file to pass the properties to a new process.
* Will auto-delete on (graceful) exit.
* The file will be in the project basedir unless tmpDir declares
svn commit: r957170 - in /ant/core/trunk: ./ docs/manual/ src/main/org/apache/tools/ant/ src/main/org/apache/tools/ant/helper/ src/main/org/apache/tools/ant/taskdefs/ src/tests/antunit/core/
Author: bodewig
Date: Wed Jun 23 12:15:13 2010
New Revision: 957170
URL: http://svn.apache.org/viewvc?rev=957170view=rev
Log:
allow targets to deal with missing extension points. PR 49473. Submitted by
Danny Yates.
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/docs/manual/targets.html
ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
ant/core/trunk/src/tests/antunit/core/extension-point-test.xml
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=957170r1=957169r2=957170view=diff
==
--- ant/core/trunk/CONTRIBUTORS (original)
+++ ant/core/trunk/CONTRIBUTORS Wed Jun 23 12:15:13 2010
@@ -70,6 +70,7 @@ Daniel Henrique
Daniel Ribagnac
Daniel Spilker
Danno Ferrin
+Danny Yates
Dante Briones
Davanum Srinivas
Dave Brondsema
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=957170r1=957169r2=957170view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Jun 23 12:15:13 2010
@@ -27,6 +27,11 @@ Changes that could break older environme
formatter where ampersands will now always get encoded.
Bugzilla Report 49404.
+ * The list elements returned by ProjectHelper#getExtensionStack are
+ now String arrays of length 3 rather than 2 in order to support the
+ onMissingExtensionPoint attribute.
+ Bugzilla Report 49473.
+
Fixed bugs:
---
@@ -100,6 +105,13 @@ Other changes:
when used in any other way than a CLASSPATH for a forked Java VM.
Bugzilla Report 46842.
+ * A new attribute allows targets to deal with non-existant extensions
+ points, i.e. they can extend and extension-point if it has been
+ defined or silently work as plain targets if it hasn't. This is
+ useful for targets that get included/imported in different
+ scenarios where a given extension-point may or may not exist.
+ Bugzilla Report 49473.
+
Changes from Ant 1.8.0 TO Ant 1.8.1
===
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=957170r1=957169r2=957170view=diff
==
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Wed Jun 23 12:15:13 2010
@@ -304,6 +304,10 @@
lastFerrin/last
/name
name
+firstDanny/first
+lastYates/last
+ /name
+ name
firstDante/first
lastBriones/last
/name
Modified: ant/core/trunk/docs/manual/targets.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/targets.html?rev=957170r1=957169r2=957170view=diff
==
--- ant/core/trunk/docs/manual/targets.html (original)
+++ ant/core/trunk/docs/manual/targets.html Wed Jun 23 12:15:13 2010
@@ -205,6 +205,17 @@
emsince Ant 1.8.0./em/td
td align=center valign=topNo/td
/tr
+tr
+ td valign=toponMissingExtensionPoint/td
+ td valign=topWhat to do if this target tries to extend a
+missing
+a href=#extension-pointsextension-point/a. (fail,
+warn, ignore).
+emsince Ant 1.8.2./em/td
+ td align=center valign=topNo. Not allowed unless
+codeextensionOf/code is present. Defaults to codefail/code.
+ /td
+/tr
/table
pA target name can be any alphanumeric string valid in the
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java?rev=957170r1=957169r2=957170view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java Wed Jun 23
12:15:13 2010
@@ -82,6 +82,23 @@ public class ProjectHelper {
helper.parse(project, buildFile);
}
+/**
+ * Possible value for target's onMissingExtensionPoint attribute:
+ * fail if the extension-point is not defined.
+ */
+public static final String MISSING_EP_FAIL = fail;
+/**
+ * Possible value for target's onMissingExtensionPoint attribute:
+ * warn if the extension-point is not defined.
+ */
+public static final String MISSING_EP_WARN = warn;
+/**
+ * Possible value for target's onMissingExtensionPoint attribute:
+ * ignore the extensionOf attribute if the extension-point is not
+ * defined.
+ */
+public static
svn commit: r957441 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
Author: bodewig
Date: Thu Jun 24 07:33:35 2010
New Revision: 957441
URL: http://svn.apache.org/viewvc?rev=957441view=rev
Log:
Use FileUtils#setFileLastModified instead of File#setLastModified
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java?rev=957441r1=957440r2=957441view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java Thu Jun
24 07:33:35 2010
@@ -435,7 +435,7 @@ public class SignJar extends AbstractJar
// restore the lastModified attribute
if (preserveLastModified) {
-targetFile.setLastModified(lastModified);
+FILE_UTILS.setFileLastModified(targetFile, lastModified);
}
}
svn commit: r957442 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/types/resources/FileResource.java
Author: bodewig
Date: Thu Jun 24 07:39:11 2010
New Revision: 957442
URL: http://svn.apache.org/viewvc?rev=957442view=rev
Log:
log a warning message if File#setLastModified fails. PR 49485
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=957442r1=957441r2=957442view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jun 24 07:39:11 2010
@@ -112,6 +112,11 @@ Other changes:
scenarios where a given extension-point may or may not exist.
Bugzilla Report 49473.
+ * Ant now logs a warning message if it fails to change the file
+ modification time in for example when using touch or preserving
+ timestamps in various tasks.
+ Bugzilla Report 49485.
+
Changes from Ant 1.8.0 TO Ant 1.8.1
===
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java?rev=957442r1=957441r2=957442view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/FileResource.java
Thu Jun 24 07:39:11 2010
@@ -345,7 +345,9 @@ public class FileResource extends Resour
((FileResource) getCheckedRef()).touch(modTime);
return;
}
-getNotNullFile().setLastModified(modTime);
+if (!getNotNullFile().setLastModified(modTime)) {
+log(Failed to change file modification time, Project.MSG_WARN);
+}
}
/**
svn commit: r957444 - /ant/core/trunk/docs/manual/Tasks/touch.html
Author: bodewig Date: Thu Jun 24 07:51:34 2010 New Revision: 957444 URL: http://svn.apache.org/viewvc?rev=957444view=rev Log: document touch's limitations. PR 47821 Modified: ant/core/trunk/docs/manual/Tasks/touch.html Modified: ant/core/trunk/docs/manual/Tasks/touch.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/touch.html?rev=957444r1=957443r2=957444view=diff == --- ant/core/trunk/docs/manual/Tasks/touch.html (original) +++ ant/core/trunk/docs/manual/Tasks/touch.html Thu Jun 24 07:51:34 2010 @@ -34,6 +34,18 @@ resource collections (which also include 1.7 only FileSet or a href=../Types/filelist.htmlFilelist/a (since Ant 1.6) have been supported./p +pAnt uses the API of codejava.io.File/code to set the last + modification time which has some limitations. For example the + timestamp granularity depends on the operating system and sometimes + the operating system may allow a granularity smaller than + milliseconds. If you need more control you have to fall back to + the codelt;execgt;/code task and native commands./p + +pStarting with Ant 1.8.2 Ant will log a warning message if it fails + to change the file modification time. This will happen if you try + to change the modification time of a file you do not own on many + Unix systems, for example./p + h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 tr
svn commit: r958857 - in /ant/core/trunk/src: main/org/apache/tools/ant/util/DOMElementWriter.java tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Author: bodewig
Date: Tue Jun 29 07:46:06 2010
New Revision: 958857
URL: http://svn.apache.org/viewvc?rev=958857view=rev
Log:
properly encode whitespace in attribute values
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java?rev=958857r1=958856r2=958857view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/DOMElementWriter.java Tue
Jun 29 07:46:06 2010
@@ -332,7 +332,7 @@ public class DOMElementWriter {
}
out.write(attr.getName());
out.write(=\);
-out.write(encode(attr.getValue()));
+out.write(encodeAttributeValue(attr.getValue()));
out.write(\);
}
@@ -411,6 +411,21 @@ public class DOMElementWriter {
* @return the encoded string.
*/
public String encode(String value) {
+return encode(value, false);
+}
+
+/**
+ * Escape lt;, gt; amp; apos;, quot; as their entities, \n,
+ * \r and \t as numeric entities and drop characters that are
+ * illegal in XML documents.
+ * @param value the string to encode.
+ * @return the encoded string.
+ */
+public String encodeAttributeValue(String value) {
+return encode(value, true);
+}
+
+private String encode(String value, boolean encodeWhitespace) {
int len = value.length();
StringBuffer sb = new StringBuffer(len);
for (int i = 0; i len; i++) {
@@ -431,6 +446,15 @@ public class DOMElementWriter {
case '':
sb.append(amp;);
break;
+case '\r':
+case '\n':
+case '\t':
+if (encodeWhitespace) {
+
sb.append(#x).append(Integer.toHexString(c)).append(;);
+} else {
+sb.append(c);
+}
+break;
default:
if (isLegalCharacter(c)) {
sb.append(c);
Modified:
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java?rev=958857r1=958856r2=958857view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
(original)
+++
ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
Tue Jun 29 07:46:06 2010
@@ -68,6 +68,40 @@ public class DOMElementWriterTest extend
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));
}
svn commit: r959019 - in /ant/core/trunk: ./ docs/manual/Tasks/ src/main/org/apache/tools/ant/ src/main/org/apache/tools/ant/property/ src/main/org/apache/tools/ant/taskdefs/ src/tests/antunit/taskdef
Author: bodewig
Date: Tue Jun 29 16:16:41 2010
New Revision: 959019
URL: http://svn.apache.org/viewvc?rev=959019view=rev
Log:
reinstate prefix handling of property task at the expense of even more state in
a thread-unfriendly class and with a new attribute on two tasks to make
everybody happy. PR 49373.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/Tasks/loadproperties.html
ant/core/trunk/docs/manual/Tasks/property.html
ant/core/trunk/src/main/org/apache/tools/ant/Main.java
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
ant/core/trunk/src/tests/antunit/taskdefs/property-test.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=959019r1=959018r2=959019view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Jun 29 16:16:41 2010
@@ -32,6 +32,14 @@ Changes that could break older environme
onMissingExtensionPoint attribute.
Bugzilla Report 49473.
+ * When using property file=... prefix=.../ properties defined
+ inside the same file will only get used in expansions if the ${}
+ reference uses the same prefix. This is different from Ant 1.8.1
+ but is the same behavior Ant 1.8.0 and earlier exhibited.
+ A new attribute prefixValues can be used to re-enable the behavior
+ of Ant 1.8.1.
+ Bugzilla Report 49373.
+
Fixed bugs:
---
Modified: ant/core/trunk/docs/manual/Tasks/loadproperties.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/loadproperties.html?rev=959019r1=959018r2=959019view=diff
==
--- ant/core/trunk/docs/manual/Tasks/loadproperties.html (original)
+++ ant/core/trunk/docs/manual/Tasks/loadproperties.html Tue Jun 29 16:16:41
2010
@@ -33,10 +33,11 @@ Also if the file is missing, the build i
than a warning being printed.
/p
-pIf you want to simulate a href=property.htmlproperty/a's
-prefix attribute, please use a
-href=../Types/filterchain.html#prefixlinesprefixlines/a
-filter./p
+pstrongNote:/strong the default value of this
+task's codeprefixValues/code attribute is different from the
+default value of the same attribute in
+the a href=property.htmlcodelt;propertygt;/code/a
+task./p
h3Parameters/h3
table border=1 cellpadding=2 cellspacing=0
@@ -78,6 +79,13 @@ filter./p
a . is appended to the prefix if not specified. emSince Ant
1.8.1/em/td
td align=center valign=topNo/td
/tr
+ tr
+td valign=topprefixValues/td
+td valign=topWhether to apply the prefix when expanding the
+ right hand side of the properties.
+ emSince Ant 1.8.2/em/td
+td align=center valign=topNo (default=tttrue/tt)/td
+ /tr
/table
h3Parameters specified as nested elements/h3
Modified: ant/core/trunk/docs/manual/Tasks/property.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/property.html?rev=959019r1=959018r2=959019view=diff
==
--- ant/core/trunk/docs/manual/Tasks/property.html (original)
+++ ant/core/trunk/docs/manual/Tasks/property.html Tue Jun 29 16:16:41 2010
@@ -155,6 +155,14 @@ SYSTEM).
td align=center valign=topNo/td
/tr
tr
+td valign=topprefixValues/td
+td valign=topWhether to apply the prefix when expanding the
+ right hand side of properties loaded using codefile/code,
+ coderesource/code, or codeurl/code.
+ emSince Ant 1.8.2/em/td
+td align=center valign=topNo (default=ttfalse/tt)/td
+ /tr
+ tr
td valign=toprelative/td
td valign=topIf set to tttrue/tt the relative path
to ttbasedir/tt is set. emSince Ant 1.8.0/em/td
@@ -198,7 +206,7 @@ to be your home directory. Where the q
the file system depends on the operating system version and the JVM
implementation.
On Unix based systems, this will map to the user's home directory. On modern
Windows
variants, this will most likely resolve to the user's directory in the
quot;Documents
-and Settingsquot; folder. Older windows variants such as Windows 98/ME are
less
+and Settingsquot; or quot;Usersquot; folder. Older windows variants such as
Windows 98/ME are less
predictable, as are other operating system/JVM combinations./p
pre
@@ -247,8 +255,12 @@ project, that team members can customize
a
href=http://java.sun.com/j2se/1.4.2/docs/api/java/util/Properties.html#load(java.io.InputStream)by
Sun/a.
This makes it hard for Team Ant to field bug reports about it.
liTrailing spaces are not stripped. It may have been what you wanted.
-liWant unusual characters? Escape them \u0456 or \ style.
-liAnt Properties are expanded in the file.
+liWant unusual characters
svn commit: r959175 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
Author: bodewig
Date: Wed Jun 30 03:25:26 2010
New Revision: 959175
URL: http://svn.apache.org/viewvc?rev=959175view=rev
Log:
revert local change that should never have been committed
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java?rev=959175r1=959174r2=959175view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java Wed Jun
30 03:25:26 2010
@@ -498,6 +498,7 @@ public class Execute {
watchdog.stop();
}
streamHandler.stop();
+closeStreams(process);
if (watchdog != null) {
watchdog.checkException();
svn commit: r959176 - /ant/core/trunk/WHATSNEW
Author: bodewig Date: Wed Jun 30 03:27:33 2010 New Revision: 959176 URL: http://svn.apache.org/viewvc?rev=959176view=rev Log: new handling of attributes breaks BWC Modified: ant/core/trunk/WHATSNEW Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=959176r1=959175r2=959176view=diff == --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Wed Jun 30 03:27:33 2010 @@ -25,6 +25,8 @@ Changes that could break older environme section between the second ] and and create two sections. This affects echoxml task as well as the XML logger or JUnit formatter where ampersands will now always get encoded. + In addition DOMElementWriter will now replace the characters \t, \r + and \n in attribute values by entity references. Bugzilla Report 49404. * The list elements returned by ProjectHelper#getExtensionStack are
svn commit: r959177 - /ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
Author: bodewig
Date: Wed Jun 30 03:36:57 2010
New Revision: 959177
URL: http://svn.apache.org/viewvc?rev=959177view=rev
Log:
simplify fix for PR 49373
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java?rev=959177r1=959176r2=959177view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
Wed Jun 30 03:36:57 2010
@@ -66,20 +66,31 @@ public class ResolvePropertyMap implemen
}
try {
+
+// If the property we are looking up is a key in the map
+// (first call into this method from resolveAllProperties)
+// or we've been asked to prefix the value side (later
+// recursive calls via the GetProperty interface) the
+// prefix must be prepended when looking up the property
+// outside of the map.
String fullKey = name;
-if (prefix != null prefixValues) {
+if (prefix != null (expandingLHS || prefixValues)) {
fullKey = prefix + name;
}
-Object masterValue = expandingLHS
-? null : master.getProperty(fullKey);
-// if the property is defined outside of this map don't
-// consult the map at all.
+
+Object masterValue = master.getProperty(fullKey);
if (masterValue != null) {
+// If the property already has a value outside of the
+// map, use that value to enforce property
+// immutability.
+
return masterValue;
}
-expandingLHS = false;
seen.add(name);
+expandingLHS = false;
+// will recurse into this method for each property
+// reference found in the map's value
return parseProperties.parseProperties((String) map.get(name));
} finally {
seen.remove(name);
@@ -125,19 +136,7 @@ public class ResolvePropertyMap implemen
for (Iterator i = map.keySet().iterator(); i.hasNext();) {
expandingLHS = true;
String key = (String) i.next();
-
-// if the property has already been set to the name it
-// will have in the end, then return the existing value to
-// ensure properties remain immutable
-String fullKey = key;
-if (prefix != null) {
-fullKey = prefix + key;
-}
-Object result = master.getProperty(fullKey);
-
-if (result == null) {
-result = getProperty(key);
-}
+Object result = getProperty(key);
String value = result == null ? : result.toString();
map.put(key, value);
}
svn commit: r960574 - in /ant/core/trunk/src/etc/gump-poms: ./ ant.pom
Author: bodewig Date: Mon Jul 5 12:06:57 2010 New Revision: 960574 URL: http://svn.apache.org/viewvc?rev=960574view=rev Log: a POM to help Gump - Ant 1.6.5's POM lacks a dependency on ant-launcher Added: ant/core/trunk/src/etc/gump-poms/ ant/core/trunk/src/etc/gump-poms/ant.pom (with props) Added: ant/core/trunk/src/etc/gump-poms/ant.pom URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/gump-poms/ant.pom?rev=960574view=auto == --- ant/core/trunk/src/etc/gump-poms/ant.pom (added) +++ ant/core/trunk/src/etc/gump-poms/ant.pom Mon Jul 5 12:06:57 2010 @@ -0,0 +1,34 @@ +?xml version=1.0 encoding=UTF-8? +!-- + 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 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +!-- + This POM has been created manually by the Ant Development Team for + Apache Gump in order to redirect users of very old Ant versions. + The versions are completely irrelevant for Gump. + Don't use it for any other purpose. +-- +project + modelVersion4.0.0/modelVersion + groupIdant/groupId + artifactIdant/artifactId + version1.6.5/version + distributionManagement +relocation + groupIdorg.apache.ant/groupId +/relocation + /distributionManagement +/project Propchange: ant/core/trunk/src/etc/gump-poms/ant.pom -- svn:eol-style = native
svn commit: r960770 - /ant/core/trunk/src/etc/gump-poms/ant.pom
Author: bodewig Date: Tue Jul 6 03:51:43 2010 New Revision: 960770 URL: http://svn.apache.org/viewvc?rev=960770view=rev Log: relocation is causing different problems Modified: ant/core/trunk/src/etc/gump-poms/ant.pom Modified: ant/core/trunk/src/etc/gump-poms/ant.pom URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/gump-poms/ant.pom?rev=960770r1=960769r2=960770view=diff == --- ant/core/trunk/src/etc/gump-poms/ant.pom (original) +++ ant/core/trunk/src/etc/gump-poms/ant.pom Tue Jul 6 03:51:43 2010 @@ -17,7 +17,9 @@ -- !-- This POM has been created manually by the Ant Development Team for - Apache Gump in order to redirect users of very old Ant versions. + Apache Gump in order to help users of very old Ant versions (the POM + inside the mvn repository has not been created by Ant developers and + lacks a dependency on ant-launcher). The versions are completely irrelevant for Gump. Don't use it for any other purpose. -- @@ -26,9 +28,12 @@ groupIdant/groupId artifactIdant/artifactId version1.6.5/version - distributionManagement -relocation - groupIdorg.apache.ant/groupId -/relocation - /distributionManagement + dependencies +dependency + groupIdant/groupId + artifactIdant-launcher/artifactId + version1.6.5/version + scopecompile/scope +/dependency + /dependencies /project
svn commit: r962483 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/Mkdir.java
Author: bodewig
Date: Fri Jul 9 11:04:49 2010
New Revision: 962483
URL: http://svn.apache.org/viewvc?rev=962483view=rev
Log:
multiple parallel mkdirs could make each other fail. PR 49572
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=962483r1=962482r2=962483view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jul 9 11:04:49 2010
@@ -96,6 +96,10 @@ Fixed bugs:
resourcelist in the documentation (getting the first available resource
from a mirror list).
+ * A race condition could lead to build failures if multiple mkdir
+ tasks were trying to create the same directory.
+ Bugzilla Report 49572.
+
Other changes:
--
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Mkdir.java?rev=962483r1=962482r2=962483view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Mkdir.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Mkdir.java Fri Jul 9
11:04:49 2010
@@ -59,6 +59,12 @@ public class Mkdir extends Task {
if (!dir.exists()) {
boolean result = mkdirs(dir);
if (!result) {
+if (dir.exists()) {
+log(A different process or task has already created
++ dir + dir.getAbsolutePath(),
+Project.MSG_VERBOSE);
+return;
+}
String msg = Directory + dir.getAbsolutePath()
+ creation was not successful for an unknown reason;
throw new BuildException(msg, getLocation());
svn commit: r962984 - /ant/core/trunk/xdocs/external.xml
Author: bodewig Date: Sun Jul 11 05:35:26 2010 New Revision: 962984 URL: http://svn.apache.org/viewvc?rev=962984view=rev Log: remove author Modified: ant/core/trunk/xdocs/external.xml Modified: ant/core/trunk/xdocs/external.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/external.xml?rev=962984r1=962983r2=962984view=diff == --- ant/core/trunk/xdocs/external.xml (original) +++ ant/core/trunk/xdocs/external.xml Sun Jul 11 05:35:26 2010 @@ -18,7 +18,6 @@ document properties -author email=bode...@apache.orgStefan Bodewig/author titleExternal Tools and Tasks/title !-- Last link check: 2009-03-06 -- /properties
svn commit: r962988 - /ant/core/trunk/docs/external.html
Author: bodewig Date: Sun Jul 11 05:53:17 2010 New Revision: 962988 URL: http://svn.apache.org/viewvc?rev=962988view=rev Log: regenerate site Modified: ant/core/trunk/docs/external.html Modified: ant/core/trunk/docs/external.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/external.html?rev=962988r1=962987r2=962988view=diff == --- ant/core/trunk/docs/external.html (original) +++ ant/core/trunk/docs/external.html Sun Jul 11 05:53:17 2010 @@ -23,9 +23,7 @@ META http-equiv=Content-Type content=text/html; charset=ISO-8859-1 titleApache Ant - External Tools and Tasks/title link type=text/css href=./page.css rel=stylesheet - meta name=author content=Stefan Bodewig - meta name=email content=bode...@apache.org - /head +/head body p class=navpath @@ -1452,6 +1450,67 @@ /tr /table h4 class=subsection +a name=Commons Configuration Ant Task/a +Commons Configuration Ant Task + /h4 +pA set of Ant task that help convert Apache Commons + Configuration property files into build properties, java Enum's + (that are populated at runtime), and any exportable property / + env file desired (e.g., csh, bash, bat, etc.)./p +pThis project provides the following tasks: + ul + libCreateEnumTask/b: Creates a Java enum based on + commons configuration property files. /li + libExportPropertiesTask/b: Exports commons + configuration properties to a external file in a using a + specified format./li + libLoadPropertiesTask/b: Loads commons configuration + properties into pre-generated Java enum./li + /ul + /p + table class=externals cellspacing=1 cellpadding=4 + tr + th colspan=1 rowspan=1 + valign=top align=left + Compatibility: + /th + td colspan=1 rowspan=1 + valign=top align=left + Ant 1.6 and above + /td + /tr + tr + th colspan=1 rowspan=1 + valign=top align=left + URL: + /th + td colspan=1 rowspan=1 + valign=top align=left + a href=http://code.google.com/p/commonsconfiganttask/;http://code.google.com/p/commonsconfiganttask//a + /td + /tr + tr + th colspan=1 rowspan=1 + valign=top align=left + Contact: + /th + td colspan=1 rowspan=1 + valign=top align=left + a href=mailto:ndunn.at.me.com;ndunn at me.com/a + /td + /tr + tr + th colspan=1 rowspan=1 + valign=top align=left + License: + /th + td colspan=1 rowspan=1 + valign=top align=left + Apache License 2.0 + /td + /tr + /table + h4 class=subsection a name=Configure/a Configure /h4 @@ -6939,7 +6998,7 @@ /th td colspan=1 rowspan=1 valign=top align=left - bundles 1.8.0 starting with NetBeans 6.9 + bundles 1.8.0 starting with NetBeans 6.9; 1.8.1 for 6.9.1 /td /tr tr
svn commit: r963687 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/types/resources/Resources.java src/tests/antunit/types/resources/resources-test.xml
Author: bodewig
Date: Tue Jul 13 11:58:59 2010
New Revision: 963687
URL: http://svn.apache.org/viewvc?rev=963687view=rev
Log:
Resources#toString relies on cache too much. PR 49588
Added:
ant/core/trunk/src/tests/antunit/types/resources/resources-test.xml (with
props)
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=963687r1=963686r2=963687view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Jul 13 11:58:59 2010
@@ -100,6 +100,12 @@ Fixed bugs:
tasks were trying to create the same directory.
Bugzilla Report 49572.
+ * the toString() method of the Resources class - and thus any
+ ${toString:} expansion of a reference to a resources element -
+ didn't iterate over its nested elements if it hadn't done so prior
+ to the toString invocation already.
+ Bugzilla Report 49588.
+
Other changes:
--
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java?rev=963687r1=963686r2=963687view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/resources/Resources.java
Tue Jul 13 11:58:59 2010
@@ -208,6 +208,7 @@ public class Resources extends DataType
if (isReference()) {
return getCheckedRef().toString();
}
+validate();
if (coll == null || coll.isEmpty()) {
return ;
}
Added: ant/core/trunk/src/tests/antunit/types/resources/resources-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/resources/resources-test.xml?rev=963687view=auto
==
--- ant/core/trunk/src/tests/antunit/types/resources/resources-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/types/resources/resources-test.xml Tue Jul
13 11:58:59 2010
@@ -0,0 +1,32 @@
+?xml version=1.0 encoding=utf-8?
+!--
+ 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
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--
+project default=antunit xmlns:au=antlib:org.apache.ant.antunit
+
+ import file=../../antunit-base.xml/
+
+ target name=testToString
+
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=49588;
+resources id=A
+ string value=b/
+/resources
+union id=unionresources refid=A//union
+au:assertEquals expected=b actual=${toString:A}/
+au:assertEquals expected=b actual=${toString:union}/
+au:assertEquals expected=b actual=${toString:A}/
+ /target
+/project
Propchange: ant/core/trunk/src/tests/antunit/types/resources/resources-test.xml
--
svn:eol-style = native
svn commit: r964076 - in /ant/core/trunk: ReleaseInstructions build.xml
Author: bodewig
Date: Wed Jul 14 15:06:49 2010
New Revision: 964076
URL: http://svn.apache.org/viewvc?rev=964076view=rev
Log:
create distribution artifacts for the manual
Modified:
ant/core/trunk/ReleaseInstructions
ant/core/trunk/build.xml
Modified: ant/core/trunk/ReleaseInstructions
URL:
http://svn.apache.org/viewvc/ant/core/trunk/ReleaseInstructions?rev=964076r1=964075r2=964076view=diff
==
--- ant/core/trunk/ReleaseInstructions (original)
+++ ant/core/trunk/ReleaseInstructions Wed Jul 14 15:06:49 2010
@@ -230,7 +230,7 @@ Note: This document was updated in the c
* upload the new release files to
from distribution
- to /www/www.apache.org/dist/ant/[source|binaries].
+ to /www/www.apache.org/dist/ant/[source|binaries|manual].
* upload the maven artifacts located under java-repository/org/apache/ant
@@ -280,7 +280,7 @@ Note: This document was updated in the c
21. Clean up.
* remove the remaining files of the previous release and betas from
- /www/www.apache.org/dist/ant/[source|binaries].
+ /www/www.apache.org/dist/ant/[source|binaries|manual].
This includes the old release notes.
(+)
Modified: ant/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=964076r1=964075r2=964076view=diff
==
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Wed Jul 14 15:06:49 2010
@@ -148,6 +148,7 @@
property name=dist.base value=distribution/
property name=dist.base.source value=${dist.base}/source/
property name=dist.base.binaries value=${dist.base}/binaries/
+ property name=dist.base.manual value=${dist.base}/manual/
property name=dist.dir value=dist/
property name=dist.bin value=${dist.dir}/bin/
property name=dist.lib value=${dist.dir}/lib/
@@ -1080,6 +1081,7 @@
mkdir dir=${dist.base}/
mkdir dir=${dist.base.source}/
mkdir dir=${dist.base.binaries}/
+mkdir dir=${dist.base.manual}/
mkdir dir=${java-repository.dir}/
antcall inheritAll=false target=internal_dist
param name=dist.dir value=${dist.name}/
@@ -1142,7 +1144,23 @@
checksums-mvn
fileset dir=${java-repository.dir}
includes=**/*${project.version}.jar/
fileset dir=${java-repository.dir}
includes=**/*${project.version}.pom/
- /checksums-mvn
+/checksums-mvn
+
+zip destfile=${dist.base.manual}/${dist.name}-manual.zip
+ zipfileset dir=${dist.name}/docs/manual prefix=${dist.name}/
+ zipfileset file=NOTICE prefix=${dist.name}/
+/zip
+tar longfile=gnu
+ destfile=${dist.base.manual}/${dist.name}-manual.tar
+ tarfileset dir=${dist.name}/docs/manual prefix=${dist.name}/
+ tarfileset file=NOTICE prefix=${dist.name}/
+/tar
+gzip destfile=${dist.base.manual}/${dist.name}-manual.tar.gz
+ src=${dist.base.manual}/${dist.name}-manual.tar/
+bzip2 destfile=${dist.base.manual}/${dist.name}-manual.tar.bz2
+ src=${dist.base.manual}/${dist.name}-manual.tar/
+delete file=${dist.base.manual}/${dist.name}-manual.tar/
+
delete dir=${dist.name}/
checksums
fileset dir=${dist.base.binaries}/
@@ -1151,6 +1169,12 @@
exclude name=**/*.sha1/
exclude name=**/*.sha512/
/fileset
+ fileset dir=${dist.base.manual}/
+exclude name=**/*.asc/
+exclude name=**/*.md5/
+exclude name=**/*.sha1/
+exclude name=**/*.sha512/
+ /fileset
/checksums
antcall inheritAll=false target=src-dist
svn commit: r965363 - /ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml
Author: bodewig Date: Mon Jul 19 06:27:03 2010 New Revision: 965363 URL: http://svn.apache.org/viewvc?rev=965363view=rev Log: host of ASF webs has changed Modified: ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml Modified: ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml?rev=965363r1=965362r2=965363view=diff == --- ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml (original) +++ ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml Mon Jul 19 06:27:03 2010 @@ -29,8 +29,8 @@ property name=apache-hostname value=www.apache.org / property name=apache-domain value=apache.org / - property name=apache-realhost value=eos / - property name=apache-ip4 value=140.211.11.130 / + property name=apache-realhost value=freyr / + property name=apache-ip4 value=140.211.11.131 / property name=xs4all-hostname value=www.xs4all.nl / property name=xs4all-domain value=xs4all.nl /
svn commit: r979337 - in /ant/core/trunk: docs/manualdownload.cgi xdocs/manualdownload.xml
Author: bodewig Date: Mon Jul 26 16:05:23 2010 New Revision: 979337 URL: http://svn.apache.org/viewvc?rev=979337view=rev Log: download page for manuals Added: ant/core/trunk/docs/manualdownload.cgi - copied unchanged from r979328, ant/core/trunk/docs/bindownload.cgi ant/core/trunk/xdocs/manualdownload.xml - copied, changed from r979328, ant/core/trunk/xdocs/bindownload.xml Copied: ant/core/trunk/xdocs/manualdownload.xml (from r979328, ant/core/trunk/xdocs/bindownload.xml) URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/manualdownload.xml?p2=ant/core/trunk/xdocs/manualdownload.xmlp1=ant/core/trunk/xdocs/bindownload.xmlr1=979328r2=979337rev=979337view=diff == --- ant/core/trunk/xdocs/bindownload.xml (original) +++ ant/core/trunk/xdocs/manualdownload.xml Mon Jul 26 16:05:23 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 @@ -18,15 +18,18 @@ document properties -titleBinary Distributions/title +titleAnt Manual Distributions/title base/ /properties body -section name=Downloading Ant +section name=Downloading Ant's Manual -pUse the links below to download a binary distribution of Ant from +pAnt's manual is part of the binary distribution but is also + available as a stand-alone download./p + +pUse the links below to download a distribution of Ant's manual from one of our mirrors. It is good practice to a href=[location]#Verify Releasesverify the integrity/a of the distribution files, especially if you are using one of our @@ -41,9 +44,6 @@ than 100 characters and have been create Thus they must be untarred with a GNU compatible version of codetar/code./p -pIn addition the a href=http://www.jpackage.org;JPackage -project/a provides RPMs at their own distribution site./p - pIf you do not see the file you need in the links below, please see the a href=http://www.apache.org/dist/ant/;master distribution directory/a or, preferably, its a href=[preferred]/ant/mirror/a./p @@ -92,34 +92,30 @@ may not be available on all mirrors for ul licode.zip/code archive: -a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.zipapache-ant-1.8.1-bin.zip/a -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.asc;PGP/a] -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha1;SHA1/a] -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.md5;MD5/a]/li +a href=[preferred]/ant/manual/apache-ant-1.8.1-manual.zipapache-ant-1.8.1-manual.zip/a +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.asc;PGP/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.md5;MD5/a]/li licode.tar.gz/code archive: -a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.gzapache-ant-1.8.1-bin.tar.gz/a -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.asc;PGP/a] -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha1;SHA1/a] -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.md5;MD5/a]/li +a href=[preferred]/ant/manual/apache-ant-1.8.1-manual.tar.gzapache-ant-1.8.1-manual.tar.gz/a +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.asc;PGP/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.md5;MD5/a]/li licode.tar.bz2/code archive: -a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.bz2apache-ant-1.8.1-bin.tar.bz2/a -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.asc;PGP/a] -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha1;SHA1/a] -[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.md5;MD5/a]/li +a href=[preferred]/ant/manual/apache-ant-1.8.1-manual.tar.bz2apache-ant-1.8.1-manual.tar.bz2/a +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.bz2.asc;PGP/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.bz2.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.bz2.md5;MD5/a]/li /ul /section section name=Old Ant Releases -pOlder releases of Ant can be found a -href=http://archive.apache.org/dist/ant/binaries/;here/a. Those -releases are only provided as codezip/code archives that can be -extracted by codejar xf
svn commit: r979338 - in /ant/core/trunk/xdocs: bindownload.xml manualdownload.xml srcdownload.xml
Author: bodewig Date: Mon Jul 26 16:10:57 2010 New Revision: 979338 URL: http://svn.apache.org/viewvc?rev=979338view=rev Log: sha512 Modified: ant/core/trunk/xdocs/bindownload.xml ant/core/trunk/xdocs/manualdownload.xml ant/core/trunk/xdocs/srcdownload.xml Modified: ant/core/trunk/xdocs/bindownload.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/bindownload.xml?rev=979338r1=979337r2=979338view=diff == --- ant/core/trunk/xdocs/bindownload.xml (original) +++ ant/core/trunk/xdocs/bindownload.xml Mon Jul 26 16:10:57 2010 @@ -95,18 +95,21 @@ may not be available on all mirrors for a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.zipapache-ant-1.8.1-bin.zip/a [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.asc;PGP/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.md5;MD5/a]/li licode.tar.gz/code archive: a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.gzapache-ant-1.8.1-bin.tar.gz/a [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.asc;PGP/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.md5;MD5/a]/li licode.tar.bz2/code archive: a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.bz2apache-ant-1.8.1-bin.tar.bz2/a [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.asc;PGP/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.md5;MD5/a]/li /ul /section @@ -126,7 +129,7 @@ href=[location]#Current Release of Ant section name=Verify Releases pIt is essential that you verify the integrity of the downloaded -files using the PGP signature or the SHA1 or MD5 checksums. The +files using the PGP signature or the SHA1, SHA512 or MD5 checksums. The checksums are not as strong indicators as the PGP signature./p pThe PGP signatures can be verified using PGP or GPG. First @@ -158,8 +161,8 @@ is also available for Windows users. Fo to verify the package./p pAlternatively, you can verify the checksums on the files. Unix -programs called codemd5/code/codesha1/code or -codemd5sum/code/codesha1sum/code are included in many unix +programs called codemd5/code/codesha1/code/codesha512/code or +codemd5sum/code/codesha1sum/code/codesha512sum/code are included in many unix distributions. code*sum/code is also available as part of a href=http://www.gnu.org/software/textutils/textutils.html;GNU Textutils/a. Windows users can get binary md5 programs from a Modified: ant/core/trunk/xdocs/manualdownload.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/manualdownload.xml?rev=979338r1=979337r2=979338view=diff == --- ant/core/trunk/xdocs/manualdownload.xml (original) +++ ant/core/trunk/xdocs/manualdownload.xml Mon Jul 26 16:10:57 2010 @@ -95,18 +95,21 @@ may not be available on all mirrors for a href=[preferred]/ant/manual/apache-ant-1.8.1-manual.zipapache-ant-1.8.1-manual.zip/a [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.asc;PGP/a] [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.zip.md5;MD5/a]/li licode.tar.gz/code archive: a href=[preferred]/ant/manual/apache-ant-1.8.1-manual.tar.gzapache-ant-1.8.1-manual.tar.gz/a [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.asc;PGP/a] [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.gz.md5;MD5/a]/li licode.tar.bz2/code archive: a href=[preferred]/ant/manual/apache-ant-1.8.1-manual.tar.bz2apache-ant-1.8.1-manual.tar.bz2/a [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.bz2.asc;PGP/a] [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.bz2.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1-manual.tar.bz2.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/manual/apache-ant-1.8.1
svn commit: r979339 - in /ant/core/trunk/xdocs: bindownload.xml srcdownload.xml
Author: bodewig Date: Mon Jul 26 16:12:38 2010 New Revision: 979339 URL: http://svn.apache.org/viewvc?rev=979339view=rev Log: old releases are available as .tar.* as well by now Modified: ant/core/trunk/xdocs/bindownload.xml ant/core/trunk/xdocs/srcdownload.xml Modified: ant/core/trunk/xdocs/bindownload.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/bindownload.xml?rev=979339r1=979338r2=979339view=diff == --- ant/core/trunk/xdocs/bindownload.xml (original) +++ ant/core/trunk/xdocs/bindownload.xml Mon Jul 26 16:12:38 2010 @@ -118,9 +118,7 @@ may not be available on all mirrors for section name=Old Ant Releases pOlder releases of Ant can be found a -href=http://archive.apache.org/dist/ant/binaries/;here/a. Those -releases are only provided as codezip/code archives that can be -extracted by codejar xf /codeemarchive.zip/em - we highly +href=http://archive.apache.org/dist/ant/binaries/;here/a. We highly recommend to not use those releases but upgrade to Ant's a href=[location]#Current Release of Antlatest/a release./p Modified: ant/core/trunk/xdocs/srcdownload.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/srcdownload.xml?rev=979339r1=979338r2=979339view=diff == --- ant/core/trunk/xdocs/srcdownload.xml (original) +++ ant/core/trunk/xdocs/srcdownload.xml Mon Jul 26 16:12:38 2010 @@ -115,9 +115,7 @@ may not be available on all mirrors for section name=Old Ant Releases pOlder releases of Ant can be found a -href=http://archive.apache.org/dist/ant/source/;here/a. Those -releases are only provided as codezip/code archives that can be -extracted by codejar xf /codeemarchive.zip/em - we highly +href=http://archive.apache.org/dist/ant/source/;here/a. We highly recommend to not use those releases but upgrade to Ant's a href=[location]#Current Release of Antlatest/a release./p
svn commit: r979340 - in /ant/core/trunk/docs: bindownload.html manualdownload.html srcdownload.html
Author: bodewig Date: Mon Jul 26 16:14:06 2010 New Revision: 979340 URL: http://svn.apache.org/viewvc?rev=979340view=rev Log: re-generate site Added: ant/core/trunk/docs/manualdownload.html (with props) Modified: ant/core/trunk/docs/bindownload.html ant/core/trunk/docs/srcdownload.html Modified: ant/core/trunk/docs/bindownload.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/bindownload.html?rev=979340r1=979339r2=979340view=diff == --- ant/core/trunk/docs/bindownload.html (original) +++ ant/core/trunk/docs/bindownload.html Mon Jul 26 16:14:06 2010 @@ -262,34 +262,35 @@ may not be available on all mirrors for a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.zipapache-ant-1.8.1-bin.zip/a [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.asc;PGP/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.zip.md5;MD5/a]/li licode.tar.gz/code archive: a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.gzapache-ant-1.8.1-bin.tar.gz/a [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.asc;PGP/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.gz.md5;MD5/a]/li licode.tar.bz2/code archive: a href=[preferred]/ant/binaries/apache-ant-1.8.1-bin.tar.bz2apache-ant-1.8.1-bin.tar.bz2/a [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.asc;PGP/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha1;SHA1/a] +[a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.sha512;SHA512/a] [a href=http://www.apache.org/dist/ant/binaries/apache-ant-1.8.1-bin.tar.bz2.md5;MD5/a]/li /ul h3 class=section a name=Old Ant Releases/a Old Ant Releases /h3 -pOlder releases of Ant can be found a href=http://archive.apache.org/dist/ant/binaries/;here/a. Those -releases are only provided as codezip/code archives that can be -extracted by codejar xf /codeemarchive.zip/em - we highly +pOlder releases of Ant can be found a href=http://archive.apache.org/dist/ant/binaries/;here/a. We highly recommend to not use those releases but upgrade to Ant's a href=[location]#Current Release of Antlatest/a release./p h3 class=section a name=Verify Releases/a Verify Releases /h3 pIt is essential that you verify the integrity of the downloaded -files using the PGP signature or the SHA1 or MD5 checksums. The +files using the PGP signature or the SHA1, SHA512 or MD5 checksums. The checksums are not as strong indicators as the PGP signature./p pThe PGP signatures can be verified using PGP or GPG. First download the a href=http://www.apache.org/dist/ant/KEYS;KEYS/a @@ -316,8 +317,8 @@ is also available for Windows users. Fo a href=http://www.gnupg.org/(en)/documentation/faqs.html#q4.19instructions/a to verify the package./p pAlternatively, you can verify the checksums on the files. Unix -programs called codemd5/code/codesha1/code or -codemd5sum/code/codesha1sum/code are included in many unix +programs called codemd5/code/codesha1/code/codesha512/code or +codemd5sum/code/codesha1sum/code/codesha512sum/code are included in many unix distributions. code*sum/code is also available as part of a href=http://www.gnu.org/software/textutils/textutils.html;GNU Textutils/a. Windows users can get binary md5 programs from a href=http://www.fourmilab.ch/md5/;here/a, a href=http://www.pc-tools.net/win32/freeware/console/;here/a. a href=http://www.slavasoft.com/fsum/;fsum/a supports MD5 and SHA1./p Added: ant/core/trunk/docs/manualdownload.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manualdownload.html?rev=979340view=auto == --- ant/core/trunk/docs/manualdownload.html (added) +++ ant/core/trunk/docs/manualdownload.html Mon Jul 26 16:14:06 2010 @@ -0,0 +1,352 @@ + + +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; +!-- + 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 + (the License); you may
svn commit: r979342 - in /ant/core/trunk: docs/manualdownload.html xdocs/manualdownload.xml
Author: bodewig Date: Mon Jul 26 16:16:01 2010 New Revision: 979342 URL: http://svn.apache.org/viewvc?rev=979342view=rev Log: extraneous dot Modified: ant/core/trunk/docs/manualdownload.html ant/core/trunk/xdocs/manualdownload.xml Modified: ant/core/trunk/docs/manualdownload.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manualdownload.html?rev=979342r1=979341r2=979342view=diff == --- ant/core/trunk/docs/manualdownload.html (original) +++ ant/core/trunk/docs/manualdownload.html Mon Jul 26 16:16:01 2010 @@ -284,7 +284,7 @@ may not be available on all mirrors for Old Ant Releases /h3 pManuals for older releases of Ant can be -found a href=http://archive.apache.org/dist/ant/manual/;here/a../p +found a href=http://archive.apache.org/dist/ant/manual/;here/a./p h3 class=section a name=Verify Releases/a Verify Releases Modified: ant/core/trunk/xdocs/manualdownload.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/manualdownload.xml?rev=979342r1=979341r2=979342view=diff == --- ant/core/trunk/xdocs/manualdownload.xml (original) +++ ant/core/trunk/xdocs/manualdownload.xml Mon Jul 26 16:16:01 2010 @@ -118,7 +118,7 @@ may not be available on all mirrors for section name=Old Ant Releases pManuals for older releases of Ant can be -found a href=http://archive.apache.org/dist/ant/manual/;here/a../p +found a href=http://archive.apache.org/dist/ant/manual/;here/a./p /section
svn commit: r979504 - in /ant/core/trunk: docs/ docs/antlibs/svn/ docs/manual/ docs/manual/api/ xdocs/stylesheets/
Author: bodewig Date: Tue Jul 27 03:05:02 2010 New Revision: 979504 URL: http://svn.apache.org/viewvc?rev=979504view=rev Log: link to Ant's manual download page Modified: ant/core/trunk/docs/antlibs/svn/index.html ant/core/trunk/docs/antnews.html ant/core/trunk/docs/bindownload.html ant/core/trunk/docs/bugs.html ant/core/trunk/docs/bylaws.html ant/core/trunk/docs/contributors.html ant/core/trunk/docs/external.html ant/core/trunk/docs/faq.html ant/core/trunk/docs/index.html ant/core/trunk/docs/legal.html ant/core/trunk/docs/license.html ant/core/trunk/docs/mail.html ant/core/trunk/docs/manual/api/index.html ant/core/trunk/docs/manual/cover.html ant/core/trunk/docs/manualdownload.html ant/core/trunk/docs/mission.html ant/core/trunk/docs/nightlies.html ant/core/trunk/docs/problems.html ant/core/trunk/docs/projects.html ant/core/trunk/docs/resources.html ant/core/trunk/docs/srcdownload.html ant/core/trunk/docs/svn.html ant/core/trunk/xdocs/stylesheets/project.xml Modified: ant/core/trunk/docs/antlibs/svn/index.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/antlibs/svn/index.html?rev=979504r1=979503r2=979504view=diff == --- ant/core/trunk/docs/antlibs/svn/index.html (original) +++ ant/core/trunk/docs/antlibs/svn/index.html Tue Jul 27 03:05:02 2010 @@ -185,14 +185,14 @@ svn /h4 pA very thin layer on top of the command line executable, -comparable to a href=http://ant.apache.org/manual/CoreTasks/cvs.html;the CVS +comparable to a href=http://ant.apache.org/manual/Tasks/cvs.html;the CVS task/a./p h4 class=subsection a name=changelog/a changelog /h4 pCreates a log of change comments between two revisions, -comparable to a href=http://ant.apache.org/manual/CoreTasks/changelog.html;CvsChangeLog/a./p +comparable to a href=http://ant.apache.org/manual/Tasks/changelog.html;CvsChangeLog/a./p h4 class=subsection a name=*diff/a *diff @@ -201,7 +201,7 @@ for the changes between two tags or branches./p pcodelt;revisiondiffgt;/code creates a differences report for the changes between two revisions./p -pTogether comparable to a href=http://ant.apache.org/manual/CoreTasks/cvstagdiff.html;CvsTagDiff/a./p +pTogether comparable to a href=http://ant.apache.org/manual/Tasks/cvstagdiff.html;CvsTagDiff/a./p h3 class=section a name=Examples/a Examples Modified: ant/core/trunk/docs/antnews.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/antnews.html?rev=979504r1=979503r2=979504view=diff == --- ant/core/trunk/docs/antnews.html (original) +++ ant/core/trunk/docs/antnews.html Tue Jul 27 03:05:02 2010 @@ -145,6 +145,9 @@ li a href=http://ant.apache.org/srcdownload.cgi;Source Distributions/a /li +li +a href=http://ant.apache.org/manualdownload.cgi;Ant Manual/a +/li /ul /li li class=menuheaderContributing Modified: ant/core/trunk/docs/bindownload.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/bindownload.html?rev=979504r1=979503r2=979504view=diff == --- ant/core/trunk/docs/bindownload.html (original) +++ ant/core/trunk/docs/bindownload.html Tue Jul 27 03:05:02 2010 @@ -137,6 +137,9 @@ li a href=http://ant.apache.org/srcdownload.cgi;Source Distributions/a /li +li +a href=http://ant.apache.org/manualdownload.cgi;Ant Manual/a +/li /ul /li li class=menuheaderContributing Modified: ant/core/trunk/docs/bugs.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/bugs.html?rev=979504r1=979503r2=979504view=diff == --- ant/core/trunk/docs/bugs.html (original) +++ ant/core/trunk/docs/bugs.html Tue Jul 27 03:05:02 2010 @@ -139,6 +139,9 @@ li a href=http://ant.apache.org/srcdownload.cgi;Source Distributions
svn commit: r979506 - /ant/core/trunk/ReleaseInstructions
Author: bodewig Date: Tue Jul 27 03:09:58 2010 New Revision: 979506 URL: http://svn.apache.org/viewvc?rev=979506view=rev Log: new download page Modified: ant/core/trunk/ReleaseInstructions Modified: ant/core/trunk/ReleaseInstructions URL: http://svn.apache.org/viewvc/ant/core/trunk/ReleaseInstructions?rev=979506r1=979505r2=979506view=diff == --- ant/core/trunk/ReleaseInstructions (original) +++ ant/core/trunk/ReleaseInstructions Tue Jul 27 03:09:58 2010 @@ -85,6 +85,7 @@ Note: This document was updated in the c manual under Documentation) * xdocs/srcdownload.xml * xdocs/bindownload.xml +* xdocs/manualdownload.xml Generate the html files by invoking ant on docs.xml (use -projecthelp for instructions). @@ -313,11 +314,13 @@ Note: This document was updated in the c the xdocs and the generated html from the branch and will complain if there are discrepancies in version numbers. -(**) Mirrors : the srcdownload.html and bindownload.html each list a number of - mirrors. For ant 1.6.0 the mirrors picked up the new version in 8 hours - or less, the release having been done at midnight on Dec 18th, the - mirrors had it on Dec 19th at 8 am. The srcdownload/bindownload pages both - contain a note advising users to be patient immediately after the release. +(**) Mirrors : the srcdownload.html, bindownload.html and + manualdownload.html each list a number of mirrors. For ant 1.6.0 + the mirrors picked up the new version in 8 hours or less, the + release having been done at midnight on Dec 18th, the mirrors had + it on Dec 19th at 8 am. The + srcdownload/bindownload/manualdownload pages all contain a note + advising users to be patient immediately after the release. (+) Don't expect the old releases to disappear from www.apache.org/dist as soon as the new releases are there.
svn commit: r980322 - /ant/sandbox/antlibs/build.xml
Author: bodewig
Date: Thu Jul 29 06:11:43 2010
New Revision: 980322
URL: http://svn.apache.org/viewvc?rev=980322view=rev
Log:
make it a user option whether trunk/tags/branches should be created
Modified:
ant/sandbox/antlibs/build.xml
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=980322r1=980321r2=980322view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Thu Jul 29 06:11:43 2010
@@ -18,15 +18,12 @@
under the License.
--
-
project default=manually-todo
description
This buildfile generates the directory layout for a new AntLib.
/description
-
-
target name=read-properties unless=antlib.shortname
input addproperty=antlib.shortname
message=Please enter the short name (for root directory and
package) of your AntLib
@@ -41,11 +38,22 @@
input addproperty=name.last
message=Please enter your last name
/
+input addproperty=with-trunk
+ message=Do you want to create a trunk/tags/branches structure?
+ validargs=y,n
+ defaultvalue=n
+/
+condition property=with-trunk?
+ equals arg1=y arg2=${with-trunk}/
+/condition
/target
-
-
target name=setup-properties depends=read-properties
+ condition property=antlib.trunk value=${antlib.shortname}
+not
+ isset property=with-trunk?/
+/not
+ /condition
property name=antlib.trunk value=${antlib.shortname}/trunk/
tstamp
format property=tstamp.year pattern=/
@@ -55,14 +63,15 @@
/target
-
-target name=make-dir-layout depends=setup-properties
+target name=-create-ttb depends=setup-properties if=with-trunk?
!-- Subversion directory layout --
mkdir dir=${antlib.shortname}/tags/
mkdir dir=${antlib.shortname}/branches/
mkdir dir=${antlib.trunk}/
+/target
+
+target name=make-dir-layout depends=-create-ttb
!-- Common AntLib directory layout --
-mkdir dir=${antlib.trunk}/src/main/
mkdir dir=${antlib.trunk}/src/test/junit/
mkdir dir=${antlib.trunk}/src/test/antunit/
mkdir dir=${manual.dir}/
svn commit: r980324 - /ant/sandbox/antlibs/build.xml
Author: bodewig
Date: Thu Jul 29 06:16:23 2010
New Revision: 980324
URL: http://svn.apache.org/viewvc?rev=980324view=rev
Log:
linefeeds
Modified:
ant/sandbox/antlibs/build.xml (contents, props changed)
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=980324r1=980323r2=980324view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Thu Jul 29 06:16:23 2010
@@ -1,307 +1,307 @@
-?xml version=1.0?
-!--
- 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 (the
- License); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---
-
-project default=manually-todo
-
-description
-This buildfile generates the directory layout for a new AntLib.
-/description
-
-target name=read-properties unless=antlib.shortname
-input addproperty=antlib.shortname
- message=Please enter the short name (for root directory and
package) of your AntLib
-/
-input addproperty=antlib.fullname
- message=Please enter the full name of you AntLib
- defaultvalue=${antlib.shortname}
-/
-input addproperty=name.first
- message=Please enter your first name
-/
-input addproperty=name.last
- message=Please enter your last name
-/
-input addproperty=with-trunk
- message=Do you want to create a trunk/tags/branches structure?
- validargs=y,n
- defaultvalue=n
-/
-condition property=with-trunk?
- equals arg1=y arg2=${with-trunk}/
-/condition
-/target
-
-target name=setup-properties depends=read-properties
- condition property=antlib.trunk value=${antlib.shortname}
-not
- isset property=with-trunk?/
-/not
- /condition
-property name=antlib.trunk value=${antlib.shortname}/trunk/
-tstamp
-format property=tstamp.year pattern=/
-/tstamp
-property name=antlib.src.root
value=${antlib.trunk}/src/main/org/apache/ant/${antlib.shortname}/
-property name=manual.dir value=${antlib.trunk}/docs/
-/target
-
-
-target name=-create-ttb depends=setup-properties if=with-trunk?
-!-- Subversion directory layout --
-mkdir dir=${antlib.shortname}/tags/
-mkdir dir=${antlib.shortname}/branches/
-mkdir dir=${antlib.trunk}/
-/target
-
-target name=make-dir-layout depends=-create-ttb
-!-- Common AntLib directory layout --
-mkdir dir=${antlib.trunk}/src/test/junit/
-mkdir dir=${antlib.trunk}/src/test/antunit/
-mkdir dir=${manual.dir}/
-!-- the root package for the antlib --
-mkdir dir=${antlib.src.root}/
-/target
-
-
-
-target name=create-artifacts
depends=make-dir-layout,changes,antlib.xml,contributors.xml,build.xml,manual
-copy file=http/trunk/common/NOTICE.template
tofile=${antlib.trunk}/NOTICE
-filterset begintoken=[ endtoken=]
-filter token=PRODUCT_NAME value=${antlib.fullname}/
-filter token= value=${tstamp.year}/
-/filterset
-/copy
-echo
-file=${antlib.trunk}/version.properties
-message=#artifact.version=1.0alpha
-/
-/target
-
-
-
-target name=changes depends=make-dir-layout
-echo file=${antlib.trunk}/changes.xmllt;?xml
version=quot;1.0quot; encoding=quot;utf-8quot;?gt;
-lt;!DOCTYPE document
-[
-lt;!ELEMENT document (properties?, release+)gt;
-lt;!ELEMENT properties (title)gt;
-lt;!ELEMENT title (#PCDATA)gt;
-lt;!ELEMENT release (action*)gt;
-lt;!ELEMENT action (#PCDATA)gt;
-lt;!ATTLIST release
- version CDATA #REQUIRED
- date CDATA #REQUIRED
- description CDATA #IMPLIEDgt;
-lt;!ATTLIST action
- issue CDATA #IMPLIED
- type (add|fix|remove|update) #REQUIRED
- breaks-bwc (true|false) #IMPLIEDgt;
-]
-gt;
-lt;documentgt;
- lt;propertiesgt;
-lt;titlegt;Apache AntLib ${antlib.fullname}lt;/titlegt;
- lt;/propertiesgt;
-
- lt;release version=quot;SVN trunkquot; date=quot;unpublishedquot;gt;
-lt;action type=quot
svn commit: r980325 - /ant/sandbox/antlibs/build.xml
Author: bodewig
Date: Thu Jul 29 06:18:57 2010
New Revision: 980325
URL: http://svn.apache.org/viewvc?rev=980325view=rev
Log:
whitespace
Modified:
ant/sandbox/antlibs/build.xml
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=980325r1=980324r2=980325view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Thu Jul 29 06:18:57 2010
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
License); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,288 +20,274 @@
project default=manually-todo
-description
-This buildfile generates the directory layout for a new AntLib.
-/description
-
-target name=read-properties unless=antlib.shortname
-input addproperty=antlib.shortname
- message=Please enter the short name (for root directory and
package) of your AntLib
-/
-input addproperty=antlib.fullname
- message=Please enter the full name of you AntLib
- defaultvalue=${antlib.shortname}
-/
-input addproperty=name.first
- message=Please enter your first name
-/
-input addproperty=name.last
- message=Please enter your last name
-/
-input addproperty=with-trunk
- message=Do you want to create a trunk/tags/branches structure?
- validargs=y,n
- defaultvalue=n
-/
-condition property=with-trunk?
- equals arg1=y arg2=${with-trunk}/
-/condition
-/target
-
-target name=setup-properties depends=read-properties
- condition property=antlib.trunk value=${antlib.shortname}
-not
- isset property=with-trunk?/
-/not
- /condition
-property name=antlib.trunk value=${antlib.shortname}/trunk/
-tstamp
-format property=tstamp.year pattern=/
-/tstamp
-property name=antlib.src.root
value=${antlib.trunk}/src/main/org/apache/ant/${antlib.shortname}/
-property name=manual.dir value=${antlib.trunk}/docs/
-/target
-
-
-target name=-create-ttb depends=setup-properties if=with-trunk?
-!-- Subversion directory layout --
-mkdir dir=${antlib.shortname}/tags/
-mkdir dir=${antlib.shortname}/branches/
-mkdir dir=${antlib.trunk}/
-/target
-
-target name=make-dir-layout depends=-create-ttb
-!-- Common AntLib directory layout --
-mkdir dir=${antlib.trunk}/src/test/junit/
-mkdir dir=${antlib.trunk}/src/test/antunit/
-mkdir dir=${manual.dir}/
-!-- the root package for the antlib --
-mkdir dir=${antlib.src.root}/
-/target
-
-
-
-target name=create-artifacts
depends=make-dir-layout,changes,antlib.xml,contributors.xml,build.xml,manual
-copy file=http/trunk/common/NOTICE.template
tofile=${antlib.trunk}/NOTICE
-filterset begintoken=[ endtoken=]
-filter token=PRODUCT_NAME value=${antlib.fullname}/
-filter token= value=${tstamp.year}/
-/filterset
-/copy
-echo
-file=${antlib.trunk}/version.properties
-message=#artifact.version=1.0alpha
-/
-/target
-
-
-
-target name=changes depends=make-dir-layout
-echo file=${antlib.trunk}/changes.xmllt;?xml
version=quot;1.0quot; encoding=quot;utf-8quot;?gt;
-lt;!DOCTYPE document
-[
-lt;!ELEMENT document (properties?, release+)gt;
-lt;!ELEMENT properties (title)gt;
-lt;!ELEMENT title (#PCDATA)gt;
-lt;!ELEMENT release (action*)gt;
-lt;!ELEMENT action (#PCDATA)gt;
-lt;!ATTLIST release
- version CDATA #REQUIRED
- date CDATA #REQUIRED
- description CDATA #IMPLIEDgt;
-lt;!ATTLIST action
- issue CDATA #IMPLIED
- type (add|fix|remove|update) #REQUIRED
- breaks-bwc (true|false) #IMPLIEDgt;
-]
-gt;
-lt;documentgt;
- lt;propertiesgt;
-lt;titlegt;Apache AntLib ${antlib.fullname}lt;/titlegt;
- lt;/propertiesgt;
+ description
+This buildfile generates the directory layout for a new AntLib.
+ /description
+
+ target name=read-properties unless=antlib.shortname
+input addproperty=antlib.shortname
+ message=Please enter the short name (for root directory and
package) of your AntLib
+ /
+input addproperty=antlib.fullname
+ message=Please enter the full name of you AntLib
+ defaultvalue=${antlib.shortname}
+ /
+input addproperty=name.first
+ message
svn commit: r980332 - /ant/sandbox/antlibs/build.xml
Author: bodewig
Date: Thu Jul 29 06:43:12 2010
New Revision: 980332
URL: http://svn.apache.org/viewvc?rev=980332view=rev
Log:
make sure all files have the proper license, fix indentation that I broke on
the last commit, contributors should go to contributors.xml
Modified:
ant/sandbox/antlibs/build.xml
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=980332r1=980331r2=980332view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Thu Jul 29 06:43:12 2010
@@ -88,189 +88,288 @@
/filterset
/copy
echo
- file=${antlib.trunk}/version.properties
- message=#artifact.version=1.0alpha
- /
+ file=${antlib.trunk}/version.properties# 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
+# (the License); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+artifact.version=1.0alpha/echo
/target
target name=changes depends=make-dir-layout
-echo file=${antlib.trunk}/changes.xmllt;?xml version=quot;1.0quot;
encoding=quot;utf-8quot;?gt;
- lt;!DOCTYPE document
- [
- lt;!ELEMENT document (properties?, release+)gt;
- lt;!ELEMENT properties (title)gt;
- lt;!ELEMENT title (#PCDATA)gt;
- lt;!ELEMENT release (action*)gt;
- lt;!ELEMENT action (#PCDATA)gt;
- lt;!ATTLIST release
- version CDATA #REQUIRED
- date CDATA #REQUIRED
- description CDATA #IMPLIEDgt;
- lt;!ATTLIST action
- issue CDATA #IMPLIED
- type (add|fix|remove|update) #REQUIRED
- breaks-bwc (true|false) #IMPLIEDgt;
- ]
- gt;
- lt;documentgt;
- lt;propertiesgt;
- lt;titlegt;Apache AntLib ${antlib.fullname}lt;/titlegt;
- lt;/propertiesgt;
+echo file=${antlib.trunk}/changes.xml
+ encoding=UTF8lt;?xml version=quot;1.0quot;
encoding=quot;utf-8quot;?gt;
+lt;!--
+ 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
+ (the quot;Licensequot;); you may not use this file except in compliance
with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an quot;AS ISquot; BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--gt;
+lt;!DOCTYPE document
+[
+lt;!ELEMENT document (properties?, release+)gt;
+lt;!ELEMENT properties (title)gt;
+lt;!ELEMENT title (#PCDATA)gt;
+lt;!ELEMENT release (action*)gt;
+lt;!ELEMENT action (#PCDATA)gt;
+lt;!ATTLIST release
+ version CDATA #REQUIRED
+ date CDATA #REQUIRED
+ description CDATA #IMPLIEDgt;
+lt;!ATTLIST action
+ issue CDATA #IMPLIED
+ type (add|fix|remove|update) #REQUIRED
+ breaks-bwc (true|false) #IMPLIEDgt;
+]
+gt;
+lt;documentgt;
+ lt;propertiesgt;
+lt;titlegt;Apache AntLib ${antlib.fullname}lt;/titlegt;
+ lt;/propertiesgt;
- lt;release version=quot;SVN trunkquot;
date=quot;unpublishedquot;gt;
- lt;action type=quot;addquot;gt;
+ lt;release version=quot;SVN trunkquot; date=quot;unpublishedquot;gt;
+lt;action type=quot;addquot;gt;
Initial import of ${antlib.fullname}
- lt;/actiongt;
- lt;/releasegt;
+lt;/actiongt;
+ lt;/releasegt;
- lt;/documentgt;
-/echo
+lt;/documentgt;
+/echo
/target
target name=antlib.xml depends=make-dir-layout
-echo
file=${antlib.trunk}/src/main/org/apache/ant/${antlib.shortname}/antlib.xmllt;?xml
version=quot;1.0quot; encoding=quot;utf-8quot;?gt;
- lt;!--
- 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
svn commit: r980336 - in /ant/sandbox/antlibs/foo: ./ docs/ src/ src/main/ src/main/org/ src/main/org/apache/ src/main/org/apache/ant/ src/main/org/apache/ant/foo/ src/test/ src/test/antunit/ src/test
Author: bodewig Date: Thu Jul 29 06:53:44 2010 New Revision: 980336 URL: http://svn.apache.org/viewvc?rev=980336view=rev Log: creating skeleton directory structure for Stefan experiments with running svn from Ant Added: ant/sandbox/antlibs/foo/ (with props) ant/sandbox/antlibs/foo/docs/ ant/sandbox/antlibs/foo/src/ ant/sandbox/antlibs/foo/src/main/ ant/sandbox/antlibs/foo/src/main/org/ ant/sandbox/antlibs/foo/src/main/org/apache/ ant/sandbox/antlibs/foo/src/main/org/apache/ant/ ant/sandbox/antlibs/foo/src/main/org/apache/ant/foo/ ant/sandbox/antlibs/foo/src/test/ ant/sandbox/antlibs/foo/src/test/antunit/ ant/sandbox/antlibs/foo/src/test/junit/ Propchange: ant/sandbox/antlibs/foo/ -- --- svn:externals (added) +++ svn:externals Thu Jul 29 06:53:44 2010 @@ -0,0 +1 @@ +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
svn commit: r980340 - in /ant/sandbox/antlibs: build.xml foo/
Author: bodewig
Date: Thu Jul 29 06:57:10 2010
New Revision: 980340
URL: http://svn.apache.org/viewvc?rev=980340view=rev
Log:
remove experiment
Removed:
ant/sandbox/antlibs/foo/
Modified:
ant/sandbox/antlibs/build.xml
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=980340r1=980339r2=980340view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Thu Jul 29 06:57:10 2010
@@ -96,6 +96,8 @@
arg value=creating skeleton directory structure for
${antlib.fullname}/
arg value=${antlib.shortname}/
/exec
+!-- need to wait a few seconds to give European svn mirro time to catch
up --
+sleep seconds=10/
exec executable=svn
arg value=up/
arg value=${antlib.shortname}/
svn commit: r981132 - in /ant/sandbox/antlibs/foo: ./ docs/ src/ src/main/ src/main/org/ src/main/org/apache/ src/main/org/apache/ant/ src/main/org/apache/ant/foo/ src/test/ src/test/antunit/ src/test
Author: bodewig Date: Sun Aug 1 03:48:20 2010 New Revision: 981132 URL: http://svn.apache.org/viewvc?rev=981132view=rev Log: creating skeleton directory structure for foo Added: ant/sandbox/antlibs/foo/ (with props) ant/sandbox/antlibs/foo/docs/ ant/sandbox/antlibs/foo/src/ ant/sandbox/antlibs/foo/src/main/ ant/sandbox/antlibs/foo/src/main/org/ ant/sandbox/antlibs/foo/src/main/org/apache/ ant/sandbox/antlibs/foo/src/main/org/apache/ant/ ant/sandbox/antlibs/foo/src/main/org/apache/ant/foo/ ant/sandbox/antlibs/foo/src/test/ ant/sandbox/antlibs/foo/src/test/antunit/ ant/sandbox/antlibs/foo/src/test/junit/ Propchange: ant/sandbox/antlibs/foo/ -- --- svn:externals (added) +++ svn:externals Sun Aug 1 03:48:20 2010 @@ -0,0 +1 @@ +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
svn commit: r981133 - /ant/sandbox/antlibs/foo/
Author: bodewig Date: Sun Aug 1 03:50:08 2010 New Revision: 981133 URL: http://svn.apache.org/viewvc?rev=981133view=rev Log: 30 seconds seems to be enough Removed: ant/sandbox/antlibs/foo/
svn commit: r981134 - in /ant/sandbox/antlibs/foo: ./ docs/ src/ src/main/ src/main/org/ src/main/org/apache/ src/main/org/apache/ant/ src/main/org/apache/ant/foo/ src/test/ src/test/antunit/ src/test
Author: bodewig Date: Sun Aug 1 03:51:06 2010 New Revision: 981134 URL: http://svn.apache.org/viewvc?rev=981134view=rev Log: creating skeleton directory structure for Next iteration of experiment Added: ant/sandbox/antlibs/foo/ (with props) ant/sandbox/antlibs/foo/docs/ ant/sandbox/antlibs/foo/src/ ant/sandbox/antlibs/foo/src/main/ ant/sandbox/antlibs/foo/src/main/org/ ant/sandbox/antlibs/foo/src/main/org/apache/ ant/sandbox/antlibs/foo/src/main/org/apache/ant/ ant/sandbox/antlibs/foo/src/main/org/apache/ant/foo/ ant/sandbox/antlibs/foo/src/test/ ant/sandbox/antlibs/foo/src/test/antunit/ ant/sandbox/antlibs/foo/src/test/junit/ Propchange: ant/sandbox/antlibs/foo/ -- --- svn:externals (added) +++ svn:externals Sun Aug 1 03:51:06 2010 @@ -0,0 +1 @@ +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
svn commit: r981135 - /ant/sandbox/antlibs/build.xml
Author: bodewig
Date: Sun Aug 1 03:53:54 2010
New Revision: 981135
URL: http://svn.apache.org/viewvc?rev=981135view=rev
Log:
create common dir and add generated files as text files to svn without
committing them
Modified:
ant/sandbox/antlibs/build.xml
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=981135r1=981134r2=981135view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Sun Aug 1 03:53:54 2010
@@ -79,39 +79,61 @@
mkdir dir=${antlib.src.root}/
/target
+ presetdef name=svn
+exec executable=svn failonerror=true/
+ /presetdef
+
+ macrodef name=add-textfile
+attribute name=file/
+sequential
+ svn
+arg value=add/
+arg file=@{file}/
+ /svn
+ svn
+arg value=ps/
+arg value=svn:eol-style/
+arg value=native/
+arg file=@{file}/
+ /svn
+/sequential
+ /macrodef
+
target name=add-top-to-svn depends=make-dir-layout
-exec executable=svn
+svn
arg value=add/
arg value=${antlib.shortname}/
-/exec
-exec executable=svn
+/svn
+svn
arg value=ps/
arg value=svn:externals/
arg value=common
http://svn.apache.org/repos/asf/ant/antlibs/common/trunk/
arg value=${antlib.shortname}/
-/exec
-exec executable=svn
+/svn
+svn
arg value=commit/
arg value=-m/
arg value=creating skeleton directory structure for
${antlib.fullname}/
arg value=${antlib.shortname}/
-/exec
-!-- need to wait a few seconds to give European svn mirro time to catch
up --
-sleep seconds=10/
-exec executable=svn
+/svn
+!-- need to wait a few seconds to give European svn mirror time to
+ catch up --
+sleep seconds=30/
+svn
arg value=up/
arg value=${antlib.shortname}/
-/exec
+/svn
/target
- target name=create-artifacts
depends=make-dir-layout,changes,antlib.xml,contributors.xml,build.xml,manual
-copy file=http/trunk/common/NOTICE.template
+ target name=create-artifacts
depends=add-top-to-svn,changes,antlib.xml,contributors.xml,build.xml,manual
+copy file=${antlib.trunk}/common/NOTICE.template
tofile=${antlib.trunk}/NOTICE
filterset begintoken=[ endtoken=]
filter token=PRODUCT_NAME value=${antlib.fullname}/
filter token= value=${tstamp.year}/
/filterset
/copy
+add-textfile file=${antlib.trunk}/NOTICE/
echo
file=${antlib.trunk}/version.properties# Licensed to the Apache
Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -128,6 +150,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
artifact.version=1.0alpha/echo
+add-textfile file=${antlib.trunk}/version.properties/
/target
target name=changes depends=make-dir-layout
@@ -179,6 +202,7 @@ artifact.version=1.0alpha/echo
lt;/documentgt;
/echo
+add-textfile file=${antlib.trunk}/changes.xml/
/target
target name=antlib.xml depends=make-dir-layout
@@ -219,6 +243,7 @@ artifact.version=1.0alpha/echo
--gt;
lt;/antlibgt;
/echo
+add-textfile
file=${antlib.trunk}/src/main/org/apache/ant/${antlib.shortname}/antlib.xml/
/target
target name=contributors.xml depends=make-dir-layout
@@ -261,6 +286,7 @@ artifact.version=1.0alpha/echo
lt;/namegt;
lt;/contributorsgt;
/echo
+add-textfile file=${antlib.trunk}/contributors.xml/
/target
target name=manual depends=make-dir-layout
@@ -299,6 +325,7 @@ artifact.version=1.0alpha/echo
lt;/noframesgt;
lt;/htmlgt;
/echo
+add-textfile file=${manual.dir}/index.html/
echo file=${manual.dir}/toc.html
encoding=UTF8lt;?xml version=quot;1.0quot;
encoding=quot;utf-8quot;?gt;
lt;!--
@@ -331,6 +358,7 @@ artifact.version=1.0alpha/echo
lt;/bodygt;
lt;/htmlgt;
/echo
+add-textfile file=${manual.dir}/toc.html/
echo file=${manual.dir}/cover.html
encoding=UTF8lt;?xml version=quot;1.0quot;
encoding=quot;utf-8quot;?gt;
lt;!--
@@ -365,6 +393,7 @@ artifact.version=1.0alpha/echo
lt;/bodygt;
lt;/htmlgt;
/echo
+add-textfile file=${manual.dir}/cover.html/
/target
target name=build.xml depends=make-dir-layout
@@ -395,6 +424,7 @@ artifact.version=1.0alpha/echo
lt;/projectgt;
/echo
+add-textfile file=${antlib.trunk}/build.xml/
/target
target name=manually-todo depends=create-artifacts
@@ -404,10 +434,9 @@ artifact.version=1.0alpha/echo
- maybe add your middle name to contributors.xml
- maybe add others to contributors.xml
- say something in the manuals cover.html about this AntLib
- - add the files to svn
+ - commit the files to svn
- modify the svn-properties of trunk-directory
svn commit: r981141 - in /ant/sandbox/antlibs/bar: ./ branches/ tags/ trunk/ trunk/docs/ trunk/src/ trunk/src/main/ trunk/src/main/org/ trunk/src/main/org/apache/ trunk/src/main/org/apache/ant/ trunk/
Author: bodewig Date: Sun Aug 1 04:17:42 2010 New Revision: 981141 URL: http://svn.apache.org/viewvc?rev=981141view=rev Log: creating skeleton directory structure for script experiments with trunk/tags/core Added: ant/sandbox/antlibs/bar/ (with props) ant/sandbox/antlibs/bar/branches/ ant/sandbox/antlibs/bar/tags/ ant/sandbox/antlibs/bar/trunk/ ant/sandbox/antlibs/bar/trunk/docs/ ant/sandbox/antlibs/bar/trunk/src/ ant/sandbox/antlibs/bar/trunk/src/main/ ant/sandbox/antlibs/bar/trunk/src/main/org/ ant/sandbox/antlibs/bar/trunk/src/main/org/apache/ ant/sandbox/antlibs/bar/trunk/src/main/org/apache/ant/ ant/sandbox/antlibs/bar/trunk/src/main/org/apache/ant/bar/ ant/sandbox/antlibs/bar/trunk/src/test/ ant/sandbox/antlibs/bar/trunk/src/test/antunit/ ant/sandbox/antlibs/bar/trunk/src/test/junit/ Propchange: ant/sandbox/antlibs/bar/ -- --- svn:externals (added) +++ svn:externals Sun Aug 1 04:17:42 2010 @@ -0,0 +1 @@ +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
svn commit: r981143 - in /ant/sandbox/antlibs: bar/ build.xml
Author: bodewig
Date: Sun Aug 1 04:20:08 2010
New Revision: 981143
URL: http://svn.apache.org/viewvc?rev=981143view=rev
Log:
externals must be applied to trunk dir
Removed:
ant/sandbox/antlibs/bar/
Modified:
ant/sandbox/antlibs/build.xml
Modified: ant/sandbox/antlibs/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=981143r1=981142r2=981143view=diff
==
--- ant/sandbox/antlibs/build.xml (original)
+++ ant/sandbox/antlibs/build.xml Sun Aug 1 04:20:08 2010
@@ -114,7 +114,7 @@
arg value=commit/
arg value=-m/
arg value=creating skeleton directory structure for
${antlib.fullname}/
- arg value=${antlib.shortname}/
+ arg value=${antlib.trunk}/
/svn
!-- need to wait a few seconds to give European svn mirror time to
catch up --
svn commit: r981144 - in /ant/sandbox/antlibs/bar: ./ branches/ tags/ trunk/ trunk/docs/ trunk/src/ trunk/src/main/ trunk/src/main/org/ trunk/src/main/org/apache/ trunk/src/main/org/apache/ant/ trunk/
Author: bodewig Date: Sun Aug 1 04:22:53 2010 New Revision: 981144 URL: http://svn.apache.org/viewvc?rev=981144view=rev Log: creating skeleton directory structure for experiment with trunk/tags/branches Added: ant/sandbox/antlibs/bar/ ant/sandbox/antlibs/bar/branches/ ant/sandbox/antlibs/bar/tags/ ant/sandbox/antlibs/bar/trunk/ (with props) ant/sandbox/antlibs/bar/trunk/docs/ ant/sandbox/antlibs/bar/trunk/src/ ant/sandbox/antlibs/bar/trunk/src/main/ ant/sandbox/antlibs/bar/trunk/src/main/org/ ant/sandbox/antlibs/bar/trunk/src/main/org/apache/ ant/sandbox/antlibs/bar/trunk/src/main/org/apache/ant/ ant/sandbox/antlibs/bar/trunk/src/main/org/apache/ant/bar/ ant/sandbox/antlibs/bar/trunk/src/test/ ant/sandbox/antlibs/bar/trunk/src/test/antunit/ ant/sandbox/antlibs/bar/trunk/src/test/junit/ Propchange: ant/sandbox/antlibs/bar/trunk/ -- --- svn:externals (added) +++ svn:externals Sun Aug 1 04:22:53 2010 @@ -0,0 +1 @@ +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
svn commit: r981154 - in /ant/sandbox/antlibs/baz: ./ docs/ src/ src/main/ src/main/org/ src/main/org/apache/ src/main/org/apache/ant/ src/main/org/apache/ant/baz/ src/test/ src/test/antunit/ src/test
Author: bodewig Date: Sun Aug 1 05:14:18 2010 New Revision: 981154 URL: http://svn.apache.org/viewvc?rev=981154view=rev Log: creating skeleton directory structure for yet another test Added: ant/sandbox/antlibs/baz/ (with props) ant/sandbox/antlibs/baz/docs/ ant/sandbox/antlibs/baz/src/ ant/sandbox/antlibs/baz/src/main/ ant/sandbox/antlibs/baz/src/main/org/ ant/sandbox/antlibs/baz/src/main/org/apache/ ant/sandbox/antlibs/baz/src/main/org/apache/ant/ ant/sandbox/antlibs/baz/src/main/org/apache/ant/baz/ ant/sandbox/antlibs/baz/src/test/ ant/sandbox/antlibs/baz/src/test/antunit/ ant/sandbox/antlibs/baz/src/test/junit/ Propchange: ant/sandbox/antlibs/baz/ -- --- svn:externals (added) +++ svn:externals Sun Aug 1 05:14:18 2010 @@ -0,0 +1 @@ +common http://svn.apache.org/repos/asf/ant/antlibs/common/trunk
svn commit: r982469 - in /ant/core/trunk: WHATSNEW docs/manual/dirtasks.html src/main/org/apache/tools/ant/DirectoryScanner.java src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java
Author: bodewig Date: Thu Aug 5 04:55:55 2010 New Revision: 982469 URL: http://svn.apache.org/viewvc?rev=982469view=rev Log: add Git, Mercurial and Bazaar files/dirs to defaultexcludes. Submitted by Ville Skyttä. PR 49624 Modified: ant/core/trunk/WHATSNEW ant/core/trunk/docs/manual/dirtasks.html ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=982469r1=982468r2=982469view=diff == --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Thu Aug 5 04:55:55 2010 @@ -42,6 +42,10 @@ Changes that could break older environme of Ant 1.8.1. Bugzilla Report 49373. + * The files and directories used by Git, Mercurial and Bazaar to + store their information are now excluded by the defaultexcludes. + Bugzilla Report 49624. + Fixed bugs: --- Modified: ant/core/trunk/docs/manual/dirtasks.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/dirtasks.html?rev=982469r1=982468r2=982469view=diff == --- ant/core/trunk/docs/manual/dirtasks.html (original) +++ ant/core/trunk/docs/manual/dirtasks.html Thu Aug 5 04:55:55 2010 @@ -265,7 +265,7 @@ as an implicit fileset./p h3a name=defaultexcludesDefault Excludes/a/h3 pThere are a set of definitions that are excluded by default from all -directory-based tasks. They are:/p +directory-based tasks. As of Ant 1.8.1 they are:/p pre **/*~ **/#*# @@ -282,6 +282,23 @@ directory-based tasks. They are:/p **/.svn/** **/.DS_Store /pre +pAnt 1.8.2 adds the folllowing default excludes:/p +pre + **/.git + **/.git/** + **/.gitattributes + **/.gitignore + **/.gitmodules + **/.hg + **/.hg/** + **/.hgignore + **/.hgsub + **/.hgsubstate + **/.hgtags + **/.bzr + **/.bzr/** + **/.bzrignore +/pre pIf you do not want these default excludes applied, you may disable them with the codedefaultexcludes=quot;noquot;/code attribute./p Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=982469r1=982468r2=982469view=diff == --- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Thu Aug 5 04:55:55 2010 @@ -170,6 +170,26 @@ public class DirectoryScanner SelectorUtils.DEEP_TREE_MATCH + /.svn, SelectorUtils.DEEP_TREE_MATCH + /.svn/ + SelectorUtils.DEEP_TREE_MATCH, +// Git +SelectorUtils.DEEP_TREE_MATCH + /.git, +SelectorUtils.DEEP_TREE_MATCH + /.git/ + SelectorUtils.DEEP_TREE_MATCH, +SelectorUtils.DEEP_TREE_MATCH + /.gitattributes, +SelectorUtils.DEEP_TREE_MATCH + /.gitignore, +SelectorUtils.DEEP_TREE_MATCH + /.gitmodules, + +// Mercurial +SelectorUtils.DEEP_TREE_MATCH + /.hg, +SelectorUtils.DEEP_TREE_MATCH + /.hg/ + SelectorUtils.DEEP_TREE_MATCH, +SelectorUtils.DEEP_TREE_MATCH + /.hgignore, +SelectorUtils.DEEP_TREE_MATCH + /.hgsub, +SelectorUtils.DEEP_TREE_MATCH + /.hgsubstate, +SelectorUtils.DEEP_TREE_MATCH + /.hgtags, + +// Bazaar +SelectorUtils.DEEP_TREE_MATCH + /.bzr, +SelectorUtils.DEEP_TREE_MATCH + /.bzr/ + SelectorUtils.DEEP_TREE_MATCH, +SelectorUtils.DEEP_TREE_MATCH + /.bzrignore, + // Mac SelectorUtils.DEEP_TREE_MATCH + /.DS_Store }; Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java?rev=982469r1=982468r2=982469view=diff == --- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java (original) +++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java Thu Aug 5 04:55:55 2010 @@ -53,6 +53,20 @@ public class DefaultExcludesTest extends **/vssver.scc, **/.svn, **/.svn/**, + **/.git, + **/.git/**, + **/.gitattributes, + **/.gitignore, + **/.gitmodules, + **/.hg, + **/.hg/**, + **/.hgignore, + **/.hgsub
svn commit: r982729 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Author: bodewig
Date: Thu Aug 5 18:45:11 2010
New Revision: 982729
URL: http://svn.apache.org/viewvc?rev=982729view=rev
Log:
better fix for bug 49271 as suggested by Jesse
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java?rev=982729r1=982728r2=982729view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java Thu
Aug 5 18:45:11 2010
@@ -108,10 +108,6 @@ public class XSLTProcess extends Matchin
/** for resolving entities such as dtds */
private XMLCatalog xmlCatalog = new XMLCatalog();
-/** Name of the TRAX Liaison class */
-private static final String TRAX_LIAISON_CLASS =
-org.apache.tools.ant.taskdefs.optional.TraXLiaison;
-
/** Utilities used for file operations */
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -340,6 +336,8 @@ public class XSLTProcess extends Matchin
return;
}
try {
+setupLoader();
+
if (sysProperties.size() 0) {
sysProperties.setSystem();
}
@@ -676,13 +674,12 @@ public class XSLTProcess extends Matchin
private void resolveProcessor(String proc) throws Exception {
String classname;
if (proc.equals(PROCESSOR_TRAX)) {
-classname = TRAX_LIAISON_CLASS;
+liaison = new org.apache.tools.ant.taskdefs.optional.TraXLiaison();
} else {
//anything else is a classname
-classname = proc;
+Class clazz = loadClass(proc);
+liaison = (XSLTLiaison) clazz.newInstance();
}
-Class clazz = loadClass(classname);
-liaison = (XSLTLiaison) clazz.newInstance();
}
/**
@@ -695,15 +692,26 @@ public class XSLTProcess extends Matchin
* @exception Exception if the class could not be loaded.
*/
private Class loadClass(String classname) throws Exception {
-if (classpath == null) {
+setupLoader();
+if (loader == null) {
return Class.forName(classname);
}
-loader = getProject().createClassLoader(classpath);
-loader.setThreadContextLoader();
return Class.forName(classname, true, loader);
}
/**
+ * If a custom classpath has been defined but no loader created
+ * yet, create the classloader and set it as the context
+ * classloader.
+ */
+private void setupLoader() {
+if (classpath != null loader == null) {
+loader = getProject().createClassLoader(classpath);
+loader.setThreadContextLoader();
+}
+}
+
+/**
* Specifies the output name for the styled result from the
* ttin/tt attribute; required if ttin/tt is set
*
svn commit: r982773 - in /ant/core/trunk: WHATSNEW docs/manual/Tasks/apply.html src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java src/tests/antunit/taskdefs/exec/apply-test.xml
Author: bodewig
Date: Thu Aug 5 20:44:30 2010
New Revision: 982773
URL: http://svn.apache.org/viewvc?rev=982773view=rev
Log:
nested redirectors and parrallel-apply don't mix well - PR 49594
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/Tasks/apply.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
ant/core/trunk/src/tests/antunit/taskdefs/exec/apply-test.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=982773r1=982772r2=982773view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Aug 5 20:44:30 2010
@@ -110,6 +110,11 @@ Fixed bugs:
to the toString invocation already.
Bugzilla Report 49588.
+ * apply in parallel mode didn't work together with a nested
+ redirector if maxparallel was = 0 (the default) or no source
+ files matched.
+ Bugzilla Report 49594.
+
Other changes:
--
Modified: ant/core/trunk/docs/manual/Tasks/apply.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/apply.html?rev=982773r1=982772r2=982773view=diff
==
--- ant/core/trunk/docs/manual/Tasks/apply.html (original)
+++ ant/core/trunk/docs/manual/Tasks/apply.html Thu Aug 5 20:44:30 2010
@@ -391,6 +391,9 @@ file mapping will take place with each i
user the capacity to receive input from, and send output to, different
files for each sourcefile.
/p
+pIn iparallel/i-mode the redirector will be reset for each batch
+ of executions (with imaxparallel/i gt; 0) and null will be used
+ a source file just like it is in the case of codeexec/code./p
h3Examples/h3
blockquotepre
lt;apply executable=quot;lsquot;gt;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java?rev=982773r1=982772r2=982773view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java Thu
Aug 5 20:44:30 2010
@@ -708,6 +708,11 @@ public class ExecuteOn extends ExecTask
String[] command = getCommandline(s, b);
log(Commandline.describeCommand(command), Project.MSG_VERBOSE);
exe.setCommandline(command);
+if (redirectorElement != null) {
+setupRedirector();
+redirectorElement.configure(redirector, null);
+exe.setStreamHandler(redirector.createHandler());
+}
runExecute(exe);
} else {
int stillToDo = fileNames.size();
Modified: ant/core/trunk/src/tests/antunit/taskdefs/exec/apply-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/exec/apply-test.xml?rev=982773r1=982772r2=982773view=diff
==
--- ant/core/trunk/src/tests/antunit/taskdefs/exec/apply-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/exec/apply-test.xml Thu Aug 5
20:44:30 2010
@@ -756,4 +756,37 @@
au:assertLogContains text=${z}.bar,x out /
/target
+ target name=testRedirectorWithParallel if=test.can.run depends=xyz
+apply executable=sh dest=${input} parallel=true addsourcefile=yes
+ arg value=parrot.sh /
+ targetfile/
+ fileset refid=xyz /
+ globmapper from=* to=*.bar/
+ redirector output=${output}/all_out.txt append=yes/
+/apply
+au:assertResourceContains resource=${output}/all_out.txt
+ value=x.bar out/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=x.bar err/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=x out/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=x err/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=y.bar out/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=y.bar err/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=y out/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=y err/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=z.bar out/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=z.bar err/
+au:assertResourceContains resource=${output}/all_out.txt
+ value=z out/
+au:assertResourceContains resource=${output
svn commit: r983308 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/Jar.java src/tests/antunit/taskdefs/jar-test.xml
Author: bodewig
Date: Sat Aug 7 20:43:21 2010
New Revision: 983308
URL: http://svn.apache.org/viewvc?rev=983308view=rev
Log:
jar doesn't merge manifests that come from zipfilesets with prefix. PR 49605
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
ant/core/trunk/src/tests/antunit/taskdefs/jar-test.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=983308r1=983307r2=983308view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sat Aug 7 20:43:21 2010
@@ -115,6 +115,10 @@ Fixed bugs:
files matched.
Bugzilla Report 49594.
+ * jar filesetmanifest=merge didn't work for manifests added via
+ zipfilesets that used the prefix or fullpath attributes.
+ Bugzilla Report 49605.
+
Other changes:
--
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java?rev=983308r1=983307r2=983308view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java Sat Aug 7
20:43:21 2010
@@ -46,6 +46,7 @@ import java.util.zip.ZipFile;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Manifest.Section;
+import org.apache.tools.ant.types.ArchiveFileSet;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
@@ -1176,6 +1177,18 @@ public class Jar extends Zip {
}
for (int j = 0; j resources[0].length; j++) {
String name = resources[0][j].getName().replace('\\', '/');
+if (rcs[i] instanceof ArchiveFileSet) {
+ArchiveFileSet afs = (ArchiveFileSet) rcs[i];
+if (!.equals(afs.getFullpath(getProject( {
+name = afs.getFullpath(getProject());
+} else if (!.equals(afs.getPrefix(getProject( {
+String prefix = afs.getPrefix(getProject());
+if (!prefix.endsWith(/) !prefix.endsWith(\\)) {
+prefix += /;
+}
+name = prefix + name;
+}
+}
if (name.equalsIgnoreCase(MANIFEST_NAME)) {
manifests[i] = new Resource[] {resources[0][j]};
break;
Modified: ant/core/trunk/src/tests/antunit/taskdefs/jar-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/jar-test.xml?rev=983308r1=983307r2=983308view=diff
==
--- ant/core/trunk/src/tests/antunit/taskdefs/jar-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/jar-test.xml Sat Aug 7 20:43:21
2010
@@ -207,4 +207,23 @@
au:assertResourceContains value=Test: Header
resource=${output}/META-INF/MANIFEST.MF/
/target
+
+ target name=testZipfilesetMerge
+
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=49605;
+mkdir dir=${input}/
+mkdir dir=${output}/
+echo file=${input}/MANIFEST.MFManifest-Version: 1.0
+Main-Class: MyClass
+
+/echo
+jar destfile=${input}/manifesttest.jar
+ filesetmanifest=merge
+ zipfileset file=${input}/MANIFEST.MF prefix=META-INF/
+/jar
+unjar src=${input}/manifesttest.jar dest=${output}/
+au:assertFileExists file=${output}/META-INF/MANIFEST.MF/
+au:assertResourceContains value=Main-Class: MyClass
+ resource=${output}/META-INF/MANIFEST.MF/
+ /target
+
/project
svn commit: r984111 - in /ant/antlibs/dotnet/trunk: changes.xml src/main/org/apache/ant/dotnet/compile/CSharp.java src/tests/antunit/old-core-test.xml src/tests/antunit/wsdl2dotnet-test.xml
Author: bodewig
Date: Tue Aug 10 16:35:27 2010
New Revision: 984111
URL: http://svn.apache.org/viewvc?rev=984111view=rev
Log:
embrace .NET 2.0 on Mono
Modified:
ant/antlibs/dotnet/trunk/changes.xml
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java
ant/antlibs/dotnet/trunk/src/tests/antunit/old-core-test.xml
ant/antlibs/dotnet/trunk/src/tests/antunit/wsdl2dotnet-test.xml
Modified: ant/antlibs/dotnet/trunk/changes.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/changes.xml?rev=984111r1=984110r2=984111view=diff
==
--- ant/antlibs/dotnet/trunk/changes.xml (original)
+++ ant/antlibs/dotnet/trunk/changes.xml Tue Aug 10 16:35:27 2010
@@ -38,6 +38,9 @@
/properties
release version=SVN trunk date=unpublished
+ action type=update breaks-bwc=true
+The C# compiler uses gmcs on Mono by default now.
+ /action
action type=add
A new F# compiler task has been added.
/action
Modified:
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java?rev=984111r1=984110r2=984111view=diff
==
--- ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java
(original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/compile/CSharp.java
Tue Aug 10 16:35:27 2010
@@ -40,7 +40,7 @@ import java.io.File;
/**
* Compiles C# source into executables or modules.
*
- * csc.exe on Windows or mcs on other platforms must be on the execute
+ * csc.exe on Windows or gmcs on other platforms must be on the execute
* path, unless another executable or the full path to that executable
* is specified in the ttexecutable/tt parameter
* p
@@ -102,6 +102,8 @@ import java.io.File;
public class CSharp extends DotnetCompile {
+private static final String MONO_CS_COMPILER = gmcs;
+
/**
* defines list: RELEASE;WIN32;NO_SANITY_CHECKS;;SOMETHING_ELSE'
*/
@@ -160,7 +162,7 @@ public class CSharp extends DotnetCompil
unsafe = false;
noconfig = false;
definitions = null;
-setExecutable(isWindows ? csc : mcs);
+setExecutable(isWindows ? csc : MONO_CS_COMPILER);
}
@@ -203,7 +205,7 @@ public class CSharp extends DotnetCompil
*...@returnThe OutputFile Parameter to CSC
*/
protected String getFileAlignParameter() {
-if (fileAlign != 0 !mcs.equals(getExecutable())) {
+if (fileAlign != 0 !MONO_CS_COMPILER.equals(getExecutable())) {
return /filealign: + fileAlign;
} else {
return null;
Modified: ant/antlibs/dotnet/trunk/src/tests/antunit/old-core-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/tests/antunit/old-core-test.xml?rev=984111r1=984110r2=984111view=diff
==
--- ant/antlibs/dotnet/trunk/src/tests/antunit/old-core-test.xml (original)
+++ ant/antlibs/dotnet/trunk/src/tests/antunit/old-core-test.xml Tue Aug 10
16:35:27 2010
@@ -64,16 +64,16 @@
echo jsharp.found=${jsharp.found}/echo
!-- Mono C# compiler --
- condition property=mcs.found
- available file=mcs filepath=${env.PATH} /
+ condition property=gmcs.found
+ available file=gmcs filepath=${env.PATH} /
/condition
- echo mcs.found=${mcs.found}/echo
+ echo gmcs.found=${gmcs.found}/echo
!-- any C# compiler --
condition property=c#.found
or
isset property=csc.found/
-isset property=mcs.found/
+isset property=gmcs.found/
/or
/condition
@@ -95,7 +95,7 @@
condition property=dotnetapps.found
or
and
- isset property=mcs.found/
+ isset property=gmcs.found/
isset property=mono.ilasm.found/
/and
and
@@ -120,8 +120,8 @@
isset property=csc.found/
/condition
- condition property=cs.compiler value=mcs
- isset property=mcs.found/
+ condition property=cs.compiler value=gmcs
+ isset property=gmcs.found/
/condition
condition property=ms.net20+
@@ -169,7 +169,7 @@
delete file=${testCSC.exe}/
/target
- target name=CSC-Mono depends=validate_csc if=mcs.found
+ target name=CSC-Mono depends=validate_csc if=gmcs.found
property name=testCSC.exe
location=${build.dir}/ExampleCsc.exe /
dn:csc
@@ -215,7 +215,7 @@
delete file=${testCSCRes.exe}/
/target
- target name=CSCResources-Mono depends=validate_csc if=mcs.found
+ target name=CSCResources-Mono depends=validate_csc if=gmcs.found
property name=testCSCRes.exe
location=${build.dir}/ExampleCscRes.exe /
dn:csc
@@ -251,7 +251,7 @@
delete file=${testCSC.exe}/
/target
svn commit: r984155 - in /ant/core/trunk: docs/antlibs/compress/index.html xdocs/antlibs/compress/index.xml
Author: bodewig Date: Tue Aug 10 18:14:01 2010 New Revision: 984155 URL: http://svn.apache.org/viewvc?rev=984155view=rev Log: compress antlib requires commons compress 1.1 Modified: ant/core/trunk/docs/antlibs/compress/index.html ant/core/trunk/xdocs/antlibs/compress/index.xml Modified: ant/core/trunk/docs/antlibs/compress/index.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/antlibs/compress/index.html?rev=984155r1=984154r2=984155view=diff == --- ant/core/trunk/docs/antlibs/compress/index.html (original) +++ ant/core/trunk/docs/antlibs/compress/index.html Tue Aug 10 18:14:01 2010 @@ -171,10 +171,10 @@ pThis 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 +Commons Compress/a. Using Apache Commons Compress 1.1 this Antlib supports gzip and bzip2 compression and ar, cpio, tar and zip archives./p -pThe current code base is based on the 1.0 release of Commons +pThe 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/trunk/xdocs/antlibs/compress/index.xml URL: http://svn.apache.org/viewvc/ant/core/trunk/xdocs/antlibs/compress/index.xml?rev=984155r1=984154r2=984155view=diff == --- ant/core/trunk/xdocs/antlibs/compress/index.xml (original) +++ ant/core/trunk/xdocs/antlibs/compress/index.xml Tue Aug 10 18:14:01 2010 @@ -27,11 +27,11 @@ pThis 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 +Commons Compress/a. Using Apache Commons Compress 1.1 this Antlib supports gzip and bzip2 compression and ar, cpio, tar and zip archives./p - pThe current code base is based on the 1.0 release of Commons + pThe 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
svn commit: r986226 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/util/FileUtils.java src/tests/antunit/taskdefs/tempfile-test.xml
Author: bodewig
Date: Tue Aug 17 07:57:18 2010
New Revision: 986226
URL: http://svn.apache.org/viewvc?rev=986226view=rev
Log:
Avoid NPE in createTempFile if no prfix has been specified. PR 49755
Added:
ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml (with props)
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=986226r1=986225r2=986226view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Aug 17 07:57:18 2010
@@ -119,6 +119,10 @@ Fixed bugs:
zipfilesets that used the prefix or fullpath attributes.
Bugzilla Report 49605.
+ * tempfile createfile=true would cause an error unless the prefix
+ attribute has been specified.
+ Bugzilla Report 49755.
+
Other changes:
--
Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java?rev=986226r1=986225r2=986226view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/FileUtils.java Tue Aug 17
07:57:18 2010
@@ -898,6 +898,8 @@ public class FileUtils {
return createTempFile(prefix, suffix, parentDir, false, false);
}
+private static final String NULL_PLACEHOLDER = null;
+
/**
* Create a temporary file in a given directory.
*
@@ -925,6 +927,12 @@ public class FileUtils {
String parent = (parentDir == null)
? System.getProperty(java.io.tmpdir)
: parentDir.getPath();
+if (prefix == null) {
+prefix = NULL_PLACEHOLDER;
+}
+if (suffix == null) {
+suffix = NULL_PLACEHOLDER;
+}
if (createFile) {
try {
Added: ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml?rev=986226view=auto
==
--- ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml Tue Aug 17
07:57:18 2010
@@ -0,0 +1,26 @@
+?xml version=1.0?
+!--
+ 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
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--
+project default=antunit xmlns:au=antlib:org.apache.ant.antunit
+ import file=../antunit-base.xml /
+
+ target name=testCreateWithoutPrefix
+
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=49755;
+tempfile property=tmp createfile=true/
+au:assertFileExists file=${tmp}/
+ /target
+/project
Propchange: ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml
--
svn:eol-style = native
svn commit: r986232 - /ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml
Author: bodewig
Date: Tue Aug 17 08:00:39 2010
New Revision: 986232
URL: http://svn.apache.org/viewvc?rev=986232view=rev
Log:
clean up after test
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml
Modified: ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml?rev=986232r1=986231r2=986232view=diff
==
--- ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/tempfile-test.xml Tue Aug 17
08:00:39 2010
@@ -18,6 +18,10 @@
project default=antunit xmlns:au=antlib:org.apache.ant.antunit
import file=../antunit-base.xml /
+ target name=tearDown depends=antunit-base.tearDown
+delete file=${tmp} quiet=true/
+ /target
+
target name=testCreateWithoutPrefix
description=https://issues.apache.org/bugzilla/show_bug.cgi?id=49755;
tempfile property=tmp createfile=true/
svn commit: r986261 - /ant/core/trunk/docs/manual/Tasks/copy.html
Author: bodewig Date: Tue Aug 17 10:25:28 2010 New Revision: 986261 URL: http://svn.apache.org/viewvc?rev=986261view=rev Log: tofile is incompatible with non-file resources. PR 49756 Modified: ant/core/trunk/docs/manual/Tasks/copy.html Modified: ant/core/trunk/docs/manual/Tasks/copy.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/copy.html?rev=986261r1=986260r2=986261view=diff == --- ant/core/trunk/docs/manual/Tasks/copy.html (original) +++ ant/core/trunk/docs/manual/Tasks/copy.html Tue Aug 17 10:25:28 2010 @@ -72,8 +72,9 @@ operation as a href=../Types/filterset td valign=toptofile/td td valign=topThe file to copy to./td td valign=top align=center rowspan=2With the codefile/code - attribute, either codetofile/code or codetodir/code can be used. - With nested resource collection elements, if the number of included files + attribute, either codetofile/code or codetodir/code can be used.br/ + With nested resource collection elements, if the collection + contains non-filesystem resources, the number of included files is greater than 1, or if only the codedir/code attribute is specified in the codelt;filesetgt;/code, or if the codefile/code attribute is also specified, then only
svn commit: r986290 - in /ant/core/trunk: WHATSNEW docs/manual/Tasks/copy.html src/main/org/apache/tools/ant/taskdefs/Copy.java src/tests/antunit/taskdefs/copy-test.xml
Author: bodewig
Date: Tue Aug 17 12:22:07 2010
New Revision: 986290
URL: http://svn.apache.org/viewvc?rev=986290view=rev
Log:
allow copy/@tofile to be used with non-file resources. PR 49756
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/Tasks/copy.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
ant/core/trunk/src/tests/antunit/taskdefs/copy-test.xml
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=986290r1=986289r2=986290view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Aug 17 12:22:07 2010
@@ -166,6 +166,9 @@ Other changes:
the imported resource. This means that several kinds of different build
files can import each other.
+ * copy tofile= now also works for non-filesystem resources.
+ Bugzilla Report 49756.
+
Changes from Ant 1.8.0 TO Ant 1.8.1
===
Modified: ant/core/trunk/docs/manual/Tasks/copy.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/copy.html?rev=986290r1=986289r2=986290view=diff
==
--- ant/core/trunk/docs/manual/Tasks/copy.html (original)
+++ ant/core/trunk/docs/manual/Tasks/copy.html Tue Aug 17 12:22:07 2010
@@ -73,12 +73,15 @@ operation as a href=../Types/filterset
td valign=topThe file to copy to./td
td valign=top align=center rowspan=2With the codefile/code
attribute, either codetofile/code or codetodir/code can be
used.br/
- With nested resource collection elements, if the collection
- contains non-filesystem resources, the number of included files
+
+ With nested resource collection elements, if the number of
+ included resources
is greater than 1, or if only the codedir/code attribute is
specified in the codelt;filesetgt;/code, or if the
codefile/code attribute is also specified, then only
- codetodir/code is allowed./td
+ codetodir/code is allowed.br/
+ emPrior to Ant 1.8.2/em the codetofile/code attribute
+ only supported filesystem resources top copy from./td
/tr
tr
td valign=toptodir/td
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java?rev=986290r1=986289r2=986290view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java Tue Aug 17
12:22:07 2010
@@ -102,6 +102,10 @@ public class Copy extends Task {
private long granularity = 0;
private boolean force = false;
+// used to store the single non-file resource to copy when the
+// tofile attribute has been used
+private Resource singleResource = null;
+
/**
* Copy task constructor.
*/
@@ -550,11 +554,15 @@ public class Copy extends Task {
}
}
-if (nonFileResources.size() 0) {
+if (nonFileResources.size() 0 || singleResource != null) {
Resource[] nonFiles =
(Resource[]) nonFileResources.toArray(new
Resource[nonFileResources.size()]);
// restrict to out-of-date resources
Map map = scan(nonFiles, destDir);
+if (singleResource != null) {
+map.put(singleResource,
+new String[] { destFile.getAbsolutePath() });
+}
try {
doResourceOperations(map);
} catch (BuildException e) {
@@ -568,6 +576,7 @@ public class Copy extends Task {
} finally {
// clean up again, so this instance can be used a second
// time
+singleResource = null;
file = savedFile;
destFile = savedDestFile;
destDir = savedDestDir;
@@ -661,10 +670,9 @@ public class Copy extends Task {
Cannot concatenate multiple files into a single file.);
} else {
ResourceCollection rc = (ResourceCollection) rcs.elementAt(0);
-if (!rc.isFilesystemOnly()) {
+if (!rc.isFilesystemOnly() !supportsNonFileResources()) {
throw new BuildException(Only FileSystem resources are
- + supported when concatenating
- + files.);
+ + supported.);
}
if (rc.size() == 0) {
throw new
BuildException(MSG_WHEN_COPYING_EMPTY_RC_TO_FILE);
@@ -672,7 +680,11 @@ public class Copy extends Task
svn commit: r986445 - in /ant/core/trunk/src/main/org/apache/tools/ant: filters/ taskdefs/condition/ taskdefs/optional/ types/resources/selectors/ types/selectors/ util/ util/regexp/
Author: bodewig
Date: Tue Aug 17 18:30:52 2010
New Revision: 986445
URL: http://svn.apache.org/viewvc?rev=986445view=rev
Log:
merge redundant code
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/filters/TokenFilter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
ant/core/trunk/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
ant/core/trunk/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
ant/core/trunk/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/TokenFilter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/TokenFilter.java?rev=986445r1=986444r2=986445view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/TokenFilter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/TokenFilter.java Tue
Aug 17 18:30:52 2010
@@ -29,6 +29,7 @@ import org.apache.tools.ant.util.Tokeniz
import org.apache.tools.ant.util.LineTokenizer;
import org.apache.tools.ant.util.StringUtils;
import org.apache.tools.ant.util.regexp.Regexp;
+import org.apache.tools.ant.util.regexp.RegexpUtil;
/**
* This splits up input into tokens and passes
@@ -705,22 +706,6 @@ public class TokenFilter extends BaseFil
* @return the Regexp option bits
*/
public static int convertRegexOptions(String flags) {
-if (flags == null) {
-return 0;
-}
-int options = 0;
-if (flags.indexOf('g') != -1) {
-options |= Regexp.REPLACE_ALL;
-}
-if (flags.indexOf('i') != -1) {
-options |= Regexp.MATCH_CASE_INSENSITIVE;
-}
-if (flags.indexOf('m') != -1) {
-options |= Regexp.MATCH_MULTILINE;
-}
-if (flags.indexOf('s') != -1) {
-options |= Regexp.MATCH_SINGLELINE;
-}
-return options;
+return RegexpUtil.asOptions(flags);
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java?rev=986445r1=986444r2=986445view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
Tue Aug 17 18:30:52 2010
@@ -19,9 +19,9 @@ package org.apache.tools.ant.taskdefs.co
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.util.regexp.Regexp;
import org.apache.tools.ant.types.RegularExpression;
-import org.apache.tools.ant.util.regexp.RegexpMatcher;
+import org.apache.tools.ant.util.regexp.Regexp;
+import org.apache.tools.ant.util.regexp.RegexpUtil;
/**
* Simple regular expression condition.
@@ -112,16 +112,7 @@ public class Matches extends ProjectComp
if (regularExpression == null) {
throw new BuildException(Missing pattern in matches.);
}
-int options = RegexpMatcher.MATCH_DEFAULT;
-if (!caseSensitive) {
-options = options | RegexpMatcher.MATCH_CASE_INSENSITIVE;
-}
-if (multiLine) {
-options = options | RegexpMatcher.MATCH_MULTILINE;
-}
-if (singleLine) {
-options = options | RegexpMatcher.MATCH_SINGLELINE;
-}
+int options = RegexpUtil.asOptions(caseSensitive, multiLine,
singleLine);
Regexp regexp = regularExpression.getRegexp(getProject());
return regexp.matches(string, options);
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java?rev=986445r1=986444r2=986445view=diff
==
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
Tue Aug 17 18:30:52 2010
@@ -43,6 +43,7 @@ import org.apache.tools.ant.types.resour
import org.apache.tools.ant.types.resources.Union;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.regexp.Regexp;
+import org.apache.tools.ant.util.regexp.RegexpUtil;
/**
* Performs regular expression string replacements in a text
@@ -513,23 +514,7 @@ public class ReplaceRegExp extends Task
+ time
svn commit: r986457 - in /ant/core/trunk: WHATSNEW docs/manual/Types/filterchain.html docs/manual/Types/selectors.html src/main/org/apache/tools/ant/filters/LineContainsRegExp.java src/main/org/apache
Author: bodewig Date: Tue Aug 17 19:16:19 2010 New Revision: 986457 URL: http://svn.apache.org/viewvc?rev=986457view=rev Log: support casesensitive in linecontainsregexp and casesensitive, multiline and singleline in containsregexp. PR 49764 Modified: ant/core/trunk/WHATSNEW ant/core/trunk/docs/manual/Types/filterchain.html ant/core/trunk/docs/manual/Types/selectors.html ant/core/trunk/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=986457r1=986456r2=986457view=diff == --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Tue Aug 17 19:16:19 2010 @@ -169,6 +169,13 @@ Other changes: * copy tofile= now also works for non-filesystem resources. Bugzilla Report 49756. + * The linecontainsregexp filter now supports a casesensitive + attribute. + + * The containsregexp selector now supports casesensitive, multiline + and singleline attributes. + Bugzilla Report 49764. + Changes from Ant 1.8.0 TO Ant 1.8.1 === Modified: ant/core/trunk/docs/manual/Types/filterchain.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/filterchain.html?rev=986457r1=986456r2=986457view=diff == --- ant/core/trunk/docs/manual/Types/filterchain.html (original) +++ ant/core/trunk/docs/manual/Types/filterchain.html Tue Aug 17 19:16:19 2010 @@ -414,6 +414,12 @@ regular expression matching strings. inon-/imatching lines only. bSince Ant 1.7/b/td td vAlign=top align=centerNo/td /tr + tr +td vAlign=topcasesensitive/td +td vAlign=top align=centerPerform a case sensitive + match. Default is true. bSince Ant 1.8.2/b/td +td vAlign=top align=centerNo/td + /tr /table See a href=regexp.htmlRegexp Type/a for the description of the nested element regexp and of Modified: ant/core/trunk/docs/manual/Types/selectors.html URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Types/selectors.html?rev=986457r1=986456r2=986457view=diff == --- ant/core/trunk/docs/manual/Types/selectors.html (original) +++ ant/core/trunk/docs/manual/Types/selectors.html Tue Aug 17 19:16:19 2010 @@ -557,6 +557,28 @@ match true in every file/td td valign=top align=centerYes/td /tr + tr +td valign=topcasesensitive/td +td valign=topPerform a case sensitive match. Default is + true. emsince Ant 1.8.2/em/td +td valign=top align=centerNo/td + /tr + tr +td valign=topmultiline/td +td valign=top + Perform a multi line match. + Default is false. emsince Ant 1.8.2/em/td +td valign=top align=centerNo/td + /tr + tr +td valign=topsingleline/td +td valign=top + This allows '.' to match new lines. + SingleLine is not to be confused with multiline, SingleLine is a perl + regex term, it corresponds to dotall in java regex. + Default is false. emsince Ant 1.8.2/em/td +td valign=top align=centerNo/td + /tr /table pHere is an example of how to use the regular expression Selector:/p Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java?rev=986457r1=986456r2=986457view=diff == --- ant/core/trunk/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java Tue Aug 17 19:16:19 2010 @@ -24,6 +24,7 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.RegularExpression; import org.apache.tools.ant.util.regexp.Regexp; +import org.apache.tools.ant.util.regexp.RegexpUtil; /** * Filter which includes only those lines that contain the user-specified @@ -49,9 +50,12 @@ public final class LineContainsRegExp /** Parameter name for the regular expression to filter on. */ private static final String REGEXP_KEY = regexp; -/** Parameter name for the words to filter on. */ +/** Parameter name for the negate attribute. */ private static final String NEGATE_KEY = negate; +/** Parameter name for the casesensitive attribute. */ +private static final String CS_KEY = casesensitive; + /** Vector that holds the expressions that input lines must contain. */ private Vector regexps = new Vector(); @@ -63,6 +67,7 @@ public
svn commit: r986729 - /ant/core/trunk/WHATSNEW
Author: bodewig Date: Wed Aug 18 15:12:53 2010 New Revision: 986729 URL: http://svn.apache.org/viewvc?rev=986729view=rev Log: document fix for PR 49587 Modified: ant/core/trunk/WHATSNEW Modified: ant/core/trunk/WHATSNEW URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=986729r1=986728r2=986729view=diff == --- ant/core/trunk/WHATSNEW (original) +++ ant/core/trunk/WHATSNEW Wed Aug 18 15:12:53 2010 @@ -127,6 +127,11 @@ Fixed bugs: for a bunch of characters, then stealing them from a following input. Bugzilla Report 49119. + * Ant could be leaking threads for each forked process (started by + exec, apply, java or similar tasks) that didn't receive input + from a resource or string explicitly. + Bugzilla Report 49587. + Other changes: --
svn commit: r987015 - /ant/antlibs/ReleaseInstructions
Author: bodewig Date: Thu Aug 19 04:48:58 2010 New Revision: 987015 URL: http://svn.apache.org/viewvc?rev=987015view=rev Log: some notes taken while preparing the compress 1.0 release, Nexus stuff still to do Modified: ant/antlibs/ReleaseInstructions Modified: ant/antlibs/ReleaseInstructions URL: http://svn.apache.org/viewvc/ant/antlibs/ReleaseInstructions?rev=987015r1=987014r2=987015view=diff == --- ant/antlibs/ReleaseInstructions (original) +++ ant/antlibs/ReleaseInstructions Thu Aug 19 04:48:58 2010 @@ -58,12 +58,15 @@ Note: this document is based on Ant core https://svn.apache.org/repos/asf/ant/antlibs/dotnet/tags/1_0B1 \ -m Tagging version 1.0beta1 of .NET Antlib -8. Choose the correct tagged version of common as your svn:externals -property, if necessary tag common first. +8. Choose the correct revision number of common as your svn:externals +property. 9. Next build and run the tests. Then build the distribution. It is important that this be a clean build. +To build the distribution run the distribution target. +To build the mvn artifacts run the prepare-upload target. + 10. Sign the distribution files using the following simple script #!/bin/sh for i in `/usr/bin/find distribution \( -name *.bz2 -o -name *.zip -o -name *.gz \)` @@ -71,6 +74,11 @@ Note: this document is based on Ant core echo Signing $i gpg -a -b --force-v3-sigs $i done +for i in `/usr/bin/find build/java-repository -type f` +do + echo Signing $i + gpg -a -b --force-v3-sigs $i +done The --force-v3-sigs will improve the interoperability with PGP 5.x, see http://www.gnupg.org/(en)/documentation/faqs.html#q5.5. @@ -82,8 +90,8 @@ Note: this document is based on Ant core Also make sure you have sent the key that you use to a public keyserver. -11. The beta distribution is now ready to go. Bundle it up into a tar.gz file -and scp to your apache account. +11. The beta distribution is now ready to go. Bundle the distribution +directory into a tar.gz file and scp to your apache account. 12. This step may become meaningful once you do a second release ;-)
svn commit: r987052 - /ant/antlibs/common/trunk/upload.xml
Author: bodewig
Date: Thu Aug 19 07:35:09 2010
New Revision: 987052
URL: http://svn.apache.org/viewvc?rev=987052view=rev
Log:
wrong location of settings file
Modified:
ant/antlibs/common/trunk/upload.xml
Modified: ant/antlibs/common/trunk/upload.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/upload.xml?rev=987052r1=987051r2=987052view=diff
==
--- ant/antlibs/common/trunk/upload.xml (original)
+++ ant/antlibs/common/trunk/upload.xml Thu Aug 19 07:35:09 2010
@@ -29,7 +29,7 @@
message=supply upload.user on the command line/
fail unless=upload.password
message=supply upload.password on the command line/
-ivy:configure file=ivysettings-nexus.xml/
+ivy:configure file=${common.basedir}/ivysettings-nexus.xml/
ivy:resolve file=${target.ivy.xml}/
ivy:retrieve/
ivy:deliver/
svn commit: r987054 - /ant/antlibs/common/trunk/ivy.xml
Author: bodewig
Date: Thu Aug 19 07:44:48 2010
New Revision: 987054
URL: http://svn.apache.org/viewvc?rev=987054view=rev
Log:
fix some Ivy schema violations
Modified:
ant/antlibs/common/trunk/ivy.xml
Modified: ant/antlibs/common/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivy.xml?rev=987054r1=987053r2=987054view=diff
==
--- ant/antlibs/common/trunk/ivy.xml (original)
+++ ant/antlibs/common/trunk/ivy.xml Thu Aug 19 07:44:48 2010
@@ -57,15 +57,15 @@
target name=make-ivy.xml depends=ivy-init unless=project.has-ivy.xml?
echo message=Creating ivy.xml ${target.ivy.xml} level=verbose/
echoxml file=${target.ivy.xml}
- ivy-module version=1.3
-info organization=${ivy.organization}
- module=ant
- revision=${artifact.version}
- publication=${publication.datetime}
+ ivy-module version=2.0
+info organisation=${ivy.organization}
+ module=ant
+ revision=${artifact.version}
+ publication=${publication.datetime}
license name=Apache Software License 2.0
-url=http://www.apache.org/licenses/LICENSE-2.0/
- ivy-author name=Apache Ant Development Team
-url=http://ant.apache.org//
+ url=http://www.apache.org/licenses/LICENSE-2.0/
+ ivyauthor name=Apache Ant Development Team
+ url=http://ant.apache.org//
/info
publications xmlns:e=urn:ant.apache.org:ivy-extras
artifact name=${artifact.name} type=pom ext=pom/
svn commit: r987055 - /ant/antlibs/compress/trunk/project-template.ivy.xml
Author: bodewig
Date: Thu Aug 19 07:45:09 2010
New Revision: 987055
URL: http://svn.apache.org/viewvc?rev=987055view=rev
Log:
fix some Ivy schema violations
Modified:
ant/antlibs/compress/trunk/project-template.ivy.xml
Modified: ant/antlibs/compress/trunk/project-template.ivy.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/project-template.ivy.xml?rev=987055r1=987054r2=987055view=diff
==
--- ant/antlibs/compress/trunk/project-template.ivy.xml (original)
+++ ant/antlibs/compress/trunk/project-template.ivy.xml Thu Aug 19 07:45:09 2010
@@ -18,14 +18,14 @@
--
ivy-module version=2.0
- info organization=${ivy.organization}
+ info organisation=${ivy.organization}
module=ant
revision=${artifact.version}
publication=${publication.datetime}
license name=Apache Software License 2.0
url=http://www.apache.org/licenses/LICENSE-2.0/
-ivy-author name=Apache Ant Development Team
-url=http://ant.apache.org//
+ivyauthor name=Apache Ant Development Team
+ url=http://ant.apache.org//
description homepage=http://ant.apache.org/antlibs/compress/;
Provides tasks and types that deal with AR, CPIO, TAR
and ZIP archives as well as BZIP2 and GZIP compressed files based on
@@ -51,8 +51,8 @@
e:classifier=ivy/
/publications
dependencies
-dependency org=org.apache.ant name=ant revision=[1.8.0,)/
+dependency org=org.apache.ant name=ant rev=[1.8.0,)/
dependency org=org.apache.commons name=commons-compress
-revision=[1.1,)/
+rev=[1.1,)/
/dependencies
/ivy-module
svn commit: r987066 - /ant/antlibs/common/trunk/ivysettings-nexus.xml
Author: bodewig Date: Thu Aug 19 08:13:07 2010 New Revision: 987066 URL: http://svn.apache.org/viewvc?rev=987066view=rev Log: make it work for modules with dependencies Modified: ant/antlibs/common/trunk/ivysettings-nexus.xml Modified: ant/antlibs/common/trunk/ivysettings-nexus.xml URL: http://svn.apache.org/viewvc/ant/antlibs/common/trunk/ivysettings-nexus.xml?rev=987066r1=987065r2=987066view=diff == --- ant/antlibs/common/trunk/ivysettings-nexus.xml (original) +++ ant/antlibs/common/trunk/ivysettings-nexus.xml Thu Aug 19 08:13:07 2010 @@ -24,6 +24,7 @@ /url /resolvers modules - module organisation=org.apache resolver=nexus/ +module organisation=org.apache name=ant resolver=nexus/ /modules + settings defaultResolver=public/ /ivysettings
svn commit: r987068 - /ant/antlibs/compress/trunk/project-template.ivy.xml
Author: bodewig Date: Thu Aug 19 08:14:30 2010 New Revision: 987068 URL: http://svn.apache.org/viewvc?rev=987068view=rev Log: Ivy doesn't like a dependency on the module itself - and version ranges don't seem to work with the Ibiblio resolver Modified: ant/antlibs/compress/trunk/project-template.ivy.xml Modified: ant/antlibs/compress/trunk/project-template.ivy.xml URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/project-template.ivy.xml?rev=987068r1=987067r2=987068view=diff == --- ant/antlibs/compress/trunk/project-template.ivy.xml (original) +++ ant/antlibs/compress/trunk/project-template.ivy.xml Thu Aug 19 08:14:30 2010 @@ -51,8 +51,7 @@ e:classifier=ivy/ /publications dependencies -dependency org=org.apache.ant name=ant rev=[1.8.0,)/ dependency org=org.apache.commons name=commons-compress -rev=[1.1,)/ +rev=1.1/ /dependencies /ivy-module
svn commit: r987071 - in /ant/antlibs/compress/tags/1_0: ./ docs/ src/main/org/apache/ant/compress/resources/ src/main/org/apache/ant/compress/taskdefs/ src/main/org/apache/ant/compress/util/ src/test
Author: bodewig Date: Thu Aug 19 08:20:46 2010 New Revision: 987071 URL: http://svn.apache.org/viewvc?rev=987071view=rev Log: merge changes from trunk Modified: ant/antlibs/compress/tags/1_0/ (props changed) ant/antlibs/compress/tags/1_0/docs/archives.html (props changed) ant/antlibs/compress/tags/1_0/docs/compresource.html (props changed) ant/antlibs/compress/tags/1_0/docs/entry.html (props changed) ant/antlibs/compress/tags/1_0/docs/expand.html (props changed) ant/antlibs/compress/tags/1_0/docs/fileset.html (props changed) ant/antlibs/compress/tags/1_0/docs/unpack.html (props changed) ant/antlibs/compress/tags/1_0/project-template.ivy.xml ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ArFileSet.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ArResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/Archives.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CommonsCompressCompressorResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CpioFileSet.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/CpioResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarFileSet.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipFileSet.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipScanner.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Ar.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Cpio.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/PackBase.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unar.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/UnpackBase.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Untar.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Zip.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/util/CompressorStreamFactory.java (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/antunit-base.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/archives-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/arentry-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/arfileset-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/bunzip2-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/bzip2-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/cpioentry-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/cpiofileset-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/gunzip-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/gzip-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/tarentry-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/tarfileset-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/unar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/uncpio-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/unzip-test.xml
svn commit: r987079 - in /ant/antlibs/compress/tags/1_0: ./ src/main/org/apache/ant/compress/resources/ src/main/org/apache/ant/compress/taskdefs/ src/tests/antunit/
Author: bodewig Date: Thu Aug 19 08:46:49 2010 New Revision: 987079 URL: http://svn.apache.org/viewvc?rev=987079view=rev Log: complete merge Modified: ant/antlibs/compress/tags/1_0/ (props changed) ant/antlibs/compress/tags/1_0/project-template.ivy.xml ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java (props changed) ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml (props changed) ant/antlibs/compress/tags/1_0/src/tests/antunit/zip-test.xml (props changed) Propchange: ant/antlibs/compress/tags/1_0/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1 +1 @@ -/ant/antlibs/compress/trunk:987018-987066 +/ant/antlibs/compress/trunk:987018-987066,987068 Modified: ant/antlibs/compress/tags/1_0/project-template.ivy.xml URL: http://svn.apache.org/viewvc/ant/antlibs/compress/tags/1_0/project-template.ivy.xml?rev=987079r1=987078r2=987079view=diff == --- ant/antlibs/compress/tags/1_0/project-template.ivy.xml (original) +++ ant/antlibs/compress/tags/1_0/project-template.ivy.xml Thu Aug 19 08:46:49 2010 @@ -51,8 +51,7 @@ e:classifier=ivy/ /publications dependencies -dependency org=org.apache.ant name=ant rev=[1.8.0,)/ dependency org=org.apache.commons name=commons-compress -rev=[1.1,)/ +rev=1.1/ /dependencies /ivy-module Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/TarResource.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/TarResource.java:806035 Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/resources/ZipResource.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/types/resources/ZipResource.java:806035 Propchange: ant/antlibs/compress/tags/1_0/src/main/org/apache/ant/compress/taskdefs/Unzip.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066 +/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Unzip.java:987018-987066,987068 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Expand.java:815599 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/ar-test.xml -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:806793 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/cpio-test.xml -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,2 +1,2 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml:987018-987066,987068 /ant/sandbox/antlibs/compress/trunk/src/tests/antunit/ar-test.xml:806788 Propchange: ant/antlibs/compress/tags/1_0/src/tests/antunit/tar-test.xml -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 19 08:46:49 2010 @@ -1,3 +1,3 @@ -/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066 +/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml:987018-987066,987068 /ant/sandbox/antlibs
svn commit: r987092 - /ant/antlibs/ReleaseInstructions
Author: bodewig Date: Thu Aug 19 09:06:50 2010 New Revision: 987092 URL: http://svn.apache.org/viewvc?rev=987092view=rev Log: Add Nexus bits Modified: ant/antlibs/ReleaseInstructions Modified: ant/antlibs/ReleaseInstructions URL: http://svn.apache.org/viewvc/ant/antlibs/ReleaseInstructions?rev=987092r1=987091r2=987092view=diff == --- ant/antlibs/ReleaseInstructions (original) +++ ant/antlibs/ReleaseInstructions Thu Aug 19 09:06:50 2010 @@ -93,6 +93,14 @@ Note: this document is based on Ant core 11. The beta distribution is now ready to go. Bundle the distribution directory into a tar.gz file and scp to your apache account. +To upload mvn artifatcs to the Nexus repository manager run + +ant upload -Dupload.user=YOUR-ASF-ID -Dupload.password=SVN-PASSWORD + +Before others can see the artifacts you've uploaded, you need to +close the staging repository that has just been created. +See http://www.apache.org/dev/publishing-maven-artifacts.html#close-stage + 12. This step may become meaningful once you do a second release ;-) Meanwhile, convert the part of the WHATSNEW file covering the changes
svn commit: r987095 - /ant/antlibs/ReleaseInstructions
Author: bodewig Date: Thu Aug 19 09:10:01 2010 New Revision: 987095 URL: http://svn.apache.org/viewvc?rev=987095view=rev Log: redundant checksums Modified: ant/antlibs/ReleaseInstructions Modified: ant/antlibs/ReleaseInstructions URL: http://svn.apache.org/viewvc/ant/antlibs/ReleaseInstructions?rev=987095r1=987094r2=987095view=diff == --- ant/antlibs/ReleaseInstructions (original) +++ ant/antlibs/ReleaseInstructions Thu Aug 19 09:10:01 2010 @@ -101,6 +101,11 @@ Note: this document is based on Ant core close the staging repository that has just been created. See http://www.apache.org/dev/publishing-maven-artifacts.html#close-stage +Nexus will create .md5 and .sha1 files for your .asc signatures +that can savely be deleted via +https://repository.apache.org/index.html#stagingRepositories +(log in using your ASF credentials). + 12. This step may become meaningful once you do a second release ;-) Meanwhile, convert the part of the WHATSNEW file covering the changes
