You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/06/05 21:55:19 UTC
svn commit: r782119 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin:
./ src/it/projects/basic-features/ExecutionRoot/
src/it/projects/basic-features/ExecutionRoot/child/
src/it/projects/basic-features/ExecutionRoot/src/
src/it/projects/basic-feat...
Author: jdcasey
Date: Fri Jun 5 19:55:15 2009
New Revision: 782119
URL: http://svn.apache.org/viewvc?rev=782119&view=rev
Log:
merging changes from maven-assembly-plugin-2.2-beta-4 branch through r780691 (the release on that branch).
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/child/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/child/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/child/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/invoker.properties
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/src/assemble/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/ExecutionRoot/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/invoker.properties
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/src/assemble/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/src/assemble/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/relative-project-paths/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/basic-features/relative-project-paths/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/assemble/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/config/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/config/a/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/a/file.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/config/b/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/src/config/b/file.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/container-descriptors/configured-handler/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/container-descriptors/configured-handler/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/file.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/src/main/resources/target/file.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/goals.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/goals.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/pom.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/main/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/main/java/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/src/main/java/org/test/target/file.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/omit.txt
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/main/assembly/
- copied from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/main/assembly/source-release.xml
- copied unchanged from r780691, maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/assembly/source-release.xml
Modified:
maven/plugins/trunk/maven-assembly-plugin/ (props changed)
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
Propchange: maven/plugins/trunk/maven-assembly-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 5 19:55:15 2009
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Jun 5 19:55:15 2009
@@ -21,7 +21,7 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
@@ -50,7 +50,7 @@
</issueManagement>
<properties>
- <mdoVersion>1.1.0</mdoVersion>
+ <mdoVersion>1.1.1</mdoVersion>
</properties>
<dependencies>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-11</version>
+ <version>1.0-alpha-12</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <version>1.5.12</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -244,6 +244,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
+ <version>1.0</version>
<configuration>
<version>${mdoVersion}</version>
</configuration>
@@ -304,7 +305,7 @@
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <url>http://repository.apache.org/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
@@ -313,6 +314,8 @@
<properties>
<invokerPluginVersion>1.3</invokerPluginVersion>
+ <itParent>${java.io.tmpdir}/assembly-ITs/it-project-parent</itParent>
+ <itProjects>${java.io.tmpdir}/assembly-ITs/projects</itProjects>
<localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>
<test.remote.repo.url>file://${project.build.testOutputDirectory}/remote-repository</test.remote.repo.url>
<it.pomIncludes>**/pom.xml</it.pomIncludes>
@@ -323,6 +326,23 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>del-IT-clone-destination</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="${itProjects}" failonerror="false" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>${invokerPluginVersion}</version>
@@ -348,7 +368,7 @@
<goal>install</goal>
</goals>
<projectsDirectory>src/it/it-project-parent</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it/it-project-parent</cloneProjectsTo>
+ <cloneProjectsTo>${itParent}</cloneProjectsTo>
<pomIncludes>
<pomInclude>pom.xml</pomInclude>
</pomIncludes>
@@ -363,7 +383,7 @@
</goals>
<configuration>
<projectsDirectory>src/it/projects</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it/projects</cloneProjectsTo>
+ <cloneProjectsTo>${itProjects}</cloneProjectsTo>
<testPropertiesFile>test.properties</testPropertiesFile>
<debug>true</debug>
@@ -391,6 +411,35 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Using this plugin configuration to produce a buildable project source distro,
+ per the discussion on members@ASF regarding what constitutes a valid release.
+ -->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <executions>
+ <execution>
+ <id>make-project-src-distro</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/source-release.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml Fri Jun 5 19:55:15 2009
@@ -1,5 +1,11 @@
<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>jars-in-archive-root</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml Fri Jun 5 19:55:15 2009
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>component-descriptors-merged</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml Fri Jun 5 19:55:15 2009
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml Fri Jun 5 19:55:15 2009
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>multimodule-sources-copied</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/project/sources-copied/pom.xml Fri Jun 5 19:55:15 2009
@@ -1,5 +1,11 @@
<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>sources-copied</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml Fri Jun 5 19:55:15 2009
@@ -1,11 +1,16 @@
<project 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' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>src-dir-copied</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -14,6 +19,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml Fri Jun 5 19:55:15 2009
@@ -12,7 +12,8 @@
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>target</exclude>
+ <exclude>build.log</exclude>
+ <exclude>${project.build.directory}/**</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml Fri Jun 5 19:55:15 2009
@@ -12,7 +12,8 @@
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>target</exclude>
+ <exclude>build.log</exclude>
+ <exclude>${project.build.directory}/**</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/pom.xml Fri Jun 5 19:55:15 2009
@@ -9,7 +9,6 @@
<artifactId>child1</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/pom.xml Fri Jun 5 19:55:15 2009
@@ -6,10 +6,10 @@
<artifactId>single-twice-in-multimodule-hierarchy</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>child2</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Fri Jun 5 19:55:15 2009
@@ -169,7 +169,7 @@
null, finalName, configSource );
}
- List containerHandlers = selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers() );
+ List containerHandlers = selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers(), configSource );
Archiver archiver = createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource,
containerHandlers );
@@ -217,7 +217,7 @@
return destFile;
}
- private List selectContainerDescriptorHandlers( List requestedContainerDescriptorHandlers )
+ private List selectContainerDescriptorHandlers( List requestedContainerDescriptorHandlers, AssemblerConfigurationSource configSource )
throws InvalidAssemblerConfigurationException
{
getLogger().debug(
@@ -247,8 +247,15 @@
throw new InvalidAssemblerConfigurationException( "Cannot find ContainerDescriptorHandler with hint: " + hint );
}
- System.out.println( "Found container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
-
+ getLogger().debug( "Found container descriptor handler with hint: " + hint + " (component: " + handler + ")" );
+
+ if ( config.getConfiguration() != null )
+ {
+ getLogger().debug( "Configuring handler with:\n\n" + config.getConfiguration() + "\n\n" );
+
+ configureContainerDescriptorHandler( handler, (Xpp3Dom) config.getConfiguration(), configSource );
+ }
+
handlers.add( handler );
if ( "plexus".equals( hint ) )
@@ -324,6 +331,40 @@
return archiver;
}
+
+ private void configureContainerDescriptorHandler( ContainerDescriptorHandler handler, Xpp3Dom config,
+ AssemblerConfigurationSource configSource )
+ throws InvalidAssemblerConfigurationException
+ {
+ ComponentConfigurator configurator;
+ try
+ {
+ configurator = (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE, "basic" );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new InvalidAssemblerConfigurationException( "Failed to lookup configurator component for setup of handler: " + handler.getClass().getName(), e );
+ }
+
+ XmlPlexusConfiguration configuration = new XmlPlexusConfiguration( config );
+
+ ConfigurationListener listener = new DebugConfigurationListener( getLogger() );
+ ExpressionEvaluator expressionEvaluator = new AssemblyExpressionEvaluator( configSource );
+
+ getLogger().debug( "Configuring handler: '" + handler.getClass().getName() + "' -->" );
+
+ try
+ {
+ configurator.configureComponent( handler, configuration, expressionEvaluator,
+ container.getContainerRealm(), listener );
+ }
+ catch ( ComponentConfigurationException e )
+ {
+ throw new InvalidAssemblerConfigurationException( "Failed to configure handler: " + handler.getClass().getName(), e );
+ }
+
+ getLogger().debug( "-- end configuration --" );
+ }
private void configureArchiver( Archiver archiver, AssemblerConfigurationSource configSource )
throws ArchiverException
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java Fri Jun 5 19:55:15 2009
@@ -802,13 +802,29 @@
int permissions )
throws ArchiverException
{
- delegate.addResource( resource, destFileName, permissions );
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.addResource( resource, destFileName, permissions );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
}
public void addResources( PlexusIoResourceCollection resources )
throws ArchiverException
{
- delegate.addResources( resources );
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.addResources( resources );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
}
public ResourceIterator getResources()
@@ -824,7 +840,61 @@
public void setDuplicateBehavior( String duplicate )
{
- delegate.setDuplicateBehavior( duplicate );
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.setDuplicateBehavior( duplicate );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
+ }
+
+ public int getDirectoryMode()
+ {
+ return delegate.getDirectoryMode();
+ }
+
+ public int getFileMode()
+ {
+ return delegate.getFileMode();
+ }
+
+ public int getOverrideDirectoryMode()
+ {
+ return delegate.getOverrideDirectoryMode();
+ }
+
+ public int getOverrideFileMode()
+ {
+ return delegate.getOverrideFileMode();
+ }
+
+ public void setDirectoryMode( int mode )
+ {
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.setDirectoryMode( mode );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
+ }
+
+ public void setFileMode( int mode )
+ {
+ inPublicApi.set( Boolean.TRUE );
+ try
+ {
+ delegate.setFileMode( mode );
+ }
+ finally
+ {
+ inPublicApi.set( null );
+ }
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java Fri Jun 5 19:55:15 2009
@@ -121,21 +121,26 @@
}
String[] excludesArray = TypeConversionUtils.toStringArray( excludes );
- int oldDirMode = archiver.getDefaultDirectoryMode();
- int oldFileMode = archiver.getDefaultFileMode();
+ int oldDirMode = archiver.getOverrideDirectoryMode();
+ int oldFileMode = archiver.getOverrideFileMode();
logger.debug( "Unpacking artifact: " + artifact.getId() + " to assembly location: " + outputLocation + "." );
+ boolean fileModeSet = false;
+ boolean dirModeSet = false;
+
try
{
if ( fileMode != -1 )
{
- archiver.setDefaultFileMode( fileMode );
+ archiver.setFileMode( fileMode );
+ fileModeSet = true;
}
if ( directoryMode != -1 )
{
- archiver.setDefaultDirectoryMode( directoryMode );
+ archiver.setDirectoryMode( directoryMode );
+ dirModeSet = true;
}
File artifactFile = artifact.getFile();
@@ -163,8 +168,15 @@
}
finally
{
- archiver.setDefaultDirectoryMode( oldDirMode );
- archiver.setDefaultFileMode( oldFileMode );
+ if ( dirModeSet )
+ {
+ archiver.setDirectoryMode( oldDirMode );
+ }
+
+ if ( fileModeSet )
+ {
+ archiver.setFileMode( oldFileMode );
+ }
}
}
else
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java Fri Jun 5 19:55:15 2009
@@ -21,6 +21,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
@@ -68,19 +69,24 @@
+ outputDirectory + ". All paths must be within the archive root directory." );
}
- int oldDirMode = archiver.getDefaultDirectoryMode();
- int oldFileMode = archiver.getDefaultFileMode();
+ int oldDirMode = archiver.getOverrideDirectoryMode();
+ int oldFileMode = archiver.getOverrideFileMode();
+ boolean fileModeSet = false;
+ boolean dirModeSet = false;
+
try
{
if ( directoryMode != -1 )
{
- archiver.setDefaultDirectoryMode( directoryMode );
+ archiver.setDirectoryMode( directoryMode );
+ dirModeSet = true;
}
if ( fileMode != -1 )
{
- archiver.setDefaultFileMode( fileMode );
+ archiver.setFileMode( fileMode );
+ fileModeSet = true;
}
if ( directory.exists() )
@@ -100,11 +106,49 @@
String[] includesArray = null;
if ( includes != null && !includes.isEmpty() )
{
- includesArray = (String[]) includes.toArray( new String[0] );
+ includesArray = new String[includes.size()];
+
+ int i = 0;
+ for ( Iterator it = includes.iterator(); it.hasNext(); )
+ {
+ String value = (String) it.next();
+ if ( value.startsWith( "./" ) || value.startsWith( ".\\" ) )
+ {
+ value = value.substring( 2 );
+ }
+
+ if ( value.startsWith( "/" ) || value.startsWith( "\\" ) )
+ {
+ value = value.substring( 1 );
+ }
+
+ includesArray[i] = value;
+
+ i++;
+ }
}
// this one is guaranteed to be non-null by code above.
- String[] excludesArray = (String[]) directoryExcludes.toArray( new String[0] );
+ String[] excludesArray = new String[directoryExcludes.size()];
+
+ int i = 0;
+ for ( Iterator it = directoryExcludes.iterator(); it.hasNext(); )
+ {
+ String value = (String) it.next();
+ if ( value.startsWith( "./" ) || value.startsWith( ".\\" ) )
+ {
+ value = value.substring( 2 );
+ }
+
+ if ( value.startsWith( "/" ) || value.startsWith( "\\" ) )
+ {
+ value = value.substring( 1 );
+ }
+
+ excludesArray[i] = value;
+
+ i++;
+ }
DefaultFileSet fs = new DefaultFileSet();
fs.setUsingDefaultExcludes( useDefaultExcludes );
@@ -123,8 +167,15 @@
}
finally
{
- archiver.setDefaultDirectoryMode( oldDirMode );
- archiver.setDefaultFileMode( oldFileMode );
+ if ( dirModeSet )
+ {
+ archiver.setDirectoryMode( oldDirMode );
+ }
+
+ if ( fileModeSet )
+ {
+ archiver.setFileMode( oldFileMode );
+ }
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Fri Jun 5 19:55:15 2009
@@ -118,8 +118,8 @@
if ( logger.isDebugEnabled() )
{
logger.debug( "FileSet[" + destDirectory + "]" + " dir perms: "
- + Integer.toString( archiver.getDefaultDirectoryMode(), 8 ) + " file perms: "
- + Integer.toString( archiver.getDefaultFileMode(), 8 )
+ + Integer.toString( archiver.getOverrideDirectoryMode(), 8 ) + " file perms: "
+ + Integer.toString( archiver.getOverrideFileMode(), 8 )
+ ( fileSet.getLineEnding() == null ? "" : " lineEndings: " + fileSet.getLineEnding() ) );
}
@@ -173,7 +173,7 @@
{
String sourceDirectory = fileSet.getDirectory();
- if ( sourceDirectory == null )
+ if ( sourceDirectory == null || sourceDirectory.trim().length() < 1 )
{
sourceDirectory = basedir.getAbsolutePath();
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java Fri Jun 5 19:55:15 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -71,6 +72,8 @@
public void finalizeArchiveCreation( Archiver archiver )
throws ArchiverException
{
+ checkConfig();
+
if ( outputPath.endsWith( "/" ) )
{
throw new ArchiverException(
@@ -139,12 +142,16 @@
public List getVirtualFiles()
{
+ checkConfig();
+
return Collections.singletonList( outputPath );
}
public boolean isSelected( FileInfo fileInfo )
throws IOException
{
+ checkConfig();
+
if ( overrideFilterAction )
{
System.out.println( "Filtering overridden. Returning true." );
@@ -152,6 +159,7 @@
}
String name = fileInfo.getName();
+ name = AssemblyFileUtils.normalizePath( name );
name = name.replace( File.separatorChar, '/' );
@@ -166,6 +174,14 @@
return true;
}
+ private void checkConfig()
+ {
+ if ( filePattern == null || outputPath == null )
+ {
+ throw new IllegalStateException( "You must configure filePattern and outputPath in your containerDescriptorHandler declaration." );
+ }
+ }
+
private void readProperties( FileInfo fileInfo )
throws IOException
{
@@ -204,14 +220,14 @@
this.logger = logger;
}
- public String getPropertiesPattern()
+ public String getFilePattern()
{
return filePattern;
}
- public void setPropertiesPattern( String propertiesPattern )
+ public void setFilePattern( String filePattern )
{
- filePattern = propertiesPattern;
+ this.filePattern = filePattern;
}
public String getOutputPath()
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java Fri Jun 5 19:55:15 2009
@@ -19,21 +19,15 @@
* under the License.
*/
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.model.Assembly;
+import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
import org.apache.maven.plugin.assembly.utils.CommandLineUtils;
import org.apache.maven.plugin.assembly.utils.InterpolationConstants;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
@@ -47,6 +41,15 @@
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
/**
* @version $Id$
*/
@@ -56,7 +59,7 @@
private static final Set INTERPOLATION_BLACKLIST;
private static final Properties ENVIRONMENT_VARIABLES;
-
+
static
{
Set blacklist = new HashSet();
@@ -139,7 +142,7 @@
return assembly;
}
- public static Interpolator buildInterpolator( MavenProject project, AssemblerConfigurationSource configSource )
+ public static Interpolator buildInterpolator( final MavenProject project, AssemblerConfigurationSource configSource )
{
StringSearchInterpolator interpolator = new StringSearchInterpolator();
interpolator.setCacheAnswers( true );
@@ -189,7 +192,8 @@
interpolator.addValueSource( new PropertiesBasedValueSource( commandLineProperties ) );
interpolator.addValueSource( new PrefixedPropertiesValueSource( Collections.singletonList( "env." ), ENVIRONMENT_VARIABLES,
true ) );
-
+
+ interpolator.addPostProcessor( new PathTranslatingPostProcessor( project.getBasedir() ) );
return interpolator;
}
@@ -206,4 +210,22 @@
return logger;
}
+
+ private static final class PathTranslatingPostProcessor implements InterpolationPostProcessor
+ {
+
+ private final File basedir;
+
+ public PathTranslatingPostProcessor( File basedir )
+ {
+ this.basedir = basedir;
+ }
+
+ public Object execute( String expression, Object value )
+ {
+ String path = String.valueOf( value );
+ return AssemblyFileUtils.makePathRelativeTo( path, basedir );
+ }
+
+ }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Fri Jun 5 19:55:15 2009
@@ -34,6 +34,7 @@
import org.apache.maven.plugin.assembly.io.AssemblyReader;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
+import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -306,6 +307,14 @@
* @since 2.2-beta-3
*/
private PlexusConfiguration archiverConfig;
+
+ /**
+ * This will cause the assembly to run only at the top of a given module tree. That is, run in the project
+ * contained in the same folder where the mvn execution was launched.
+ * @parameter expression="${runOnlyAtExecutionRoot}" default-value="false"
+ * @since 2.2-beta-4
+ */
+ private boolean runOnlyAtExecutionRoot;
/**
* Create the binary distribution.
@@ -321,6 +330,13 @@
getLog().info( "Assemblies have been skipped per configuration of the skipAssembly parameter." );
return;
}
+
+ //run only at the execution root.
+ if (runOnlyAtExecutionRoot && !isThisTheExecutionRoot())
+ {
+ getLog().info( "Skipping the assembly in this project because it's not the Execution Root" );
+ return;
+ }
List assemblies;
try
@@ -416,6 +432,28 @@
}
}
+ /**
+ * Returns true if the current project is located at the Execution Root Directory (where mvn was launched)
+ * @return
+ */
+ protected boolean isThisTheExecutionRoot()
+ {
+ Log log = this.getLog();
+ log.debug("Root Folder:" + mavenSession.getExecutionRootDirectory());
+ log.debug("Current Folder:"+ basedir );
+ boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase(basedir.toString());
+ if (result)
+ {
+ log.debug( "This is the execution root." );
+ }
+ else
+ {
+ log.debug( "This is NOT the execution root." );
+ }
+
+ return result;
+ }
+
protected AssemblyArchiver getAssemblyArchiver()
{
return assemblyArchiver;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Fri Jun 5 19:55:15 2009
@@ -52,6 +52,46 @@
private AssemblyFileUtils()
{
}
+
+ public static String makePathRelativeTo( String path, final File basedir )
+ {
+ if ( basedir == null )
+ {
+ return path;
+ }
+
+ if ( path == null )
+ {
+ return null;
+ }
+
+ path = path.trim();
+
+ String base = basedir.getAbsolutePath();
+ if ( path.startsWith( base ) )
+ {
+ path = path.substring( base.length() );
+ if ( path.length() > 0 )
+ {
+ if ( path.startsWith( "/" ) || path.startsWith( "\\" ) )
+ {
+ path = path.substring( 1 );
+ }
+ }
+
+ if ( path.length() == 0 )
+ {
+ path = ".";
+ }
+ }
+
+ if ( !new File( path ).isAbsolute() )
+ {
+ path = path.replace( '\\', '/' );
+ }
+
+ return path;
+ }
public static void verifyTempDirectoryAvailability( final File tempDir, final Logger logger )
{
@@ -173,4 +213,9 @@
c2.close();
}
+ public static String normalizePath( String path )
+ {
+ return path.replace( '\\', '/' );
+ }
+
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java Fri Jun 5 19:55:15 2009
@@ -233,6 +233,8 @@
value = StringUtils.replace( value, "//", "/" );
value = StringUtils.replace( value, "\\\\", "\\" );
+ value = StringUtils.replace( value, "./", "" );
+ value = StringUtils.replace( value, ".\\", "" );
return value;
}
@@ -423,6 +425,8 @@
value = StringUtils.replace( value, "//", "/" );
value = StringUtils.replace( value, "\\\\", "\\" );
+ value = StringUtils.replace( value, "./", "" );
+ value = StringUtils.replace( value, ".\\", "" );
return value;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java?rev=782119&r1=782118&r2=782119&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtils.java Fri Jun 5 19:55:15 2009
@@ -61,7 +61,7 @@
public static int modeToInt( String mode, Logger logger )
throws AssemblyFormattingException
{
- if ( mode == null )
+ if ( mode == null || mode.trim().length() < 1 )
{
return -1;
}