ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r1045279 [1/12] - in /ant/core/branches/ANT_SITE: ./ docs/ docs/antlibs/ docs/antlibs/antunit/ docs/antlibs/compress/ docs/antlibs/dotnet/ docs/antlibs/props/ docs/antlibs/svn/ docs/manual/ docs/manual/CoreTasks/ docs/manual/CoreTypes/ docs...
Date Mon, 13 Dec 2010 18:34:09 GMT
Author: antoine
Date: Mon Dec 13 18:34:00 2010
New Revision: 1045279

URL: http://svn.apache.org/viewvc?rev=1045279&view=rev
Log:
merging from trunk to ANT_SITE branch

Added:
    ant/core/branches/ANT_SITE/docs/manual/Tasks/
      - copied from r1045116, ant/core/trunk/docs/manual/Tasks/
    ant/core/branches/ANT_SITE/docs/manual/Types/
      - copied from r1045116, ant/core/trunk/docs/manual/Types/
    ant/core/branches/ANT_SITE/lib/optional/junit-3.8.2.jar
      - copied unchanged from r1045116, ant/core/trunk/lib/optional/junit-3.8.2.jar
    ant/core/branches/ANT_SITE/release/
      - copied from r1045116, ant/core/trunk/release/
    ant/core/branches/ANT_SITE/src/etc/poms/ant-junit4/
      - copied from r1045116, ant/core/trunk/src/etc/poms/ant-junit4/
    ant/core/branches/ANT_SITE/src/tests/antunit/core/projecthelpers/
      - copied from r1045116, ant/core/trunk/src/tests/antunit/core/projecthelpers/
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/BatchTestTest.java
      - copied unchanged from r1045116, ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/BatchTestTest.java
Removed:
    ant/core/branches/ANT_SITE/docs/manual/CoreTasks/
    ant/core/branches/ANT_SITE/docs/manual/CoreTypes/
    ant/core/branches/ANT_SITE/docs/manual/OptionalTasks/
    ant/core/branches/ANT_SITE/docs/manual/OptionalTypes/
    ant/core/branches/ANT_SITE/docs/manual/coretasklist.html
    ant/core/branches/ANT_SITE/docs/manual/optionaltasklist.html
    ant/core/branches/ANT_SITE/src/etc/poms/ant-nodeps/
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#checkoutlist
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#commitinfo
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#config
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#cvswrappers
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#loginfo
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#modules
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#notify
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#postadmin
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#postproxy
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#posttag
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#postwatch
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#preproxy
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#rcsinfo
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#taginfo
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/.#verifymsg
Modified:
    ant/core/branches/ANT_SITE/   (props changed)
    ant/core/branches/ANT_SITE/CONTRIBUTORS   (contents, props changed)
    ant/core/branches/ANT_SITE/KEYS
    ant/core/branches/ANT_SITE/ReleaseInstructions
    ant/core/branches/ANT_SITE/STATUS
    ant/core/branches/ANT_SITE/WHATSNEW
    ant/core/branches/ANT_SITE/build.xml
    ant/core/branches/ANT_SITE/check.xml
    ant/core/branches/ANT_SITE/contributors.xml
    ant/core/branches/ANT_SITE/doap_Ant.rdf
    ant/core/branches/ANT_SITE/docs/ant_in_anger.html
    ant/core/branches/ANT_SITE/docs/ant_task_guidelines.html
    ant/core/branches/ANT_SITE/docs/antlibs/antunit/index.html
    ant/core/branches/ANT_SITE/docs/antlibs/bindownload.html
    ant/core/branches/ANT_SITE/docs/antlibs/charter.html
    ant/core/branches/ANT_SITE/docs/antlibs/compress/index.html
    ant/core/branches/ANT_SITE/docs/antlibs/dotnet/index.html
    ant/core/branches/ANT_SITE/docs/antlibs/index.html
    ant/core/branches/ANT_SITE/docs/antlibs/proper.html
    ant/core/branches/ANT_SITE/docs/antlibs/props/index.html
    ant/core/branches/ANT_SITE/docs/antlibs/sandbox.html
    ant/core/branches/ANT_SITE/docs/antlibs/srcdownload.html
    ant/core/branches/ANT_SITE/docs/antlibs/svn/index.html
    ant/core/branches/ANT_SITE/docs/antnews.html
    ant/core/branches/ANT_SITE/docs/bindownload.html
    ant/core/branches/ANT_SITE/docs/bugs.html
    ant/core/branches/ANT_SITE/docs/bylaws.html
    ant/core/branches/ANT_SITE/docs/contributors.html
    ant/core/branches/ANT_SITE/docs/external.html   (contents, props changed)
    ant/core/branches/ANT_SITE/docs/faq.html
    ant/core/branches/ANT_SITE/docs/index.html
    ant/core/branches/ANT_SITE/docs/legal.html
    ant/core/branches/ANT_SITE/docs/license.html
    ant/core/branches/ANT_SITE/docs/mail.html
    ant/core/branches/ANT_SITE/docs/manual/Integration/jext-plugin.html
    ant/core/branches/ANT_SITE/docs/manual/antexternal.html
    ant/core/branches/ANT_SITE/docs/manual/anttaskslist.html
    ant/core/branches/ANT_SITE/docs/manual/api/index.html
    ant/core/branches/ANT_SITE/docs/manual/clonevm.html
    ant/core/branches/ANT_SITE/docs/manual/conceptstypeslist.html
    ant/core/branches/ANT_SITE/docs/manual/cover.html
    ant/core/branches/ANT_SITE/docs/manual/credits.html
    ant/core/branches/ANT_SITE/docs/manual/develop.html
    ant/core/branches/ANT_SITE/docs/manual/developlist.html
    ant/core/branches/ANT_SITE/docs/manual/dirtasks.html
    ant/core/branches/ANT_SITE/docs/manual/feedback.html
    ant/core/branches/ANT_SITE/docs/manual/ide.html
    ant/core/branches/ANT_SITE/docs/manual/index.html
    ant/core/branches/ANT_SITE/docs/manual/inputhandler.html
    ant/core/branches/ANT_SITE/docs/manual/install.html
    ant/core/branches/ANT_SITE/docs/manual/installlist.html
    ant/core/branches/ANT_SITE/docs/manual/javacprops.html
    ant/core/branches/ANT_SITE/docs/manual/listeners.html
    ant/core/branches/ANT_SITE/docs/manual/platform.html
    ant/core/branches/ANT_SITE/docs/manual/projecthelper.html
    ant/core/branches/ANT_SITE/docs/manual/properties.html
    ant/core/branches/ANT_SITE/docs/manual/proxy.html
    ant/core/branches/ANT_SITE/docs/manual/running.html
    ant/core/branches/ANT_SITE/docs/manual/runninglist.html
    ant/core/branches/ANT_SITE/docs/manual/sysclasspath.html
    ant/core/branches/ANT_SITE/docs/manual/targets.html
    ant/core/branches/ANT_SITE/docs/manual/tasksoverview.html
    ant/core/branches/ANT_SITE/docs/manual/toc.html
    ant/core/branches/ANT_SITE/docs/manual/tutorial-HelloWorldWithAnt.html
    ant/core/branches/ANT_SITE/docs/manual/tutorial-tasks-filesets-properties.html
    ant/core/branches/ANT_SITE/docs/manual/tutorial-writing-tasks.html
    ant/core/branches/ANT_SITE/docs/manual/tutorials.html
    ant/core/branches/ANT_SITE/docs/manual/using.html
    ant/core/branches/ANT_SITE/docs/manual/usinglist.html
    ant/core/branches/ANT_SITE/docs/mission.html
    ant/core/branches/ANT_SITE/docs/nightlies.html
    ant/core/branches/ANT_SITE/docs/problems.html
    ant/core/branches/ANT_SITE/docs/projects.html
    ant/core/branches/ANT_SITE/docs/projects/index.html
    ant/core/branches/ANT_SITE/docs/projects/ivy.html
    ant/core/branches/ANT_SITE/docs/projects/ivyde.html
    ant/core/branches/ANT_SITE/docs/resources.html
    ant/core/branches/ANT_SITE/docs/srcdownload.html
    ant/core/branches/ANT_SITE/docs/svn.html
    ant/core/branches/ANT_SITE/fetch.xml
    ant/core/branches/ANT_SITE/lib/libraries.properties
    ant/core/branches/ANT_SITE/lib/optional/   (props changed)
    ant/core/branches/ANT_SITE/lib/optional/README
    ant/core/branches/ANT_SITE/release.sh
    ant/core/branches/ANT_SITE/src/etc/junit-frames-xalan1.xsl
    ant/core/branches/ANT_SITE/src/etc/junit-frames.xsl
    ant/core/branches/ANT_SITE/src/etc/junit-noframes.xsl
    ant/core/branches/ANT_SITE/src/etc/poms/README.txt
    ant/core/branches/ANT_SITE/src/etc/poms/ant-antlr/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bcel/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-bsf/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-log4j/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-oro/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-regexp/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-resolver/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-apache-xalan2/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-logging/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-commons-net/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-jai/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-javamail/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-jdepend/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-jmf/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-jsch/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-junit/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-launcher/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-netrexx/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-swing/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant-testutil/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/ant/pom.xml
    ant/core/branches/ANT_SITE/src/etc/poms/pom.xml
    ant/core/branches/ANT_SITE/src/etc/testcases/taskdefs/concat.xml
    ant/core/branches/ANT_SITE/src/etc/testcases/taskdefs/conditions/antversion.xml
    ant/core/branches/ANT_SITE/src/etc/testcases/taskdefs/optional/junit.xml
    ant/core/branches/ANT_SITE/src/etc/testcases/taskdefs/signjar.xml
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/ComponentHelper.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/DemuxInputStream.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/Diagnostics.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/DirectoryScanner.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/Main.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/Project.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/ProjectHelper.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/ProjectHelperRepository.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/Target.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/Task.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/UnknownElement.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/filters/TokenFilter.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/launch/Locator.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Checksum.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Concat.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Copy.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Delete.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Echo.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Execute.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Get.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Jar.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Java.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Javac.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Move.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Parallel.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Property.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Redirector.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Replace.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/SignJar.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/Zip.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/condition/Matches.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/defaults.properties
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/email/Message.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/Constants.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/AbstractFileSet.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/Path.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/ZipScanner.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/defaults.properties
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/resources/FileResource.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/resources/Resources.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/resources/Restrict.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/DOMElementWriter.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/FileUtils.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/FirstMatchMapper.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/ResourceUtils.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/StringUtils.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/VectorSet.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/bzip2/CBZip2InputStream.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/tar/TarBuffer.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/tar/TarEntry.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/tar/TarOutputStream.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ExtraFieldUtils.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/FallbackZipEncoding.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/NioZipEncoding.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/UnicodePathExtraField.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/UnrecognizedExtraField.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipEncoding.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipEncodingHelper.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipEntry.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipFile.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipLong.java
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipOutputStream.java   (props changed)
    ant/core/branches/ANT_SITE/src/main/org/apache/tools/zip/ZipUtil.java   (props changed)
    ant/core/branches/ANT_SITE/src/script/ant.bat
    ant/core/branches/ANT_SITE/src/script/runant.py
    ant/core/branches/ANT_SITE/src/tests/antunit/antunit-base.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/core/extension-point-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/checksum-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/copy-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/delete-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/exec/apply-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/exec/expected/utf-8   (props changed)
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/exec/input/iso8859-1   (props changed)
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/hostinfo-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/jar-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/move-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/optional/propertyfilelayout-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/property-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/secure-input.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/taskdefs/zip-test.xml
    ant/core/branches/ANT_SITE/src/tests/antunit/types/path-test.xml
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/AntClassLoaderDelegationTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DefaultLoggerTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/launch/LocatorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/ConcatTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/MakeUrlTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SQLExecTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/condition/HttpTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/EchoPropertiesTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/splash/SplashScreenTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/taskdefs/optional/vss/MSVSSTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DateSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DependSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/DOMElementWriterTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/ant/util/LineOrientedOutputStreamTest.java
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/   (props changed)
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java   (contents, props changed)
    ant/core/branches/ANT_SITE/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java   (props changed)
    ant/core/branches/ANT_SITE/xdocs/antlibs/antunit/index.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/bindownload.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/charter.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/compress/index.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/dotnet/index.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/index.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/proper.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/props/index.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/sandbox.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/srcdownload.xml
    ant/core/branches/ANT_SITE/xdocs/antlibs/svn/index.xml
    ant/core/branches/ANT_SITE/xdocs/antnews.xml
    ant/core/branches/ANT_SITE/xdocs/bindownload.xml
    ant/core/branches/ANT_SITE/xdocs/bugs.xml
    ant/core/branches/ANT_SITE/xdocs/bylaws.xml
    ant/core/branches/ANT_SITE/xdocs/external.xml
    ant/core/branches/ANT_SITE/xdocs/faq.xml
    ant/core/branches/ANT_SITE/xdocs/index.xml
    ant/core/branches/ANT_SITE/xdocs/legal.xml
    ant/core/branches/ANT_SITE/xdocs/license.xml
    ant/core/branches/ANT_SITE/xdocs/mail.xml
    ant/core/branches/ANT_SITE/xdocs/mission.xml
    ant/core/branches/ANT_SITE/xdocs/nightlies.xml
    ant/core/branches/ANT_SITE/xdocs/problems.xml
    ant/core/branches/ANT_SITE/xdocs/projects.xml
    ant/core/branches/ANT_SITE/xdocs/projects/index.xml
    ant/core/branches/ANT_SITE/xdocs/projects/ivy.xml
    ant/core/branches/ANT_SITE/xdocs/projects/ivyde.xml
    ant/core/branches/ANT_SITE/xdocs/resources.xml
    ant/core/branches/ANT_SITE/xdocs/srcdownload.xml
    ant/core/branches/ANT_SITE/xdocs/stylesheets/project.xml
    ant/core/branches/ANT_SITE/xdocs/stylesheets/site.vsl
    ant/core/branches/ANT_SITE/xdocs/stylesheets/templates.vm

Propchange: ant/core/branches/ANT_SITE/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 13 18:34:00 2010
@@ -1,15 +1,17 @@
-.ant.properties
-dist
-build
-bootstrap
-distribution
 *.el
 *.ipr
 *.iws
 *.pif
-velocity.log*
-patch.txt
-patch.tar.gz
+.ant.properties
 .classpath
 .project
 apache-ant-1.*
+bootstrap
+build
+dist
+distribution
+java-repository
+patch.tar.gz
+patch.txt
+target
+velocity.log*

Propchange: ant/core/branches/ANT_SITE/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 13 18:34:00 2010
@@ -1 +1 @@
-/ant/core/trunk:904538-939797
+/ant/core/trunk:904538-939797,939803-1045116

Modified: ant/core/branches/ANT_SITE/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/CONTRIBUTORS?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
Binary files - no diff available.

Propchange: ant/core/branches/ANT_SITE/CONTRIBUTORS
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/core/branches/ANT_SITE/CONTRIBUTORS
            ('svn:mime-type' removed)

Modified: ant/core/branches/ANT_SITE/KEYS
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/KEYS?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/KEYS (original)
+++ ant/core/branches/ANT_SITE/KEYS Mon Dec 13 18:34:00 2010
@@ -174,46 +174,6 @@ o+d57fYsNa8xAJ4mLfonZbd64+YY9rfvhIh3Vsl3
 hzSr4vo=
 =lBfF
 -----END PGP PUBLIC KEY BLOCK-----
-pub  1024D/265B4C63 2003-08-18 Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-sig 3       265B4C63 2003-12-06   Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-sig 3       5F6B8B72 2003-12-12   Stefan Bodewig <bodewig@apache.org>
-uid                            Antoine Levy-Lambert (Apache Ant Committer) <antoine@antbuild.com>
-sig 3       265B4C63 2003-08-18   Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-sig 3       5F6B8B72 2003-12-12   Stefan Bodewig <bodewig@apache.org>
-sub  1024g/A3060393 2003-08-18
-sig         265B4C63 2003-08-18   Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.2 (MingW32)
-
-mQGiBD9AzmcRBACMqgb7IFvC/nLxw7mUAgHENeZXY3JOQJ8wVBevIbbMEeFvzHE2
-diFydqUXocPexduYr0ahkf033WvWdAiNqDLfVW/HFOsc1TpjbHkqPUHtJ62Ya5tg
-nH4UGN9BYZfMbfVDOSz41lYwmfK5HYgpZN/sBQBSKf2qgoFB+LxYaae8YwCgrWlu
-fYhf7fkKbbdSf3BGS67ggNkD/0VvkXkw1SEnPaqrkKGkPKomCTb2auGxcYYI3/rP
-1m+SGRf0gE1NtocmIEitiR6WvfKUjoMAXSCp5KdnUXmO9rwzkM002KCA7K5CY+e/
-2bLDuiQ3rNiD4mFfG6M+UnmZ+GMFba1p9Cp4PqLNLsCHz67t7hEsscTZQ8mZ9xKM
-+GCsA/9P+XFM7JDn9MLhYab9qo1CkceBkthUP6jWGjuAZ00elmBCkpkzNv5aIzss
-xih2GpaU/tmcMjw8FGp0dTwzqdpmbZBLjunRnuBTir4m4l5G9rwl4JbfK1PVqk4a
-VKkh9W7/yqBcEfNcsfJO9cqaQ+PzcnCoDiD9UHEBYzUhrCKwhLRCQW50b2luZSBM
-ZXZ5LUxhbWJlcnQgKEFwYWNoZSBBbnQgQ29tbWl0dGVyKSA8YW50b2luZUBhbnRi
-dWlsZC5jb20+iFsEExECABsFAj9AzmcGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ
-hhTWqyZbTGMnOgCeJV2gI+1CIxMR7dcIhXjPkiusreIAn2SGOsPS0o89l0EIVuc9
-J2F03aB+iEYEExECAAYFAj/ZwioACgkQohFa4V9ri3J8CACgiGlh+td0BAnJPq19
-ovEQR2DJ02MAoLP203EF+BLPpykeTcGp8UEWmeGQtEBBbnRvaW5lIExldnktTGFt
-YmVydCAoQXBhY2hlIEFudCBDb21taXR0ZXIpIDxhbnRvaW5lQGFwYWNoZS5vcmc+
-iF4EExECAB4FAj/SSwYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQhhTWqyZb
-TGOh/QCfbrSoipMlizyGT6c8BOPEd9zzfi0AnRRTqTDzXzsGk4CG/BJME9CCm7Ts
-iEYEExECAAYFAj/ZwiMACgkQohFa4V9ri3IOVACgh2QHS1+cVjvM4eLjls1bJwWi
-o5IAoLtAszHrwHS5qrhvr2rtnlyyyV2guQENBD9AzmkQBACNpBfqi2PweozCtxoX
-PqzKdRDKqCw7TOrDR6lbP3z/ov/1SN5Vc0XqNzBSGqwBcmGWtneABkX7n4uzJrC5
-wvX/TZ/DkMvypPyeNVMu+/ZMlzdbx06OUDKr6Fy/NtaI7cN1rw+Igyv22Q8ilhhg
-s/5Rdj84EtJkWQjVRml6wXSAZwADBwP/TqyhOC4sA5YrePYGH8i46h0SU9dXjfEF
-JijC8vXZ+BNQHQVK3fjEXedZL8Zvvp1bsMu7Muz9SMnqygM1unp2NGxLRd/9315p
-Qh0VStYKn0xq13ybOKr0Gsyx5yyl3Nzlu/1qAR0es/zN4jV7/IQi3R2GOvezcpHX
-mkbsYiZAhu2IRgQYEQIABgUCP0DOaQAKCRCGFNarJltMYxcsAKCSJJUABlXYnLBj
-b+WtmAzu0JjZNACdFJ4KIATJDK/5ajFq5+irOpodoHc=
-=UomR
------END PGP PUBLIC KEY BLOCK-----
 
 pub   1024D/5F6B8B72 2001-05-28
 uid                  Stefan Bodewig <bodewig@apache.org>
@@ -1246,3 +1206,193 @@ iNoi9D8jtudc46l1OASP7n9e+WQDCd/IwwsUXHqT
 udvp
 =oSat
 -----END PGP PUBLIC KEY BLOCK-----
+pub   1024D/265B4C63 2003-08-18
+uid                  Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+sig 3        265B4C63 2003-12-06  Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+sig 3        5F6B8B72 2003-12-12  Stefan Bodewig <bodewig@apache.org>
+uid                  Antoine Levy-Lambert (Apache Ant Committer) <antoine@antbuild.com>
+sig 3        265B4C63 2003-08-18  Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+sig 3        5F6B8B72 2003-12-12  Stefan Bodewig <bodewig@apache.org>
+sub   1024g/A3060393 2003-08-18
+sig          265B4C63 2003-08-18  Antoine Levy-Lambert (Apache Ant Committer) <antoine@apache.org>
+
+pub   4096R/710038F5 2010-11-02
+uid                  Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
+sig 3        710038F5 2010-11-02  Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
+sub   4096R/84F32FDC 2010-11-02
+sig          710038F5 2010-11-02  Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
+
+pub   4096R/82A7FBCD 2010-11-02
+uid                  Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
+sig 3        82A7FBCD 2010-11-02  Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
+sig          62B2963F 2010-11-04  Dan Poirier <dan@poirier.us>
+sig          7C408737 2010-11-04  Joseph Edward Bergmark (CODE SIGNING KEY) <bergmark@apache.org>
+sig          02E9F65B 2010-11-04  Luc Maisonobe <Luc.Maisonobe@c-s.fr>
+sig          EFB55DF1 2010-11-05  Luciano Resende (Code Signing Key) <lresende@apache.org>
+sub   4096R/70EC4C9A 2010-11-02
+sig          82A7FBCD 2010-11-02  Antoine Levy-Lambert (CODE SIGNING KEY) <antoine@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.16 (Darwin)
+
+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
+3PimOFurhebU3wOU0wEkNb/3IYLk+MFQOA==
+=1STU
+-----END PGP PUBLIC KEY BLOCK-----

Modified: ant/core/branches/ANT_SITE/ReleaseInstructions
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/ReleaseInstructions?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/ReleaseInstructions (original)
+++ ant/core/branches/ANT_SITE/ReleaseInstructions Mon Dec 13 18:34:00 2010
@@ -70,7 +70,9 @@ Note: This document was updated in the c
 
             * docs/manual/cover.html
             * docs/manual/credits.html
-            * build.xml (version property & manifest-version property)
+            * build.xml properties : project-version & manifest-version 
+            * POM files under src/etc/poms and subdirectories
+            * ivy.xml in release subdirectory
 
         Commit your changes.
 
@@ -83,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).
@@ -228,16 +231,31 @@ 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].
 
       
-      and 
-
-      from java-repository/org/apache/ant
+    * upload the maven artifacts located under java-repository/org/apache/ant
+      these artifacts comprise currently for each ant jar of one POM file, the corresponding jar file
+      and the corresponding GPG signatures (x.pom, x.jar, x.pom.asc, x.jar.asc)
+      MD5 and SHA1 are generated by ivy during the upload
 
       to  
 
-      /www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/ant
+      https://repository.apache.org (nexus repository)
+
+      using the build file release/upload.xml
+      
+      ant -Dupload.user=foo -Dupload.password=secret -lib location_of_ivy_jar -f upload.xml      
+
+    *  after the upload, you need to access the web interface of nexus under https://repository.apache.org
+       login using your Apache credentials
+       select the Staging enterprise repository
+       expand org.apache.ant 
+       right click the upload that you just did
+       select the context menu entry "Close"
+       once this is done, you have to again select your upload in the web interface,
+       right click, and select the menu entry promote.
+       4 hours later, the artefacts will be in the maven central repository.
       
 
     * remove the symbolic links from /www/www.apache.org/dist/ant.
@@ -263,7 +281,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.
 
     (+)
@@ -284,8 +302,7 @@ Note: This document was updated in the c
     Announce release at freshmeat.net
     (Stefan Bodewig is the owner of Ant's project entry - bug him ;-).
 
-    Announce release in the usenet groups comp.lang.java.softwaretools
-    and comp.lang.java.announce.
+    Announce release in the usenet group comp.lang.java.softwaretools .
 
 24. Add a new release tag to doap_Ant.rdf in Ant's trunk.
 
@@ -297,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.

Modified: ant/core/branches/ANT_SITE/STATUS
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/STATUS?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/STATUS (original)
+++ ant/core/branches/ANT_SITE/STATUS Mon Dec 13 18:34:00 2010
@@ -1,11 +1,10 @@
 Apache Ant Status
-Last modified at 2007-08-03
+Last modified at 2010-07-20
 
 Release:
-    Current:        1.7.0  (in SVN ANT_17_BRANCH)
+    Current:        1.8.1  (in SVN Tag: ANT_181)
     Maintenance:    -
-    Development:    1.7.1  (in SVN ANT_17_BRANCH)
-                    1.8    (in SVN HEAD)
+    Development:    1.8.2  (in SVN Branch: trunk)
 
 Assets:
     DNS:                ant.apache.org
@@ -16,6 +15,7 @@ Assets:
     Web site:           http://ant.apache.org/
 
     Repositories:       ant
+    Module:             core
 
 PMC Members
  see http://ant.apache.org/contributors.html

Modified: ant/core/branches/ANT_SITE/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/WHATSNEW?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/WHATSNEW (original)
+++ ant/core/branches/ANT_SITE/WHATSNEW Mon Dec 13 18:34:00 2010
@@ -1,9 +1,301 @@
-Changes from Ant 1.8.0 TO current SVN version
+Changes from Ant 1.8.1 TO current SVN version
 =============================================
 
 Changes that could break older environments:
 -------------------------------------------
 
+ * Prior to Ant 1.8.0 the <copy> task and several other tasks would
+   overwrite read-only destination files.  Starting with 1.8.0 they
+   would only do so under special circumstances.  Ant 1.8.2 now
+   consistently won't replace a read-only file by default. The same is
+   true for a number of other tasks.
+   The <copy>, <move> and <echo> tasks now have a new force attribute
+   and <concat> has a new forceReadonly attribute that can be used to
+   make the task overwrite read-only destinations.
+   Bugzilla Report 49261.
+
+ * 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.
+   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.
+   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
+   now String arrays of length 3 rather than 2 in order to support the
+   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.
+
+ * The files and directories used by Git, Mercurial and Bazaar to
+   store their information are now excluded by the defaultexcludes.
+   Bugzilla Report 49624.
+
+ * The <junit> task no longer generates TestListener events - which
+   have been introduced in ant 1.7.0 - by default.  The task has a new
+   attribute enableTestListenerEvents and a new "magic" property
+   ant.junit.enabletestlistenerevents has been added that can be used
+   to reinstate the old behavior.
+
+Fixed bugs:
+-----------
+
+ * hostinfo now prefers addresses with a hostname over addresses without 
+   a hostname, provided the addresses have the same scope.
+   For local lookup, no IP address will be put in NAME / DOMAIN anymore.
+   For remote lookup, if a host name was provided and only an IP address is 
+   found, the IP address will no longer overwrite the host name provided to the
+   task.
+   Bugzilla Report 49513
+
+ * mmap-based file copy problems under JDK 1.4 on Linux.
+   Bugzilla Report 49430.
+
+ * The Sun JVM tries to mmap the entire file during a copy. 
+   For large files this is not feasible. 
+   We now explicitly request to copy at most 16 MiB per request.
+   Bugzilla Report 49326.
+   
+ * DemuxInputStream.read() should return unsigned values
+   Bugzilla Report 49279.
+
+ * The MIME mailer ignored the port parameter when using SSL.
+   Bugzilla Report 49267.
+
+ * <xslt> ignored the classpath when using the default TraX processor.
+   Bugzilla Report 49271.
+
+ * <checksum>'s totalproperty only worked reliably if the same file
+   name didn't occur inside more than one directory.
+   Bugzilla Report 36748.
+
+ * <ftp> could fail to download files from remote subdirectories under
+   certain circumstances.
+   Bugzilla Report 49296.
+
+ * <junit> will now produce better diagnostics when it fails to delete
+   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 wrong results but degraded performance of the scan
+   itself.
+   Bugzilla Report 49420.
+
+ * <javac> failed for long command lines on OS/2.
+   Bugzilla Report 49425.
+
+ * <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.
+
+ * The <restrict> resource collection was checking every resource even if
+   we actually just want the first one, like in the example of use of
+   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.
+
+ * 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.
+
+ * <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.
+
+ * <jar filesetmanifest="merge"> didn't work for manifests added via
+   <zipfileset>s 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.
+
+ * If forked, after finished <java> was still reading the input stream
+   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.
+
+ * Project#setDefault threw an exception when null was passed in as
+   argument, even though the javadoc says, null is a valid value.
+   Bugzilla Report 49803.
+
+ * runant.py would swallow the first argument if CLASSPATH wasn't set.
+   Bugzilla Report 49963.
+
+ * <taskdef> failed to load resources from jar files contained in a
+   directory that has a "!" in its name.
+   Bugzilla Report 50007.
+
+ * ant.bat exit strategy improvements and issues
+   make the exit codes work in environments where 4NT or MKS are installed
+   Bugzilla Report 41039.
+
+ * <signjar> would fail if used via its Java API and the File passed
+   into the setJar method was not "normalized" (i.e. contained ".."
+   segments).
+   Bugzilla Report 50081.
+
+ * <delete> ignored <fileset>'s errorOnMissingDir attribute
+   Bugzilla Report 50124.
+
+ * <symlink> failed to close files when reading a list of symbolic
+   links from a properties file.
+   Bugzilla Report 50136.
+
+ * <parallel> could allow tasks to start executing even if a task
+   scheduled to run before them timed out.
+   Bugzilla Report 49527.
+
+ * If a <junit> batch with multiple tests times out Ant logs a message
+   about a test named Batch-With-Multiple-Tests since 1.8.0 but the
+   logic that determined the Java package of this pseudo-test has been
+   wrong.
+   Bugzilla Report 45227.
+
+ * <propertyfile> didn't preserve the original linefeed style when
+   updating a file.
+   Bugzilla Report 50049.
+
+ * <zip>'s whenEmpty behavior never consulted the non-fileset
+   resources so the task could fail even though resources have been
+   provided using non-fileset resource collections.
+   Bugzilla Issue 50115.
+
+*  ftp chmod could throw a NPE.
+   Bugzilla report 50217.
+
+*  The project help (-p option in the command line) will now print
+   the dependencies of the targets in debug mode (-d on the command
+   line)
+
+Other changes:
+--------------
+
+ * <concat>'s force attribute has been deprecated in favor of a new
+   overwrite attribute that is consistent with <copy>'s attribute
+   names.
+
+ * 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 now get resolved against other properties that are
+   defined before the project starts executing (those from the same or
+   earlier -propertfiles or defined via the -D option).
+   Bugzilla Report 18732.
+
+ * <pathelement>s 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.
+
+ * 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.   
+
+ * 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.
+
+ * ProjectHelpers can now be installed dynamically via the <projecthelper>
+   Ant task.
+
+ * <import> is now able to switch to the proper ProjectHelper to parse
+   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.
+
+ * The <linecontainsregexp> filter now supports a casesensitive
+   attribute.
+
+ * The <containsregexp> selector now supports casesensitive, multiline
+   and singleline attributes.
+   Bugzilla Report 49764.
+
+ * A new <cutdirsmapper> can be used like wget's --cut-dirs option to
+   strip leading directories from file names.
+
+ * <javah> now supports the GNU project's gcjh compiler.
+   Bugzilla Report 50149.
+
+ * <checksum> supports additional views of a file's path as elements
+   for a custom pattern.
+   Bugzilla Report 50114.
+
+ * JUnit XMLResultAggregator logs the stack trace of caught IO exceptions
+   in verbose runs.
+   Bugzilla Report 48836.
+
+ * StringUtils.parseHumanSizes() should turn parse failures into
+   BuildExceptions.
+   Bugzilla Report 48835.
+
+ * New task <bindtargets> to make a list of targets bound to some
+   specified extension point.
+
+ * Initial support for OpenJDK7 has been added.
+
+ * Ant now uses java.net.CookieStore rather than
+   java.util.ServiceLocator to detect whether the environment is a
+   Java 1.6 system.  This means releases of gcj/gij at the time of
+   this release of Ant are detected as Java 1.5 and not 1.6.
+   Bugzilla Report 50256.
+
+ * It is now possible to write a compiler adapter for <javac> that
+   compiles sources with extensions other than .java (but that still
+   compile to .class files).
+   Bugzilla Report 48829.
+
+ * The performance of VectorSet#add(Object) has been improved which
+   should also benefit any operation that scans directories in Ant.
+   Bugzilla Report 50200.
+
+Changes from Ant 1.8.0 TO Ant 1.8.1 
+===================================
+
+Changes that could break older environments:
+-------------------------------------------
+
  * ant-trax.jar is no longer produced since TrAX is included in JDK 1.4+.
 
  * Ant no longer ships with Apache Xerces-J or the XML APIs but relies

Modified: ant/core/branches/ANT_SITE/build.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/build.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/build.xml (original)
+++ ant/core/branches/ANT_SITE/build.xml Mon Dec 13 18:34:00 2010
@@ -34,17 +34,16 @@
   <property name="name" value="ant"/>
   <!-- this is the groupId of ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
-  <property name="project.version" value="1.8.1alpha"/>
+  <property name="project.version" value="1.8.2alpha"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
-  <property name="pom.version" value="1.8.1-SNAPSHOT"/>
-  <property name="manifest-version" value="1.8.1"/>
+  <property name="pom.version" value="1.8.2-SNAPSHOT"/>
+  <property name="manifest-version" value="1.8.2"/>
   <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>
   <property name="taskdefs.package" value="${ant.package}/taskdefs"/>
   <property name="condition.package" value="${taskdefs.package}/condition"/>
   <property name="optional.package" value="${taskdefs.package}/optional"/>
-  <property name="optional.condition.package" value="${optional.package}/condition"/>
   <property name="type.package" value="${ant.package}/types"/>
   <property name="optional.type.package" value="${type.package}/optional"/>
   <property name="apache.resolver.type.package" value="${ant.package}/types/resolver"/>
@@ -104,10 +103,10 @@
   <property name="optimize" value="true"/>
   <property name="javac.target" value="1.4"/>
   <property name="javac.source" value="1.4"/>
-  <property name="junit.fork" value="false"/>
   <property name="junit.filtertrace" value="off"/>
   <property name="junit.summary" value="no"/>
   <property name="test.haltonfailure" value="false"/>
+  <property name="junit.fork" value="true"/>
   <property name="junit.forkmode" value="once"/>
   <property name="expandproperty.files"
             value="**/version.txt,**/defaultManifest.mf"/>
@@ -125,6 +124,10 @@
 
   <path id="tests-classpath">
     <pathelement location="${build.classes}"/>
+    <path refid="classpath"/>
+  </path>
+  <path id="tests-runtime-classpath">
+    <path refid="tests-classpath"/>
     <pathelement location="${build.tests}"/>
     <!--
         include the test source and test data dirs
@@ -132,13 +135,10 @@
      -->
     <pathelement location="${src.junit}"/>
     <pathelement location="${tests.etc.dir}"/>
-    <path refid="classpath"/>
+    <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
+    <pathelement location="${java.home}/../lib/tools.jar"/>
   </path>
 
-  <!-- turn this path into a string which is passed to the tests -->
-  <property name="tests-classpath.value"
-    refid="tests-classpath"/>
-
   <!--
         ===================================================================
           Set up properties for the distribution area
@@ -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"/>
@@ -172,7 +173,7 @@
   <selector id="needs.jdk1.5+">
     <or>
       <filename name="${taskdefs.package}/AptTest*"/>
-      <filename name="${util.package}/java15/*"/>
+      <filename name="${util.package}/java15/"/>
       <filename name="${ant.package}/loader/*5*"/>
     </or>
   </selector>
@@ -186,11 +187,20 @@
   </selector>
 
   <selector id="needs.apache-resolver">
-    <filename name="${apache.resolver.type.package}/**"/>
+    <filename name="${apache.resolver.type.package}/"/>
   </selector>
 
   <selector id="needs.junit">
-    <filename name="${optional.package}/junit/**"/>
+    <and>
+      <filename name="${optional.package}/junit/"/>
+      <not>
+        <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
+      </not>
+    </and>
+  </selector>
+
+  <selector id="needs.junit4">
+    <filename name="${optional.package}/junit/JUnit4TestMethodAdapter*"/>
   </selector>
 
   <selector id="needs.apache-regexp">
@@ -200,14 +210,14 @@
   <selector id="needs.apache-oro">
     <or>
       <filename name="${regexp.package}/JakartaOro*"/>
-      <filename name="${optional.package}/perforce/*"/>
+      <filename name="${optional.package}/perforce/"/>
     </or>
   </selector>
 
   <selector id="needs.apache-bcel">
     <or>
       <filename name="${ant.package}/filters/util/JavaClassHelper*"/>
-      <filename name="${util.package}/depend/bcel/*"/>
+      <filename name="${util.package}/depend/bcel/"/>
       <filename name="${optional.type.package}/depend/ClassFileSetTest*"/>
     </or>
   </selector>
@@ -250,26 +260,26 @@
   </selector>
 
   <selector id="needs.jmf">
-    <filename name="${optional.package}/sound/*"/>
+    <filename name="${optional.package}/sound/"/>
   </selector>
 
   <selector id="needs.jai">
     <or>
-      <filename name="${optional.package}/image/*"/>
-      <filename name="${optional.type.package}/image/*"/>
+      <filename name="${optional.package}/image/"/>
+      <filename name="${optional.type.package}/image/"/>
     </or>
   </selector>
 
   <selector id="needs.jdepend">
-    <filename name="${optional.package}/jdepend/*"/>
+    <filename name="${optional.package}/jdepend/"/>
   </selector>
 
   <selector id="needs.swing">
-    <filename name="${optional.package}/splash/*"/>
+    <filename name="${optional.package}/splash/"/>
   </selector>
 
   <selector id="needs.jsch">
-    <filename name="${optional.package}/ssh/*"/>
+    <filename name="${optional.package}/ssh/"/>
   </selector>
 
   <!-- needs TraceListenerEx3 interface implemented by PrintTraceListener -->
@@ -278,7 +288,7 @@
   </selector>
 
   <selector id="ant.launcher">
-    <filename name="${ant.package}/launch/**/*"/>
+    <filename name="${ant.package}/launch/"/>
   </selector>
 
   <patternset id="onlinetests">
@@ -334,74 +344,92 @@
        ===================================================================
   -->
   <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="jdk1.6+" classname="java.net.CookieStore"/>
+    <available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
     <available property="kaffe" classname="kaffe.util.NotImplemented"/>
+    <available property="harmony"
+               classname="org.apache.harmony.luni.util.Base64"/>
     <available property="bsf.present"
       classname="org.apache.bsf.BSFManager"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="netrexx.present"
       classname="netrexx.lang.Rexx"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="apache.resolver.present"
       classname="org.apache.xml.resolver.tools.CatalogResolver"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="recent.xalan2.present"
       classname="org.apache.xalan.trace.TraceListenerEx3"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="junit.present"
       classname="junit.framework.TestCase"
-      classpathref="classpath"/>
+      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="${ignoresystemclasses}"/>
+      </and>
+    </condition>
     <available property="antunit.present"
       classname="org.apache.ant.antunit.AntUnit"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="commons.net.present"
       classname="org.apache.commons.net.ftp.FTPClient"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="antlr.present" 
       classname="antlr.Tool" 
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="apache.regexp.present"
       classname="org.apache.regexp.RE"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="apache.oro.present"
       classname="org.apache.oro.text.regex.Perl5Matcher"
-      classpathref="classpath"/>
+      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"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="jdepend.present"
       classname="jdepend.framework.JDepend"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="log4j.present"
       classname="org.apache.log4j.Logger"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="commons.logging.present"
       classname="org.apache.commons.logging.LogFactory"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="xalan.envcheck"
       classname="org.apache.xalan.xslt.EnvironmentCheck"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="which.present"
       classname="org.apache.env.Which"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
 
     <available property="xerces.present"
       classname="org.apache.xerces.parsers.SAXParser"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="bcel.present"
       classname="org.apache.bcel.Constants"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
 
     <condition property="javamail.complete">
       <and>
         <available classname="javax.activation.DataHandler"
           classpathref="classpath"/>
         <available classname="javax.mail.Transport"
-          classpathref="classpath"/>
+          classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
       </and>
     </condition>
 
@@ -455,23 +483,23 @@
       <and>
         <available
           classname="org.apache.commons.httpclient.HttpClient"
-          classpathref="classpath"/>
+          classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
         <isset property="commons.logging.present"/>
       </and>
     </condition>
 
     <available property="rhino.present"
       classname="org.mozilla.javascript.Scriptable"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="beanshell.present"
       classname="bsh.StringUtil"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="xerces1.present"
       classname="org.apache.xerces.framework.XMLParser"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="jsch.present"
       classname="com.jcraft.jsch.Session"
-      classpathref="classpath"/>
+      classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
 
     <property name="build.compiler" value="modern"/>
 
@@ -532,6 +560,7 @@
 
             <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
             <selector refid="needs.junit" unless="junit.present"/>
+            <selector refid="needs.junit4" unless="junit4.present"/>
             <selector refid="needs.apache-regexp"
               unless="apache.regexp.present"/>
             <selector refid="needs.apache-oro" unless="apache.oro.present"/>
@@ -639,24 +668,29 @@
       manifest="${manifest}"
       whenmanifestonly="fail">
       <not>
-        <selector id="non-core">
-          <or>
-            <filename name="${optional.package}/**"/>
-            <filename name="${optional.type.package}/**"/>
-            <filename name="${util.package}/depend/**"/>
-            <filename name="${util.package}/optional/**"/>
-            <selector refid="needs.apache-log4j"/>
-            <selector refid="needs.commons-logging"/>
-            <selector refid="needs.apache-bcel"/>
-            <selector refid="needs.apache-bsf"/>
-            <selector refid="needs.apache-regexp"/>
-            <selector refid="needs.apache-resolver"/>
-            <selector refid="needs.apache-oro"/>
-            <selector refid="needs.jdk1.5+"/>
-            <selector refid="needs.javamail"/>
-            <selector refid="ant.launcher"/>
-          </or>
-        </selector>
+        <or>
+          <!-- Verification: (cd dist/lib; for j in *.jar; do jar tf $j; done) | egrep -v '/$|META-INF/MANIFEST\.MF' | sort | uniq -d -->
+          <selector refid="needs.antlr"/>
+          <selector refid="needs.apache-bcel"/>
+          <selector refid="needs.apache-bsf"/>
+          <selector refid="needs.apache-log4j"/>
+          <selector refid="needs.apache-oro"/>
+          <selector refid="needs.apache-regexp"/>
+          <selector refid="needs.apache-resolver"/>
+          <selector refid="needs.apache-xalan2"/>
+          <selector refid="needs.commons-logging"/>
+          <selector refid="needs.commons-net"/>
+          <selector refid="needs.jai"/>
+          <selector refid="needs.javamail"/>
+          <selector refid="needs.jdepend"/>
+          <selector refid="needs.jmf"/>
+          <selector refid="needs.jsch"/>
+          <selector refid="needs.junit"/>
+          <selector refid="needs.junit4"/>
+          <selector refid="needs.netrexx"/>
+          <selector refid="needs.swing"/>
+          <selector refid="ant.launcher"/>
+        </or>
       </not>
       <metainf dir="${build.dir}">
         <include name="LICENSE.txt"/>
@@ -702,42 +736,6 @@
       </manifest>
     </jar>
 
-    <jar destfile="${build.lib}/ant-nodeps.jar"
-      basedir="${build.classes}"
-      manifest="${manifest.tmp}"
-      whenmanifestonly="${optional.jars.whenmanifestonly}">
-      <and>
-        <selector refid="non-core"/>
-        <not>
-          <or>
-            <selector refid="ant.launcher"/>
-            <selector refid="needs.apache-resolver"/>
-            <selector refid="needs.junit"/>
-            <selector refid="needs.apache-regexp"/>
-            <selector refid="needs.apache-oro"/>
-            <selector refid="needs.apache-bcel"/>
-            <selector refid="needs.apache-log4j"/>
-            <selector refid="needs.commons-logging"/>
-            <selector refid="needs.apache-bsf"/>
-            <selector refid="needs.javamail"/>
-            <selector refid="needs.netrexx"/>
-            <selector refid="needs.commons-net"/>
-            <selector refid="needs.antlr"/>
-            <selector refid="needs.jmf"/>
-            <selector refid="needs.jai"/>
-            <selector refid="needs.jdepend"/>
-            <selector refid="needs.swing"/>
-            <selector refid="needs.jsch"/>
-            <selector refid="needs.apache-xalan2"/>
-          </or>
-        </not>
-      </and>
-      <metainf dir="${build.dir}">
-        <include name="LICENSE.txt"/>
-        <include name="NOTICE.txt"/>
-      </metainf>
-    </jar>
-
     <macrodef name="optional-jar">
       <attribute name="dep"/>
       <sequential>
@@ -752,6 +750,7 @@
 
     <optional-jar dep="apache-resolver"/>
     <optional-jar dep="junit"/>
+    <optional-jar dep="junit4"/>
     <optional-jar dep="apache-regexp"/>
     <optional-jar dep="apache-oro"/>
     <optional-jar dep="apache-bcel"/>
@@ -849,7 +848,7 @@
     </antcall>
   </target>
 
-  <target name="dist_javadocs" depends="javadocs">
+  <target name="dist_javadocs" depends="javadocs" if="jdk1.5+">
     <mkdir dir="${dist.javadocs}"/>
     <copy todir="${dist.javadocs}" overwrite="true">
       <fileset dir="${build.javadocs}"/>
@@ -1017,7 +1016,7 @@
 
     <copy todir="${src.dist.docs}">
       <fileset dir="${docs.dir}">
-        <exclude name="manual/api/**"/>
+        <exclude name="manual/api/"/>
         <patternset refid="site.excludes"/>
       </fileset>
     </copy>
@@ -1085,6 +1084,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}"/>
@@ -1097,7 +1097,7 @@
         <include name="${dist.name}/bin/*.py"/>
       </zipfileset>
       <fileset dir="${dist.name}/..">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bin/ant"/>
         <exclude name="${dist.name}/bin/antRun"/>
         <exclude name="${dist.name}/bin/*.pl"/>
@@ -1117,7 +1117,7 @@
         <include name="${dist.name}/bin/*.py"/>
       </tarfileset>
       <tarfileset dir="${dist.name}/.." username="ant" group="ant">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bin/ant"/>
         <exclude name="${dist.name}/bin/antRun"/>
         <exclude name="${dist.name}/bin/*.pl"/>
@@ -1147,11 +1147,32 @@
     <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}/">
-        <include name="**/*"/>
+        <exclude name="**/*.asc"/>
+        <exclude name="**/*.md5"/>
+        <exclude name="**/*.sha1"/>
+        <exclude name="**/*.sha512"/>
+      </fileset>
+      <fileset dir="${dist.base.manual}/">
         <exclude name="**/*.asc"/>
         <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
@@ -1168,7 +1189,7 @@
         <include name="${dist.name}/build.sh"/>
       </zipfileset>
       <fileset dir="${dist.name}/..">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bootstrap.sh"/>
         <exclude name="${dist.name}/build.sh"/>
       </fileset>
@@ -1183,7 +1204,7 @@
         <include name="${dist.name}/build.sh"/>
       </tarfileset>
       <tarfileset dir="${dist.name}/.." username="ant" group="ant">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bootstrap.sh"/>
         <exclude name="${dist.name}/build.sh"/>
       </tarfileset>
@@ -1196,7 +1217,6 @@
     <delete dir="${dist.name}"/>
     <checksums>
       <fileset dir="${dist.base.source}/">
-        <include name="**/*"/>
         <exclude name="**/*.asc"/>
         <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
@@ -1527,6 +1547,7 @@ see ${build.junit.reports} / ${antunit.r
         <property name="test.junit.vmargs" value=""/>
         <property name="ant.junit.failureCollector"
                   value="${junit.collector.dir}/${junit.collector.class}"/>
+        <!-- XXX includeantruntime="false" does not solve "multiple versions of ant detected in path for junit" warning -->
         <junit printsummary="${junit.summary}"
                haltonfailure="${test.haltonfailure}"
                fork="${junit.fork}"
@@ -1539,13 +1560,13 @@ see ${build.junit.reports} / ${antunit.r
           <sysproperty key="build.tests.value" value="${build.tests.value}"/>
           <sysproperty key="offline" value="${offline}"/>
           <sysproperty key="tests-classpath.value"
-                       value="${tests-classpath.value}"/>
+                       value="${toString:tests-runtime-classpath}"/>
           <sysproperty key="root" file="${basedir}"/>
           <sysproperty key="build.compiler" value="${build.compiler}"/>
           <sysproperty key="tests.and.ant.share.classloader"
                        value="${tests.and.ant.share.classloader}"/>
           <classpath>
-            <path refid="tests-classpath"/>
+            <path refid="tests-runtime-classpath"/>
             <pathelement location="${junit.collector.dir}"/>
             <!-- FIXME: remove failure collector build code for the moment
                  <path refid="failure.cp"/> 
@@ -1581,7 +1602,7 @@ see ${build.junit.reports} / ${antunit.r
     </condition>
 
     <condition property="junit.testcase" value="${testcase}">
-      <available classname="${testcase}" classpathref="tests-classpath" />
+      <available classname="${testcase}" classpathref="tests-runtime-classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     </condition>
 
     <fail>Cannot locate test ${testcase}
@@ -1674,7 +1695,7 @@ see ${build.junit.reports} / ${antunit.r
           <exclude name="${ant.package}/types/selectors/BaseSelectorTest.java"/>
 
           <!-- helper classes, not testcases -->
-          <exclude name="org/example/**"/>
+          <exclude name="org/example/"/>
           <exclude name="${taskdefs.package}/TaskdefTest*Task.java"/>
           <exclude name="${optional.package}/junit/TestFormatter.java"/>
 
@@ -1797,7 +1818,7 @@ see ${build.junit.reports} / ${antunit.r
   <target name="interactive-tests" description="--> runs interactive tests"
     depends="compile-tests"
     >
-    <java classpathref="tests-classpath"
+    <java classpathref="tests-runtime-classpath"
       classname="org.apache.tools.ant.taskdefs.TestProcess"
       fork="true"/>
   </target>

Modified: ant/core/branches/ANT_SITE/check.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/check.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/check.xml (original)
+++ ant/core/branches/ANT_SITE/check.xml Mon Dec 13 18:34:00 2010
@@ -52,7 +52,7 @@
   
   <!-- Findbugs: Getting Findbugs -->
   <property name="findbugs.download.name" 
-            value="findbugs-1.3.5"
+            value="findbugs-1.3.9"
             description="Name of the download file without suffix. Also the internal root directory of the ZIP."/>
   <property name="findbugs.download.file" 
             value="${findbugs.download.name}.zip"
@@ -92,13 +92,13 @@
             value="${rat.report.dir}/report.html"
             description="RAT-Report file"/>
   <property name="rat.version"
-            value="0.6"
+            value="0.7"
             description="Which Version of RAT to use"/>
 
 
 
   <target name="init-ivy">
-    <property name="ivy.version"  value="2.0.0-beta1"/>
+    <property name="ivy.version"  value="2.2.0"/>
     <property name="ivy.jar.url"  value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
     <property name="ivy.jar.dir"  value="${build.dir}/ivy"/>
     <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
@@ -111,7 +111,7 @@
   </target>
 
   <target name="checkstyle" description="--> checks Ant codebase according to ${config.dir}/checkstyle-config" depends="init-ivy">
-    <ivy:cachepath organisation="checkstyle" module="checkstyle" revision="4.3"
+    <ivy:cachepath organisation="checkstyle" module="checkstyle" revision="4.4"
                    inline="true" conf="default" pathid="checkstyle.classpath" transitive="true"/>
     <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath" />
     <mkdir dir="${checkstyle.reportdir}"/>

Modified: ant/core/branches/ANT_SITE/contributors.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_SITE/contributors.xml?rev=1045279&r1=1045278&r2=1045279&view=diff
==============================================================================
--- ant/core/branches/ANT_SITE/contributors.xml (original)
+++ ant/core/branches/ANT_SITE/contributors.xml Mon Dec 13 18:34:00 2010
@@ -72,6 +72,10 @@
   </name>
   <name>
     <first>Andrew</first>
+    <last>Eisenberg</last>
+  </name>
+  <name>
+    <first>Andrew</first>
     <last>Everitt</last>
   </name>
   <name>
@@ -157,6 +161,10 @@
     <last>Dutkowski</last>
   </name>
   <name>
+    <first>Bernhard</first>
+    <last>Rosenkraenzer</last>
+  </name>
+  <name>
     <first>Brad</first>
     <last>Clark</last>
   </name>
@@ -304,6 +312,10 @@
     <last>Ferrin</last>
   </name>
   <name>
+    <first>Danny</first>
+    <last>Yates</last>
+  </name>
+  <name>
     <first>Dante</first>
     <last>Briones</last>
   </name>
@@ -370,6 +382,11 @@
     <last>Slager</last>
   </name>
   <name>
+    <first>Devon</first>
+    <middle>C.</middle>
+    <last>Miller</last>
+  </name>
+  <name>
     <first>Diane</first>
     <last>Holt</last>
   </name>
@@ -378,6 +395,11 @@
     <last>Gillard</last>
   </name>
   <name>
+    <first>Dmitry</first>
+    <middle>A.</middle>
+    <last>Kuminov</last>
+  </name>
+  <name>
     <first>Dominique</first>
     <last>Devienne</last>
   </name>
@@ -729,6 +751,11 @@
   </name>
   <name>
     <first>Kevin</first>
+    <middle>Connor</middle>
+    <last>Arpe</last>
+  </name>
+  <name>
+    <first>Kevin</first>
     <last>Greiner</last>
   </name>
   <name>
@@ -805,6 +832,10 @@
   </name>
   <name>
     <first>Mark</first>
+    <last>DeLaFranier</last>
+  </name>
+  <name>
+    <first>Mark</first>
     <last>Hecker</last>
   </name>
   <name>
@@ -1441,4 +1472,8 @@
     <first>Zdenek</first>
     <last>Wagner</last>
   </name>
+  <name>
+    <first/>
+    <last>riasol</last>
+  </name>
 </contributors>



Mime
View raw message