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 2007/08/22 03:28:35 UTC
svn commit: r568360 [2/3] - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/functional-tests/java/org/apache/maven/plugin/assembly/interpolation/
src/functional-tests/resources/basicAbstractAssemblyMojoFeaturesTest/
src/it/basic-features/ src/it/...
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>org.apache.maven.plugins.assembly.it</groupId>
<artifactId>assembly-assembly-with-module-binaries</artifactId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
<moduleSet>
<binaries>
<outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
</binaries>
</moduleSet>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>org.apache.maven.plugins.assembly.it</groupId>
<artifactId>assembly-attached-with-module-binaries</artifactId>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
<moduleSet>
<binaries>
<outputDirectory>modules</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
</binaries>
</moduleSet>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-customEntry/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>manifest-with-customEntry</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/manifest-with-mainClass/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>manifest-with-mainClass</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>no-appendAssemblyId-no-classifier</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>single-in-one-project-hierarchy</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-in-one-project-hierarchy/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
<dependencySet>
<scope>test</scope>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child1/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
<dependencySet>
<scope>test</scope>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/child2/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
<dependencySet>
<scope>test</scope>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>single-twice-in-multimodule-hierarchy</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>single-in-one-project-hierarchy</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -8,7 +8,7 @@
<dependencySet>
<scope>test</scope>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
</dependencySet>
</dependencySets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>org.test</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/src/assemble/src.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/src/assemble/src.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceIncludedBinaryNotIncluded/src/assemble/src.xml Tue Aug 21 18:28:22 2007
@@ -11,7 +11,7 @@
<include>org.test:child3</include>
</includes>
<sources>
- <outputDirectory>sources/${artifactId}</outputDirectory>
+ <outputDirectory>sources/${artifact.artifactId}</outputDirectory>
<excludes>
<exclude>target/**</exclude>
<exclude>**/*~</exclude>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>org.test</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/src/assemble/bin.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/src/assemble/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/module-sourceNotIncludedBinaryIncluded/src/assemble/bin.xml Tue Aug 21 18:28:22 2007
@@ -12,7 +12,7 @@
<include>org.test:child3</include>
</includes>
<binaries>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includeDependencies>true</includeDependencies>
<unpack>false</unpack>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule-dontIncludeSubModules/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withBinaries/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>two-levels-includeBaseDirectory-withBinaries</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>two-levels-includeBaseDirectory-withSources</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/src/assemble/src.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/src/assemble/src.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDirectory-withSources/src/assemble/src.xml Tue Aug 21 18:28:22 2007
@@ -12,7 +12,7 @@
<sources>
<excludeSubModuleDirectories>true</excludeSubModuleDirectories>
<includeModuleDirectory>true</includeModuleDirectory>
- <outputDirectoryMapping>modules/${artifactId}</outputDirectoryMapping>
+ <outputDirectoryMapping>modules/${module.artifactId}</outputDirectoryMapping>
<fileSets>
<fileSet>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml Tue Aug 21 18:28:22 2007
@@ -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>two-level-multimodule</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>repository-assembly</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml Tue Aug 21 18:28:22 2007
@@ -1,6 +1,12 @@
<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>org.apache.maven.plugin.assembly.test</groupId>
<artifactId>repo-with-snapshot-parents</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Tue Aug 21 18:28:22 2007
@@ -156,7 +156,7 @@
}
}
- addArtifact( artifact, project, archiver, configSource, binaries );
+ addModuleArtifact( artifact, project, archiver, configSource, binaries );
}
List depSets = binaries.getDependencySets();
@@ -178,6 +178,13 @@
if ( depSets != null )
{
+ // NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled!
+ for ( Iterator it = depSets.iterator(); it.hasNext(); )
+ {
+ DependencySet ds = (DependencySet) it.next();
+ ds.setUseProjectArtifact( false );
+ }
+
// FIXME: This will produce unpredictable results when module dependencies have a version conflict.
getLogger().warn(
"NOTE: Currently, inclusion of module dependencies may produce unpredictable "
@@ -192,6 +199,7 @@
AddDependencySetsTask task =
new AddDependencySetsTask( depSets, moduleProject, projectBuilder, dependencyResolver, getLogger() );
+ task.setArtifactExpressionPrefix( "module." );
task.setDefaultOutputDirectory( binaries.getOutputDirectory() );
task.setDefaultOutputFileNameMapping( binaries.getOutputFileNameMapping() );
@@ -221,7 +229,7 @@
return excludes;
}
- protected void addArtifact( Artifact artifact, MavenProject project, Archiver archiver,
+ protected void addModuleArtifact( Artifact artifact, MavenProject project, Archiver archiver,
AssemblerConfigurationSource configSource, ModuleBinaries binaries )
throws ArchiveCreationException, AssemblyFormattingException
{
@@ -234,6 +242,7 @@
AddArtifactTask task = new AddArtifactTask( artifact, getLogger() );
+ task.setArtifactExpressionPrefix( "module." );
task.setFileNameMapping( binaries.getOutputFileNameMapping() );
task.setOutputDirectory( binaries.getOutputDirectory() );
task.setProject( project );
@@ -292,6 +301,7 @@
AddFileSetsTask task = new AddFileSetsTask( Collections.singletonList( moduleFileSet ) );
+ task.setArtifactExpressionPrefix( "module." );
task.setProject( moduleProject );
task.setLogger( getLogger() );
@@ -393,7 +403,7 @@
{
destPathPrefix =
AssemblyFormatUtils.evaluateFileNameMapping( sources.getOutputDirectoryMapping(),
- moduleProject.getArtifact() );
+ moduleProject.getArtifact(), configSource.getProject(), moduleProject, "module." );
if ( !destPathPrefix.endsWith( "/" ) )
{
@@ -412,7 +422,7 @@
destPath = destPathPrefix + destPath;
}
- destPath = AssemblyFormatUtils.getOutputDirectory( destPath, configSource.getProject(), moduleProject, "", "module" );
+ destPath = AssemblyFormatUtils.getOutputDirectory( destPath, configSource.getProject(), moduleProject, configSource.getFinalName(), "module." );
fs.setOutputDirectory( destPath );
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=568360&r1=568359&r2=568360&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 Tue Aug 21 18:28:22 2007
@@ -1,8 +1,5 @@
package org.apache.maven.plugin.assembly.archive.task;
-import java.io.File;
-import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
@@ -14,6 +11,9 @@
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.Logger;
+import java.io.File;
+import java.util.List;
+
public class AddArtifactTask
implements ArchiverTask
{
@@ -38,6 +38,8 @@
private final Logger logger;
+ private String artifactExpressionPrefix = "artifact.";
+
public AddArtifactTask( Artifact artifact, Logger logger )
{
this.artifact = artifact;
@@ -49,7 +51,7 @@
{
String destDirectory = outputDirectory;
- destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getProject(), project, configSource.getFinalName() );
+ destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getProject(), project, configSource.getFinalName(), artifactExpressionPrefix );
if ( unpack )
{
@@ -66,6 +68,8 @@
int oldDirMode = archiver.getDefaultDirectoryMode();
int oldFileMode = archiver.getDefaultFileMode();
+ logger.debug( "Unpacking artifact: " + artifact.getId() + " to assembly location: " + outputLocation + "." );
+
try
{
if ( fileMode != null )
@@ -85,10 +89,12 @@
}
else if ( artifactFile.isDirectory() )
{
+ logger.debug( "Adding artifact directory contents for: " + artifact + " to: " + outputLocation );
archiver.addDirectory( artifactFile, outputLocation, includesArray, excludesArray );
}
else
{
+ logger.debug( "Unpacking artifact contents for: " + artifact + " to: " + outputLocation );
archiver.addArchivedFileSet( artifactFile, outputLocation, includesArray, excludesArray );
}
}
@@ -105,23 +111,25 @@
}
else
{
- String fileNameMapping = AssemblyFormatUtils.evaluateFileNameMapping( outputFileNameMapping, artifact );
+ String fileNameMapping = AssemblyFormatUtils.evaluateFileNameMapping( outputFileNameMapping, artifact, configSource.getProject(), project, artifactExpressionPrefix );
String outputLocation = destDirectory + fileNameMapping;
try
{
+ File artifactFile = artifact.getFile();
+
+ logger.debug( "Adding artifact: " + artifact.getId() + " with file: " + artifactFile + " to assembly location: " + outputLocation + "." );
+
if ( fileMode != null )
{
- File artifactFile = artifact.getFile();
-
int mode = TypeConversionUtils.modeToInt( fileMode, logger );
archiver.addFile( artifactFile, outputLocation, mode );
}
else
{
- archiver.addFile( artifact.getFile(), outputLocation );
+ archiver.addFile( artifactFile, outputLocation );
}
}
catch ( ArchiverException e )
@@ -180,6 +188,11 @@
public void setFileNameMapping( String outputFileNameMapping, String defaultOutputFileNameMapping )
{
setFileNameMapping( outputFileNameMapping == null ? defaultOutputFileNameMapping : outputFileNameMapping );
+ }
+
+ public void setArtifactExpressionPrefix( String artifactExpressionPrefix )
+ {
+ this.artifactExpressionPrefix = artifactExpressionPrefix;
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Tue Aug 21 18:28:22 2007
@@ -59,6 +59,8 @@
private final DependencyResolver dependencyResolver;
+ private String artifactExpressionPrefix = "artifact.";
+
public AddDependencySetsTask( List dependencySets, MavenProject project, MavenProjectBuilder projectBuilder,
DependencyResolver dependencyResolver, Logger logger )
{
@@ -99,6 +101,7 @@
logger.info( "Processing DependencySet (output=" + dependencySet.getOutputDirectory() + ")" );
Set dependencyArtifacts = resolveDependencyArtifacts( dependencySet, configSource );
+ logger.debug( "Adding " + dependencyArtifacts.size() + " dependency artifacts." );
for ( Iterator j = dependencyArtifacts.iterator(); j.hasNext(); )
{
@@ -116,6 +119,8 @@
+ "; Reason: " + e.getMessage(), e );
}
+ System.out.println( "Hashcode for dependency artifact: " + depArtifact.hashCode() );
+
if ( NON_ARCHIVE_DEPENDENCY_TYPES.contains( depArtifact.getType() ) )
{
addNonArchiveDependency( depArtifact, depProject, dependencySet, archiver, configSource );
@@ -125,6 +130,7 @@
AddArtifactTask task = new AddArtifactTask( depArtifact, logger );
task.setProject( depProject );
+ task.setArtifactExpressionPrefix( artifactExpressionPrefix );
task.setOutputDirectory( dependencySet.getOutputDirectory(), defaultOutputDirectory );
task.setFileNameMapping( dependencySet.getOutputFileNameMapping(), defaultOutputFileNameMapping );
task.setDirectoryMode( dependencySet.getDirectoryMode() );
@@ -223,9 +229,9 @@
String outputDirectory = dependencySet.getOutputDirectory();
outputDirectory = AssemblyFormatUtils.getOutputDirectory( outputDirectory, configSource.getProject(), depProject, depProject.getBuild()
- .getFinalName() );
+ .getFinalName(), artifactExpressionPrefix );
String destName = AssemblyFormatUtils.evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(),
- depArtifact );
+ depArtifact, configSource.getProject(), depProject, artifactExpressionPrefix );
String target;
@@ -277,5 +283,10 @@
public void setDefaultOutputFileNameMapping( String defaultOutputFileNameMapping )
{
this.defaultOutputFileNameMapping = defaultOutputFileNameMapping;
+ }
+
+ public void setArtifactExpressionPrefix( String artifactExpressionPrefix )
+ {
+ this.artifactExpressionPrefix = artifactExpressionPrefix;
}
}
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=568360&r1=568359&r2=568360&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 Tue Aug 21 18:28:22 2007
@@ -27,6 +27,8 @@
private MavenProject project;
+ private String artifactExpressionPrefix;
+
public AddFileSetsTask( List fileSets )
{
this.fileSets = fileSets;
@@ -95,7 +97,7 @@
+ ( fileSet.getLineEnding() == null ? "" : " lineEndings: " + fileSet.getLineEnding() ) );
}
- destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getProject(), project, configSource.getFinalName() );
+ destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getProject(), project, configSource.getFinalName(), artifactExpressionPrefix );
logger.debug( "The archive base directory is '" + archiveBaseDir + "'" );
@@ -176,6 +178,11 @@
public void setProject( MavenProject project )
{
this.project = project;
+ }
+
+ public void setArtifactExpressionPrefix( String artifactExpressionPrefix )
+ {
+ this.artifactExpressionPrefix = artifactExpressionPrefix;
}
}
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=568360&r1=568359&r2=568360&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 Tue Aug 21 18:28:22 2007
@@ -31,12 +31,10 @@
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -47,38 +45,16 @@
private static final Pattern EXPRESSION_PATTERN = Pattern.compile( "\\$\\{(pom\\.|project\\.|env\\.)?([^}]+)\\}" );
- private static final Map INTERPOLATION_BLACKLIST;
+ private static final Set INTERPOLATION_BLACKLIST;
static
{
- Map blacklist = new HashMap();
+ Set blacklist = new HashSet();
- List ofnmBlacklistings = new ArrayList();
+ blacklist.add( "outputFileNameMapping" );
+ blacklist.add( "outputDirectoryMapping" );
+ blacklist.add( "outputDirectory" );
- ofnmBlacklistings.add( "groupId" );
- ofnmBlacklistings.add( "artifactId" );
- ofnmBlacklistings.add( "version" );
-
- // TODO: We should be blacklisting these, but currently they're not supported by filename mapping interpolation.
-// ofnmBlacklistings.add( "build.finalName" );
-// ofnmBlacklistings.add( "finalName" );
-
- blacklist.put( "outputFileNameMapping", ofnmBlacklistings );
- blacklist.put( "outputDirectoryMapping", ofnmBlacklistings );
-
-
- List odBlacklist = new ArrayList();
-
- odBlacklist.add( "groupId" );
- odBlacklist.add( "artifactId" );
- odBlacklist.add( "version" );
- odBlacklist.add( "build.finalName" );
-
- // wouldn't work, but just to future-proof this...
- odBlacklist.add( "finalName" );
-
- blacklist.put( "outputDirectory", odBlacklist );
-
INTERPOLATION_BLACKLIST = blacklist;
}
@@ -160,27 +136,23 @@
// 1. the element is not in the interpolation blacklist.
// 2. the value is not empty (otherwise there's nothing to interpolate)
// 3. the value contains a "${" (a pretty good clue that there's an expression in it)
- if ( StringUtils.isNotEmpty( value ) && value.indexOf( "${" ) > -1 )
+ if ( StringUtils.isNotEmpty( value ) && ( value.indexOf( "${" ) > -1 ) )
{
- List blacklistedExpressions = (List) INTERPOLATION_BLACKLIST.get( elementName );
- if ( blacklistedExpressions == null )
+ if ( !INTERPOLATION_BLACKLIST.contains( elementName ) )
{
- blacklistedExpressions = Collections.EMPTY_LIST;
- }
-
- String interpolatedValue =
- interpolateElementValue( value, assembly, project, context, blacklistedExpressions );
+ String interpolatedValue =
+ interpolateElementValue( value, assembly, project, context );
- String modifiedElement = StringUtils.replace( element, value, interpolatedValue );
- result = StringUtils.replace( result, element, modifiedElement );
+ String modifiedElement = StringUtils.replace( element, value, interpolatedValue );
+ result = StringUtils.replace( result, element, modifiedElement );
+ }
}
}
return result;
}
- private String interpolateElementValue( String src, Assembly assembly, MavenProject project, Map context,
- List blacklistedExpressions )
+ private String interpolateElementValue( String src, Assembly assembly, MavenProject project, Map context )
throws AssemblyInterpolationException
{
String result = src;
@@ -191,11 +163,6 @@
String wholeExpr = matcher.group( 0 );
String realExpr = matcher.group( 2 );
- if ( blacklistedExpressions.contains( realExpr ) )
- {
- continue;
- }
-
Object value = context.get( realExpr );
if ( value == null )
@@ -246,14 +213,14 @@
protected Logger getLogger()
{
Logger logger = super.getLogger();
-
+
if ( logger == null )
{
logger = new ConsoleLogger( Logger.LEVEL_INFO, "interpolator-internal" );
-
+
enableLogging( logger );
}
-
+
return logger;
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReader.java Tue Aug 21 18:28:22 2007
@@ -15,6 +15,7 @@
import org.apache.maven.plugin.assembly.model.FileSet;
import org.apache.maven.plugin.assembly.model.Repository;
import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Reader;
+import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer;
import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.io.location.ArtifactLocatorStrategy;
@@ -37,6 +38,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -267,7 +269,11 @@
mergeComponentsWithMainAssembly( assembly, configSource );
+ debugPrintAssembly( "Before assembly is interpolated:", assembly );
+
assembly = new AssemblyInterpolator().interpolate( assembly, project, context );
+
+ debugPrintAssembly( "After assembly is interpolated:", assembly );
}
catch ( IOException e )
{
@@ -292,6 +298,21 @@
}
return assembly;
+ }
+
+ private void debugPrintAssembly( String message, Assembly assembly )
+ {
+ StringWriter sWriter = new StringWriter();
+ try
+ {
+ new AssemblyXpp3Writer().write( sWriter, assembly );
+ }
+ catch ( IOException e )
+ {
+ getLogger().debug( "Failed to print debug message with assembly descriptor listing, and message: " + message, e );
+ }
+
+ getLogger().debug( message + "\n\n" + sWriter.toString() + "\n\n" );
}
/**
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=568360&r1=568359&r2=568360&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 Tue Aug 21 18:28:22 2007
@@ -9,6 +9,7 @@
import org.codehaus.plexus.util.interpolation.ObjectBasedValueSource;
import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
+import java.io.IOException;
import java.util.Properties;
public final class AssemblyFormatUtils
@@ -46,12 +47,32 @@
return distributionName;
}
- public static String getOutputDirectory( String output, MavenProject mainProject, MavenProject artifactProject, String finalName )
+ public static String getOutputDirectory( String output, MavenProject mainProject, MavenProject artifactProject,
+ String finalName )
+ throws AssemblyFormattingException
{
- return getOutputDirectory( output, mainProject, artifactProject, finalName, "artifact" );
+ return getOutputDirectory( output, mainProject, artifactProject, finalName, "artifact." );
}
- public static String getOutputDirectory( String output, MavenProject mainProject, MavenProject artifactProject, String finalName, String artifactProjectRefName )
+ /*
+ * ORDER OF INTERPOLATION PRECEDENCE:
+ *
+ * 1. Support for special expressions, like ${dashClassifier?}
+ * 2. prefixed with artifactProjectRefName, from parameters list above.
+ * A. MavenProject instance for artifact
+ * 3. prefixed with "artifact.", if artifactProjectRefName != "artifact."
+ * A. MavenProject instance for artifact
+ * 4. prefixed with "pom."
+ * A. MavenProject instance from current build
+ * 5. no prefix, using main project instance
+ * A. MavenProject instance from current build
+ * 6. System properties
+ * 7. environment variables.
+ *
+ */
+ public static String getOutputDirectory( String output, MavenProject mainProject, MavenProject artifactProject,
+ String finalName, String artifactProjectRefName )
+ throws AssemblyFormattingException
{
String value = output;
if ( value == null )
@@ -59,6 +80,11 @@
value = "";
}
+ if ( ( artifactProjectRefName != null ) && !artifactProjectRefName.endsWith( "." ) )
+ {
+ artifactProjectRefName += ".";
+ }
+
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
Properties specialExpressionOverrides = new Properties();
@@ -74,12 +100,34 @@
if ( mainProject != null )
{
interpolator.addValueSource( new PrefixedObjectBasedValueSource( "pom.", mainProject ) );
- interpolator.addValueSource( new ObjectBasedValueSource( mainProject ) );
}
if ( artifactProject != null )
{
- interpolator.addValueSource( new PrefixedObjectBasedValueSource( "artifact.", artifactProject ) );
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( artifactProjectRefName, artifactProject ) );
+
+ if ( !"artifact.".equals( artifactProjectRefName ) )
+ {
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( "artifact.", artifactProject ) );
+ }
+ }
+
+ if ( mainProject != null )
+ {
+ interpolator.addValueSource( new ObjectBasedValueSource( mainProject ) );
+ }
+
+ // 6
+ interpolator.addValueSource( new PropertiesInterpolationValueSource( System.getProperties() ) );
+
+ try
+ {
+ // 7
+ interpolator.addValueSource( new PropertiesInterpolationValueSource( CommandLineUtils.getSystemEnvVars( false ) ) );
+ }
+ catch ( IOException e )
+ {
+ throw new AssemblyFormattingException( "Failed to retrieve OS environment variables. Reason: " + e.getMessage(), e );
}
value = interpolator.interpolate( value, "__project" );
@@ -97,30 +145,96 @@
return value;
}
- /**
- * Evaluates Filename Mapping
+ public static String evaluateFileNameMapping( String expression, Artifact artifact, MavenProject mainProject, MavenProject artifactProject )
+ throws AssemblyFormattingException
+ {
+ return evaluateFileNameMapping( expression, artifact, mainProject, artifactProject, "artifact." );
+ }
+
+ /*
+ * ORDER OF INTERPOLATION PRECEDENCE:
+ *
+ * 1. prefixed with artifactProjectRefName, from parameters list above.
+ * A. Artifact instance
+ * B. ArtifactHandler instance for artifact
+ * C. MavenProject instance for artifact
+ * 2. prefixed with "artifact.", if artifactProjectRefName != "artifact."
+ * A. Artifact instance
+ * B. ArtifactHandler instance for artifact
+ * C. MavenProject instance for artifact
+ * 3. prefixed with "pom."
+ * A. MavenProject instance from current build
+ * 4. no prefix, using main project instance
+ * A. MavenProject instance from current build
+ * 5. Support for special expressions, like ${dashClassifier?}
+ * 6. System properties
+ * 7. environment variables.
*
- * @param expression
- * @param artifact
- * @return expression
- * @throws AssemblyFormattingException
- * @throws org.apache.maven.plugin.MojoExecutionException
*/
- public static String evaluateFileNameMapping( String expression, Artifact artifact )
+ public static String evaluateFileNameMapping( String expression, Artifact artifact, MavenProject mainProject, MavenProject artifactProject, String artifactProjectRefName )
throws AssemblyFormattingException
{
+ System.out.println( "in evaluateFileNameMapping, using expression: " + expression + "\nartifact: "
+ + artifact.getId() + "\nmainProject: "
+ + ( mainProject != null ? mainProject.getId() : "null" ) + "\nartifactProject: "
+ + ( artifactProject != null ? artifactProject.getId() : "null" )
+ + "\nartifactProjectRefName: " + artifactProjectRefName );
+
String value = expression;
- // FIXME: This is BAD! Accessors SHOULD NOT change the behavior of the object.
+ if ( ( artifactProjectRefName != null ) && !artifactProjectRefName.endsWith( "." ) )
+ {
+ artifactProjectRefName += ".";
+ }
+
+ // TODO: This is BAD! Accessors SHOULD NOT change the behavior of the object.
+ // [jdcasey; 16-Aug-1007] This is fixed in SVN, just waiting for it to pass out of legacy.
artifact.isSnapshot();
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
- interpolator.addValueSource( new ObjectBasedValueSource( artifact ) );
- interpolator.addValueSource( new ObjectBasedValueSource( artifact.getArtifactHandler() ) );
+ // 1A
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( artifactProjectRefName, artifact ) );
+
+ // 1B
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( artifactProjectRefName, artifact.getArtifactHandler() ) );
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( artifactProjectRefName
+ + ( artifactProjectRefName.endsWith( "." )
+ ? "" : "." ) + "handler.",
+ artifact.getArtifactHandler() ) );
+
+ // 1C
+ if ( artifactProject != null )
+ {
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( artifactProjectRefName, artifactProject ) );
+ }
+
+ if ( !"artifact.".equals( artifactProjectRefName ) )
+ {
+ // 2A
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( "artifact.", artifact ) );
+
+ // 2B
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( "artifact.", artifact.getArtifactHandler() ) );
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( "artifact.handler.", artifact.getArtifactHandler() ) );
+
+ // 2C
+ if ( artifactProject != null )
+ {
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( "artifact.", artifactProject ) );
+ }
+ }
+
+ if ( mainProject != null )
+ {
+ // 3
+ interpolator.addValueSource( new PrefixedObjectBasedValueSource( "pom.", mainProject ) );
+
+ // 4
+ interpolator.addValueSource( new ObjectBasedValueSource( mainProject ) );
+ }
Properties specialRules = new Properties();
-// specialRules.setProperty( "classifier", "" );
String classifier = artifact.getClassifier();
if ( classifier != null )
@@ -132,9 +246,26 @@
specialRules.setProperty( "dashClassifier?", "" );
}
+ // 5
interpolator.addValueSource( new PropertiesInterpolationValueSource( specialRules ) );
+ // 6
+ interpolator.addValueSource( new PropertiesInterpolationValueSource( System.getProperties() ) );
+
+ try
+ {
+ // 7
+ interpolator.addValueSource( new PropertiesInterpolationValueSource( CommandLineUtils.getSystemEnvVars( false ) ) );
+ }
+ catch ( IOException e )
+ {
+ throw new AssemblyFormattingException( "Failed to retrieve OS environment variables. Reason: " + e.getMessage(), e );
+ }
+
+ // Now, run the interpolation using the rules stated above.
value = interpolator.interpolate( value, "__artifact" );
+
+ System.out.println( "Result of outputFileNameMapping evaluation: \'" + value + "\'" );
return value;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Tue Aug 21 18:28:22 2007
@@ -358,11 +358,12 @@
<name>outputFileNameMapping</name>
<version>1.0.0+</version>
<type>String</type>
- <defaultValue>${artifactId}-${version}${dashClassifier?}.${extension}</defaultValue>
+ <defaultValue>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</defaultValue>
<description>
Sets the mapping pattern for all dependencies included in this
- assembly. Default is ${artifactId}-${version}${dashClassifier?}.${extension}.
+ assembly. Default is ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}.
If the artifact doesn't have a classifier, that part of the pattern will be left off.
+ (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension})
</description>
</field>
<field>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Tue Aug 21 18:28:22 2007
@@ -491,10 +491,11 @@
<name>outputFileNameMapping</name>
<version>1.0.0+</version>
<type>String</type>
- <defaultValue>${artifactId}-${version}${dashClassifier?}.${extension}</defaultValue>
+ <defaultValue>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</defaultValue>
<description>
Sets the mapping pattern for all dependencies included in this
- assembly. Default is ${artifactId}-${version}${dashClassifier?}.${extension}.
+ assembly. Default is ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}.
+ (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension})
</description>
</field>
<field>
@@ -706,11 +707,11 @@
<name>outputDirectoryMapping</name>
<version>1.1.0</version>
<type>String</type>
- <defaultValue>${artifactId}</defaultValue>
+ <defaultValue>${module.artifactId}</defaultValue>
<description>
Sets the mapping pattern for all module base-directories included in this assembly.
NOTE: This field is only used if includeModuleDirectory == true.
- Default is the module's ${artifactId}. (Since 2.2)
+ Default is the module's ${artifactId} in 2.2-beta-1, and ${module.artifactId} in subsequent versions. (Since 2.2)
</description>
</field>
</fields>
@@ -789,11 +790,12 @@
<name>outputFileNameMapping</name>
<version>1.0.0+</version>
<type>String</type>
- <defaultValue>${artifactId}-${version}${dashClassifier?}.${extension}</defaultValue>
+ <defaultValue>${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}</defaultValue>
<description>
Sets the mapping pattern for all dependencies included
in this assembly.
- Default is ${artifactId}-${version}${dashClassifier?}.${extension}.
+ Default is ${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}.
+ (Since 2.2-beta-2; 2.2-beta-1 uses ${artifactId}-${version}${dashClassifier?}.${extension})
</description>
</field>
</fields>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-module-set-topics.apt Tue Aug 21 18:28:22 2007
@@ -117,13 +117,13 @@
The following <<<outputFileNameMapping>>>:
---
-${groupId}-${artifactId}-${version}.${extension}
+${module.groupId}-${module.artifactId}-${module.version}.${module.extension}
---
Will result in a file called <<<org.test-project-1.0.jar>>> being created
within the assembly.
- <NOTE: The expression <<<$\{extension\}>>> is mapped to the file extension
+ <NOTE: The expression <<<$\{module.extension\}>>> is mapped to the file extension
supplied by the ArtifactHandler for the type <<<jar>>>. It's important to
remember that the file extension <<need not be .jar>>.>
@@ -411,7 +411,7 @@
<binaries>
<attachmentClassifier>site</attachmentClassifier>
<outputDirectory>doc</outputDirectory>
- <outputFileNameMapping>website.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>website.${module.extension}</outputFileNameMapping>
</binaries>
</moduleSet>
[...]
@@ -464,7 +464,7 @@
<binaries>
<attachmentClassifier>jar-with-dependencies</attachmentClassifier>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifactId}-${version}-${classifier}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${module.artifactId}-${module.version}-${module.classifier}.${module.extension}</outputFileNameMapping>
</binaries>
</moduleSet>
[...]
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/fml/faq.fml Tue Aug 21 18:28:22 2007
@@ -57,7 +57,7 @@
simply add the following to your dependencySet:
</p>
<pre>
- <outputFileNameMapping>${artifactId}-${version}${dashClassifier?}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</pre>
</answer>
</faq>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=568360&r1=568359&r2=568360&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java Tue Aug 21 18:28:22 2007
@@ -4,6 +4,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
@@ -15,6 +16,7 @@
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;
@@ -31,11 +33,16 @@
{
String outputLocation = "/out";
- MavenProject project = new MavenProject( new Model() );
+ MavenProject project = newMavenProject( "group", "project", "0" );
+
+ ArtifactMock projectArtifactMock = new ArtifactMock( mockManager, "group", "project", "0", "jar", false );
+
+ project.setArtifact( projectArtifactMock.getArtifact() );
DependencySet ds = new DependencySet();
+ ds.setUseProjectArtifact( false );
ds.setOutputDirectory( outputLocation );
- ds.setOutputFileNameMapping( "artifact" );
+ ds.setOutputFileNameMapping( "${artifact.artifactId}" );
ds.setUnpack( false );
ds.setScope( Artifact.SCOPE_COMPILE );
ds.setFileMode( Integer.toString( 10, 8 ) );
@@ -46,25 +53,25 @@
assembly.setIncludeBaseDirectory( false );
assembly.addDependencySet( ds );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager, null, project );
+ MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager, project );
- macTask.expectArtifactGetFile();
- macTask.expectArtifactGetType( "jar" );
- macTask.expectIsSnapshot( false );
- macTask.expectGetArtifactHandler();
+ ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "dep", "1", "jar", false );
+ File artifactFile = artifactMock.setNewFile();
+
+ System.out.println( "On test setup, hashcode for dependency artifact: " + artifactMock.getArtifact().hashCode() );
macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( macTask.artifact ) );
+ macTask.expectResolveDependencies( Collections.singleton( artifactMock.getArtifact() ) );
- macTask.expectAddFile( "out/artifact", 10 );
+ macTask.expectAddFile( artifactFile, "out/dep", 10 );
- project.setArtifacts( Collections.singleton( macTask.artifact ) );
+ project.setArtifacts( Collections.singleton( artifactMock.getArtifact() ) );
macTask.expectCSGetFinalName( "final-name" );
Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- MavenProject depProject = new MavenProject( new Model() );
+ MavenProject depProject = newMavenProject( "group", "dep", "1" );
macTask.expectBuildFromRepository( depProject );
@@ -75,6 +82,16 @@
mockManager.verifyAll();
}
+ private MavenProject newMavenProject( String groupId, String artifactId, String version )
+ {
+ Model model = new Model();
+ model.setGroupId( groupId );
+ model.setArtifactId( artifactId );
+ model.setVersion( version );
+
+ return new MavenProject( model );
+ }
+
public void testExecute_ShouldNotAddDependenciesWhenProjectHasNone()
throws AssemblyFormattingException, ArchiveCreationException, IOException, InvalidAssemblerConfigurationException
{
@@ -85,7 +102,7 @@
Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager, null, null );
+ MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager, null );
mockManager.replayAll();