Author: jdcasey
Date: Thu Sep 25 13:38:34 2008
New Revision: 699080
URL: http://svn.apache.org/viewvc?rev=699080&view=rev
Log:
[MASSEMBLY-239] integration test, checking that the default is to leave '.dir'
off, and that configuration to NOT ignore it produces a dir with the '.dir'
suffix.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/goals.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/goals.txt?rev=699080&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/goals.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/goals.txt
Thu Sep 25 13:38:34 2008
@@ -0,0 +1,2 @@
+clean
+package
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml?rev=699080&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
Thu Sep 25 13:38:34 2008
@@ -0,0 +1,48 @@
+
+<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>ignoreDirFormatExtensions</artifactId>
+ <packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src2</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src2.xml</descriptor>
+ </descriptors>
+ <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml?rev=699080&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
Thu Sep 25 13:38:34 2008
@@ -0,0 +1,17 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml?rev=699080&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
Thu Sep 25 13:38:34 2008
@@ -0,0 +1,17 @@
+<assembly>
+ <id>src2</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java?rev=699080&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
Thu Sep 25 13:38:34 2008
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh?rev=699080&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
Thu Sep 25 13:38:34 2008
@@ -0,0 +1,24 @@
+import java.io.*;
+
+File src = new File( basedir, "target/ignoreDirFormatExtensions-1-src/pom.xml"
);
+File src2 = new File( basedir,
"target/ignoreDirFormatExtensions-1-src2.dir/pom.xml" );
+
+{
+ File f = src;
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project assembly directory is missing.
Check-file was: " + f );
+ }
+}
+
+{
+ File f = src2;
+
+ if ( !f.exists() )
+ {
+ System.out.println( "Project assembly directory is missing.
Check-file was: " + f );
+ }
+}
+
+return src.exists() && src2.exists();
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
