Author: jdcasey
Date: Tue Sep 16 13:07:34 2008
New Revision: 696033
URL: http://svn.apache.org/viewvc?rev=696033&view=rev
Log:
[MASSEMBLY-312] Adding modified version of Petar's integration test, to verify
that outputFileNameMapping IS NOT appended to outputDirectory when unpack ==
true.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/goals.txt?rev=696033&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/goals.txt
Tue Sep 16 13:07:34 2008
@@ -0,0 +1,2 @@
+clean
+package
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml?rev=696033&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
Tue Sep 16 13:07:34 2008
@@ -0,0 +1,38 @@
+<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>
+
+ <artifactId>project</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals><goal>single</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml?rev=696033&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
Tue Sep 16 13:07:34 2008
@@ -0,0 +1,16 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>some_directory</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <unpack>true</unpack>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh?rev=696033&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
Tue Sep 16 13:07:34 2008
@@ -0,0 +1,20 @@
+import java.io.*;
+
+// verify that the ear is created
+File dirWithMapping = new File( basedir,
"target/project-1-bin.dir/some_directory/junit.jar/" );
+
+if ( dirWithMapping.exists() )
+{
+ System.out.println( "<outputFileNameMapping> should NOT be used when
unpack == true." );
+ return false;
+}
+
+File dir = new File( basedir,
"target/project-1-bin.dir/some_directory/junit/framework/TestCase.class" );
+
+if ( !dir.exists() )
+{
+ System.out.println( "Expected unpacked class does not exist in the
appropriate outputDirectory within the assembly." );
+ return false;
+}
+
+return true;
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
