You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/01 15:59:40 UTC
svn commit: r739771 [1/10] - in /maven/components/branches/MNG-3932: ./
apache-maven/ apache-maven/src/ apache-maven/src/.cd/ apache-maven/src/bin/
apache-maven/src/conf/ apache-maven/src/main/
apache-maven/src/main/assembly/ apache-maven/src/site/ apa...
Author: jvanzyl
Date: Sun Feb 1 14:59:32 2009
New Revision: 739771
URL: http://svn.apache.org/viewvc?rev=739771&view=rev
Log:
o merging from trunk
Added:
maven/components/branches/MNG-3932/apache-maven/ (with props)
maven/components/branches/MNG-3932/apache-maven/LICENSE.txt
maven/components/branches/MNG-3932/apache-maven/NOTICE.txt
maven/components/branches/MNG-3932/apache-maven/README.txt
maven/components/branches/MNG-3932/apache-maven/pom.xml
maven/components/branches/MNG-3932/apache-maven/src/
maven/components/branches/MNG-3932/apache-maven/src/.cd/
maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd
maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl
maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven.cd
maven/components/branches/MNG-3932/apache-maven/src/bin/
maven/components/branches/MNG-3932/apache-maven/src/bin/m2.conf
maven/components/branches/MNG-3932/apache-maven/src/bin/mvn
maven/components/branches/MNG-3932/apache-maven/src/bin/mvn.bat
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnDebug
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnDebug.bat
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnUpdate
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnUpdate.bat
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnr
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnr.rb
maven/components/branches/MNG-3932/apache-maven/src/bin/mvnyjp
maven/components/branches/MNG-3932/apache-maven/src/conf/
maven/components/branches/MNG-3932/apache-maven/src/conf/settings.xml
maven/components/branches/MNG-3932/apache-maven/src/main/
maven/components/branches/MNG-3932/apache-maven/src/main/assembly/
maven/components/branches/MNG-3932/apache-maven/src/main/assembly/bin.xml
maven/components/branches/MNG-3932/apache-maven/src/site/
maven/components/branches/MNG-3932/apache-maven/src/site/site.xml
maven/components/branches/MNG-3932/apache-maven/src/test/ (with props)
maven/components/branches/MNG-3932/apache-maven/src/test/java/ (with props)
maven/components/branches/MNG-3932/apache-maven/src/test/java/org/ (with props)
maven/components/branches/MNG-3932/apache-maven/src/test/java/org/apache/ (with props)
maven/components/branches/MNG-3932/apache-maven/src/test/java/org/apache/maven/ (with props)
maven/components/branches/MNG-3932/apache-maven/src/test/java/org/apache/maven/settings/ (with props)
maven/components/branches/MNG-3932/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
maven/components/branches/MNG-3932/build-mercury.xml
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/settings/
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/settings/RuntimeInfo.java
maven/components/branches/MNG-3932/maven-mercury/src/test/
maven/components/branches/MNG-3932/maven-mercury/src/test/java/
maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/
maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/
maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/
maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/mercury/
maven/components/branches/MNG-3932/maven-mercury/src/test/java/org/apache/maven/mercury/MavenDependencyProcessorTest.java
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/apache/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/apache/4/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/apache/4/apache-4.pom
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/apache/maven-metadata.xml
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/maven-parent/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/maven-parent/7/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/maven-parent/7/maven-parent-7.pom
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/maven-parent/maven-metadata.xml
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-dependency-plugin/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-dependency-plugin/2.0/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.jar
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-metadata.xml
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-dependency-plugin/maven-metadata.xml
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-plugins/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-plugins/10/
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom
maven/components/branches/MNG-3932/maven-mercury/src/test/resources/repo/org/apache/maven/plugins/maven-plugins/maven-metadata.xml
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/AlwaysJoinModelContainerFactory.java
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules/
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules/DependencyRule.java
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/rules/ExecutionRule.java
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/rules/
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/rules/ExecutionRuleTest.java
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/basedir-aligned-interpolation/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/basedir-interpolation/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/config-with-plugin-mng/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/config-with-plugin-mng/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/consecutive_empty_elements/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependencies-different-versions/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependencies-different-versions/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/sub/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/sub/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/foo/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/join-different-containers-same-id/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/multiple-repos/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/multiple-repos/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/multiple-repos/sub/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/multiple-repos/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/nested-build-dir-interpolation/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/platform-file-separator/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/platform-file-separator/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-append/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-append/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-append/subproject/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-merging/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-merging/child/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-merging/child/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-merging/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-config-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/ (with props)
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml
maven/components/branches/MNG-3932/rules.txt
Removed:
maven/components/branches/MNG-3932/maven-distribution/
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/user/
maven/components/branches/MNG-3932/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
maven/components/branches/MNG-3932/maven-project-spec.cfl
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/build/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/nexus/
maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-test-poms/
Modified:
maven/components/branches/MNG-3932/ (props changed)
maven/components/branches/MNG-3932/build.xml
maven/components/branches/MNG-3932/maven-compat/compatibility.cfl
maven/components/branches/MNG-3932/maven-compat/pom.xml (contents, props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java (props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java (props changed)
maven/components/branches/MNG-3932/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
maven/components/branches/MNG-3932/maven-compat/src/main/mdo/metadata.mdo (props changed)
maven/components/branches/MNG-3932/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
maven/components/branches/MNG-3932/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml (props changed)
maven/components/branches/MNG-3932/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.xml (props changed)
maven/components/branches/MNG-3932/maven-core/pom.xml
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/DefaultMavenModelEventProcessor.java (props changed)
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java (props changed)
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventProcessor.java (props changed)
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-3932/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/branches/MNG-3932/maven-core/src/main/mdo/settings.mdo
maven/components/branches/MNG-3932/maven-core/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java (props changed)
maven/components/branches/MNG-3932/maven-embedder/pom.xml
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
maven/components/branches/MNG-3932/maven-embedder/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-embedder/src/test/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulatorTest.java
maven/components/branches/MNG-3932/maven-lifecycle/pom.xml
maven/components/branches/MNG-3932/maven-lifecycle/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-mercury/pom.xml (contents, props changed)
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/branches/MNG-3932/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
maven/components/branches/MNG-3932/maven-model/pom.xml
maven/components/branches/MNG-3932/maven-model/src/main/mdo/maven.mdo
maven/components/branches/MNG-3932/maven-model/src/site/apt/index.apt
maven/components/branches/MNG-3932/maven-model/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-plugin-api/pom.xml
maven/components/branches/MNG-3932/maven-plugin-api/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-project-builder/pom.xml (contents, props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ExclusionModelContainerFactory.java
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/branches/MNG-3932/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProjectUri.java
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/DefaultDomainModel.java (props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/DefaultDomainModelFactory.java (props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/PluginSpecTest.java (contents, props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/java/org/apache/maven/project/builder/profile/ProfileContextTest.java
maven/components/branches/MNG-3932/maven-project-builder/src/test/projects/enforcer/enforcer-api/pom.xml (props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/projects/enforcer/enforcer-rules/pom.xml (props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/projects/enforcer/maven-enforcer-plugin/pom.xml (props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/projects/enforcer/pom.xml (props changed)
maven/components/branches/MNG-3932/maven-project-builder/src/test/resources/test.txt (props changed)
maven/components/branches/MNG-3932/maven-project-spec.pdf
maven/components/branches/MNG-3932/maven-project-spec.tex
maven/components/branches/MNG-3932/maven-project/pom.xml (contents, props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java (props changed)
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
maven/components/branches/MNG-3932/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/branches/MNG-3932/maven-project/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java (contents, props changed)
maven/components/branches/MNG-3932/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/plugin-level-dep.pom.xml (props changed)
maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/pom-interp.xml (props changed)
maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/pom-relative.xml (props changed)
maven/components/branches/MNG-3932/maven-project/src/test/resources/project-dynamism/pom.xml (props changed)
maven/components/branches/MNG-3932/maven-reporting-api/pom.xml
maven/components/branches/MNG-3932/maven-reporting-api/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/maven-toolchain/pom.xml
maven/components/branches/MNG-3932/maven-toolchain/src/main/mdo/toolchains.xml
maven/components/branches/MNG-3932/maven-toolchain/src/site/site.xml (props changed)
maven/components/branches/MNG-3932/pom.xml
maven/components/branches/MNG-3932/src/site/site.xml (contents, props changed)
Propchange: maven/components/branches/MNG-3932/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Feb 1 14:59:32 2009
@@ -1,19 +1,12 @@
release.properties
deleteme.version.properties
bootstrap
-maven.log
target
.classpath
.project
-bootstrap.repo
-maven-component.i*
.settings
-mboot.jar
-dummy
-build.ajproperties
-.generated.lst
*.iml
*.iws
*.ipr
log.txt
-setup_env.sh
+dependencies.xml
Propchange: maven/components/branches/MNG-3932/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 1 14:59:32 2009
@@ -1,3 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:680477
-/maven/components/branches/maven-2.0.x:679206,720042,726541,727548,727998
+/maven/components/branches/maven-2.0.x:679206,708871,720042,726541,727548,727998,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x:739385
/maven/components/trunk:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-3932/apache-maven/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 1 14:59:32 2009
@@ -0,0 +1,8 @@
+target
+.classpath
+.settings
+.project
+*.iml
+*.ipr
+*.iws
+bin
Propchange: maven/components/branches/MNG-3932/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 1 14:59:32 2009
@@ -0,0 +1,3 @@
+/maven/components/branches/maven-2.0.10-RC/maven-distribution:680477
+/maven/components/branches/maven-2.0.x/maven-distribution:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/trunk/maven-distribution:688587-696625,696644-699681
Added: maven/components/branches/MNG-3932/apache-maven/LICENSE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/LICENSE.txt?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/LICENSE.txt (added)
+++ maven/components/branches/MNG-3932/apache-maven/LICENSE.txt Sun Feb 1 14:59:32 2009
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Added: maven/components/branches/MNG-3932/apache-maven/NOTICE.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/NOTICE.txt?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/NOTICE.txt (added)
+++ maven/components/branches/MNG-3932/apache-maven/NOTICE.txt Sun Feb 1 14:59:32 2009
@@ -0,0 +1,20 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Maven distribution. ==
+ =========================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software (Plexus and Classworlds) developed by
+The Codehaus Foundation (http://www.codehaus.org/).
+
+This product includes software (JSCH) developed by
+JCraft Inc. (http://www.jcraft.com/).
+
+This product includes software (JTidy) developed by
+SourceForge (http://www.sourceforge.net/).
+
+This product includes software (AspectJ) developed by
+The Eclipse Foundation (http://www.eclipse.org/aspectj/).
Added: maven/components/branches/MNG-3932/apache-maven/README.txt
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/README.txt?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/README.txt (added)
+++ maven/components/branches/MNG-3932/apache-maven/README.txt Sun Feb 1 14:59:32 2009
@@ -0,0 +1,79 @@
+
+ Apache Maven
+
+ What is it?
+ -----------
+
+ Maven is a software project management and comprehension tool. Based on
+ the concept of a Project Object Model (POM), Maven can manage a project's
+ build, reporting and documentation from a central piece of information.
+
+ Documentation
+ -------------
+
+ The documentation available as of the date of this release is included in
+ HTML format in the docs/ directory.
+ The most up-to-date documentation can be found at http://maven.apache.org/.
+
+ Release Notes
+ -------------
+
+ The full list of changes can be found at http://maven.apache.org/release-notes.html.
+
+ System Requirements
+ -------------------
+
+ JDK:
+ 1.4 or above (this is to execute Maven - it still allows you to build against 1.3
+ and prior JDK's).
+ Memory:
+ No minimum requirement.
+ Disk:
+ No minimum requirement. Approximately 100MB will be used for your local repository,
+ however this will vary depending on usage and can be removed and redownloaded at
+ any time.
+ Operating System:
+ No minimum requirement. On Windows, Windows NT and above or Cygwin is required for
+ the startup scripts. Tested on Windows XP, Fedora Core and Mac OS X.
+
+ Installing Maven
+ ----------------
+
+ 1) Unpack the archive where you would like to store the binaries, eg:
+
+ Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+ tar zxvf apache-maven-2.1.x.tar.gz
+ Windows 2000/XP
+ unzip apache-maven-2.1.x.zip
+
+ 2) A directory called "apache-maven-2.1.x" will be created.
+
+ 3) Add the bin directory to your PATH, eg:
+
+ Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+ export PATH=/usr/local/apache-maven-2.1.x/bin:$PATH
+ Windows 2000/XP
+ set PATH="c:\program files\apache-maven-2.1.x\bin";%PATH%
+
+ 4) Make sure JAVA_HOME is set to the location of your JDK
+
+ 5) Run "mvn --version" to verify that it is correctly installed.
+
+ For complete documentation, see http://maven.apache.org/download.html#Installation
+
+ Licensing
+ ---------
+
+ Please see the file called LICENSE.TXT
+
+ Maven URLS
+ ----------
+
+ Home Page: http://maven.apache.org/
+ Downloads: http://maven.apache.org/downloads.html
+ Release Notes: http://maven.apache.org/release-notes.html
+ Mailing Lists: http://maven.apache.org/mail-lists.html
+ Source Code: http://svn.apache.org/repos/asf/maven/
+ Issue Tracking: http://jira.codehaus.org/browse/MNG
+ Wiki: http://docs.codehaus.org/display/MAVENUSER/
+ Available Plugins: http://maven.apache.org/plugins/index.html
Added: maven/components/branches/MNG-3932/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/pom.xml (added)
+++ maven/components/branches/MNG-3932/apache-maven/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,146 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>apache-maven</artifactId>
+ <name>Maven Distribution</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-embedder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <!-- CLI -->
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ </dependency>
+ <!--Mercury MP3-->
+ <dependency>
+ <groupId>org.sonatype.mercury</groupId>
+ <artifactId>mercury-mp3-cli</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>basedir</name>
+ <value>${basedir}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>standard</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <finalName>apache-maven-${pom.version}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- Single Test -->
+ <id>st</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/MavenEmbedderTest.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.cd Sun Feb 1 14:59:32 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodeConfig>
+ <containers>
+ <container>
+ <id>apache-maven</id>
+ <version>3.0-SNAPSHOT</version>
+ <type>maven</type>
+ <distribution>
+ <name>org.apache.maven:maven-distribution:3.0-SNAPSHOT:bin:zip</name>
+ </distribution>
+ <dependencies>
+ <dependency>
+ <name>org.apache.maven:maven-core:3.0-SNAPSHOT</name>
+ </dependency>
+ </dependencies>
+ </container>
+ </containers>
+</nodeConfig>
Added: maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven-3.0-SNAPSHOT.ldl Sun Feb 1 14:59:32 2009
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lockDownList>
+ <dependencies>
+ <dependency>
+ <name>org.apache.maven:maven-core:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-lifecycle:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-reporting-api:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.doxia:doxia-sink-api:1.0-alpha-9::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-model:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-compat:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.wagon:wagon-provider-api:1.0-beta-4::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-plugin-api:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-container-default:1.0-beta-3.0.5::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.xbean:xbean-reflect:3.4::jar</name>
+ </dependency>
+ <dependency>
+ <name>asm:asm:2.2.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>asm:asm-commons:2.2.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>asm:asm-tree:2.2.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>log4j:log4j:1.2.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-logging:commons-logging-api:1.1::jar</name>
+ </dependency>
+ <dependency>
+ <name>com.google.code.google-collections:google-collect:snapshot-20080530::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-project:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-project-builder:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-cli:commons-cli:1.0::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-logging:commons-logging:1.0::jar</name>
+ </dependency>
+ <dependency>
+ <name>commons-lang:commons-lang:1.0::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-interactivity-api:1.0-alpha-6::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-component-api:1.0-alpha-16::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-interpolation:1.1::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-utils:1.5.6::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-classworlds:1.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.5::jar</name>
+ </dependency>
+ <dependency>
+ <name>junit:junit:3.8.2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sonatype.plexus:plexus-plugin-manager:1.0-alpha-1::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-plexus:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-remote-m2:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-api:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-transport-http:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty-client:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty-sslengine:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:jetty-util:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.mortbay.jetty:servlet-api-2.5:6.1.12::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-transport-api:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-local-m2:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-virtual:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-repo-cache-fs:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-md-sat:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sat4j:org.sat4j.core:2.0.4::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sat4j:org.sat4j.pb:2.0.4::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-md-shared:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-util:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-crypto-basic:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>bouncycastle:bcprov-jdk15:140::jar</name>
+ </dependency>
+ <dependency>
+ <name>bouncycastle:bcpg-jdk15:140::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-crypto-api:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-event:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-logging:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.slf4j:slf4j-jdk14:1.5.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.slf4j:slf4j-api:1.5.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven:maven-mercury:3.0-SNAPSHOT::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-artifact:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.apache.maven.mercury:mercury-external:1.0.0-alpha-2::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.plexus:plexus-lang:1.1::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.sonatype.spice:model-builder:1.3::jar</name>
+ </dependency>
+ <dependency>
+ <name>org.codehaus.woodstox:wstx-asl:3.2.6::jar</name>
+ </dependency>
+ <dependency>
+ <name>stax:stax-api:1.0.1::jar</name>
+ </dependency>
+ </dependencies>
+</lockDownList>
Added: maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven.cd
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven.cd?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven.cd (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/.cd/apache-maven.cd Sun Feb 1 14:59:32 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodeConfig>
+ <containers>
+ <container>
+ <id>apache-maven</id>
+ <version>3.0-SNAPSHOT</version>
+ <type>maven</type>
+ <distribution>
+ <name>org.apache.maven:maven-distribution:3.0-SNAPSHOT:bin:zip</name>
+ </distribution>
+ <dependencies>
+ <dependency>
+ <name>org.apache.maven:maven-core:3.0-SNAPSHOT</name>
+ </dependency>
+ </dependencies>
+ </container>
+ </containers>
+</nodeConfig>
Added: maven/components/branches/MNG-3932/apache-maven/src/bin/m2.conf
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/bin/m2.conf?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/bin/m2.conf (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/bin/m2.conf Sun Feb 1 14:59:32 2009
@@ -0,0 +1,6 @@
+main is org.apache.maven.cli.MavenCli from plexus.core
+
+set maven.home default ${user.home}/m2
+
+[plexus.core]
+load ${maven.home}/lib/*.jar
Added: maven/components/branches/MNG-3932/apache-maven/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/bin/mvn?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/bin/mvn (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/bin/mvn Sun Feb 1 14:59:32 2009
@@ -0,0 +1,164 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# ----------------------------------------------------------------------------
+
+QUOTED_ARGS=""
+while [ "$1" != "" ] ; do
+
+ QUOTED_ARGS="$QUOTED_ARGS \"$1\""
+ shift
+
+done
+
+if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+fi
+
+if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] &&
+ HOME=`cygpath --path --windows "$HOME"`
+fi
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+
+
Added: maven/components/branches/MNG-3932/apache-maven/src/bin/mvn.bat
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/bin/mvn.bat?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/bin/mvn.bat (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/bin/mvn.bat Sun Feb 1 14:59:32 2009
@@ -0,0 +1,190 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+
+set ERROR_CODE=0
+
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo ERROR: JAVA_HOME not found in your environment.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory.
+echo JAVA_HOME = "%JAVA_HOME%"
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation
+echo.
+goto error
+
+:chkMHome
+if not "%M2_HOME%"=="" goto valMHome
+
+if "%OS%"=="Windows_NT" SET "M2_HOME=%~dp0.."
+if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.."
+if not "%M2_HOME%"=="" goto valMHome
+
+echo.
+echo ERROR: M2_HOME not found in your environment.
+echo Please set the M2_HOME variable in your environment to match the
+echo location of the Maven installation
+echo.
+goto error
+
+:valMHome
+
+:stripMHome
+if not "_%M2_HOME:~-1%"=="_\" goto checkMBat
+set "M2_HOME=%M2_HOME:~0,-1%"
+goto stripMHome
+
+:checkMBat
+if exist "%M2_HOME%\bin\mvn.bat" goto init
+
+echo.
+echo ERROR: M2_HOME is set to an invalid directory.
+echo M2_HOME = "%M2_HOME%"
+echo Please set the M2_HOME variable in your environment to match the
+echo location of the Maven installation
+echo.
+goto error
+@REM ==== END VALIDATION ====
+
+:init
+@REM Decide how to startup depending on the version of windows
+
+@REM -- Windows NT with Novell Login
+if "%OS%"=="WINNT" goto WinNTNovell
+
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
+
+:WinNTNovell
+
+@REM -- 4NT shell
+if "%@eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set MAVEN_CMD_LINE_ARGS=%*
+goto endInit
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set MAVEN_CMD_LINE_ARGS=%$
+goto endInit
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of agruments (up to the command line limit, anyway).
+set MAVEN_CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto endInit
+set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+@REM -- 4NT shell
+if "%@eval[2+2]" == "4" goto 4NTCWJars
+
+@REM -- Regular WinNT shell
+for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
+@REM The 4NT Shell from jp software
+:4NTCWJars
+for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i"
+goto runm2
+
+@REM Start MAVEN2
+:runm2
+set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+if "%OS%"=="WINNT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set MAVEN_JAVA_EXE=
+set MAVEN_CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+:postExec
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
+
+
Added: maven/components/branches/MNG-3932/apache-maven/src/bin/mvnDebug
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/apache-maven/src/bin/mvnDebug?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/apache-maven/src/bin/mvnDebug (added)
+++ maven/components/branches/MNG-3932/apache-maven/src/bin/mvnDebug Sun Feb 1 14:59:32 2009
@@ -0,0 +1,169 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# ----------------------------------------------------------------------------
+
+MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+
+echo Preparing to Execute Maven in Debug Mode
+
+QUOTED_ARGS=""
+while [ "$1" != "" ] ; do
+
+ QUOTED_ARGS="$QUOTED_ARGS \"$1\""
+ shift
+
+done
+
+if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+fi
+
+if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+ # TODO classpath?
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] &&
+ HOME=`cygpath --path --windows "$HOME"`
+fi
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ $MAVEN_DEBUG_OPTS \
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${M2_HOME}" \
+ ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+
+