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 2006/09/21 00:17:41 UTC
svn commit: r448368 - in /maven/plugins/trunk/maven-assembly-plugin: ./
src/it/file-sets/default-excludes-unspecified/
src/it/file-sets/default-excludes-unspecified/src/
src/it/file-sets/default-excludes-unspecified/src/main/
src/it/file-sets/default-e...
Author: jdcasey
Date: Wed Sep 20 15:17:38 2006
New Revision: 448368
URL: http://svn.apache.org/viewvc?view=rev&rev=448368
Log:
Adding more integration tests for default excludes, along with modifications to restore some backward-compat in moduleSources.
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/verify.bsh
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/App.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java (with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.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/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Sep 20 15:17:38 2006
@@ -142,7 +142,7 @@
</goals>
<configuration>
<model>src/main/mdo/descriptor.mdo</model>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</configuration>
</execution>
<execution>
@@ -156,7 +156,7 @@
</goals>
<configuration>
<model>src/main/mdo/component.mdo</model>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</configuration>
</execution>
<execution>
@@ -168,7 +168,7 @@
</goals>
<configuration>
<model>src/main/mdo/descriptor.mdo</model>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</configuration>
</execution>
<execution>
@@ -180,7 +180,7 @@
</goals>
<configuration>
<model>src/main/mdo/component.mdo</model>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</configuration>
</execution>
</executions>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt Wed Sep 20 15:17:38 2006
@@ -0,0 +1,2 @@
+clean
+assembly:directory-inline
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml Wed Sep 20 15:17:38 2006
@@ -0,0 +1,21 @@
+<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>
+ <groupId>test</groupId>
+ <artifactId>default-excludes-unspecified</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml Wed Sep 20 15:17:38 2006
@@ -0,0 +1,12 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/App.java?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/App.java Wed Sep 20 15:17:38 2006
@@ -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/file-sets/default-excludes-unspecified/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java Wed Sep 20 15:17:38 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/verify.bsh?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/default-excludes-unspecified/verify.bsh Wed Sep 20 15:17:38 2006
@@ -0,0 +1,10 @@
+import java.io.*;
+
+boolean result = true;
+
+String assemblyDir = "target/default-excludes-unspecified-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+
+result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
+result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
+
+return result;
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt Wed Sep 20 15:17:38 2006
@@ -0,0 +1,2 @@
+clean
+assembly:directory-inline
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml Wed Sep 20 15:17:38 2006
@@ -0,0 +1,21 @@
+<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>
+ <groupId>test</groupId>
+ <artifactId>dont-use-default-excludes</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml Wed Sep 20 15:17:38 2006
@@ -0,0 +1,13 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>false</useDefaultExcludes>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/App.java?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/App.java Wed Sep 20 15:17:38 2006
@@ -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/file-sets/dont-use-default-excludes/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java Wed Sep 20 15:17:38 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/verify.bsh?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/dont-use-default-excludes/verify.bsh Wed Sep 20 15:17:38 2006
@@ -0,0 +1,10 @@
+import java.io.*;
+
+boolean result = true;
+
+String assemblyDir = "target/dont-use-default-excludes-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+
+result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
+result = result && new File( basedir, assemblyDir + ".svn" ).exists();
+
+return result;
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt Wed Sep 20 15:17:38 2006
@@ -0,0 +1,2 @@
+clean
+assembly:directory-inline
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml Wed Sep 20 15:17:38 2006
@@ -0,0 +1,21 @@
+<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>
+ <groupId>test</groupId>
+ <artifactId>use-default-excludes</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml Wed Sep 20 15:17:38 2006
@@ -0,0 +1,13 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <directory>src</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/assembly/src.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/App.java?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/App.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/App.java Wed Sep 20 15:17:38 2006
@@ -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/file-sets/use-default-excludes/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java Wed Sep 20 15:17:38 2006
@@ -0,0 +1,38 @@
+package test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/verify.bsh?view=auto&rev=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/file-sets/use-default-excludes/verify.bsh Wed Sep 20 15:17:38 2006
@@ -0,0 +1,10 @@
+import java.io.*;
+
+boolean result = true;
+
+String assemblyDir = "target/use-default-excludes-1.0-SNAPSHOT-src.dir/src/main/assembly/";
+
+result = result && new File( basedir, assemblyDir + "src.xml" ).exists();
+result = result && !new File( basedir, assemblyDir + ".svn" ).exists();
+
+return result;
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?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- 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 Wed Sep 20 15:17:38 2006
@@ -222,16 +222,31 @@
return;
}
- List fileSets = sources.getFileSets();
+ List fileSets = new ArrayList();
- if ( fileSets == null || fileSets.isEmpty() )
+ if ( isDeprecatedModuleSourcesConfigPresent( sources ) )
+ {
+ FileSet fs = new FileSet();
+ fs.setOutputDirectory( sources.getOutputDirectory() );
+ fs.setIncludes( sources.getIncludes() );
+ fs.setExcludes( sources.getExcludes() );
+ fs.setUseDefaultExcludes( sources.isUseDefaultExcludes() );
+
+ fileSets.add( fs );
+ }
+
+ List subFileSets = sources.getFileSets();
+
+ if ( subFileSets == null || subFileSets.isEmpty() )
{
FileSet fs = new FileSet();
fs.setDirectory( "src" );
- fileSets = Collections.singletonList( fs );
+ subFileSets = Collections.singletonList( fs );
}
+ fileSets.addAll( subFileSets );
+
for ( Iterator j = moduleProjects.iterator(); j.hasNext(); )
{
MavenProject moduleProject = ( MavenProject ) j.next();
@@ -254,6 +269,43 @@
}
}
+ /**
+ * Determine whether the deprecated file-set configuration directly within the ModuleSources object is present.
+ */
+ protected boolean isDeprecatedModuleSourcesConfigPresent( ModuleSources sources )
+ {
+ boolean result = false;
+
+ if ( sources.getOutputDirectory() != null )
+ {
+ result = true;
+ }
+ else if ( sources.getIncludes() != null && !sources.getIncludes().isEmpty() )
+ {
+ result = true;
+ }
+ else if ( sources.getExcludes() != null && !sources.getExcludes().isEmpty() )
+ {
+ result = true;
+ }
+
+ if ( result )
+ {
+ getLogger().warn(
+ "[DEPRECATION] Use of <moduleSources/> as a file-set is deprecated. "
+ + "Please use the <fileSets/> sub-element of <moduleSources/> instead." );
+ }
+ else if ( !sources.isUseDefaultExcludes() )
+ {
+ getLogger().warn(
+ "[DEPRECATION] Use of directoryMode, fileMode, or useDefaultExcludes "
+ + "elements directly within <moduleSources/> are all deprecated. "
+ + "Please use the <fileSets/> sub-element of <moduleSources/> instead." );
+ }
+
+ return result;
+ }
+
protected FileSet createFileSet( FileSet fileSet, ModuleSources sources, MavenProject moduleProject )
throws AssemblyFormattingException
{
@@ -279,28 +331,28 @@
fs.setDirectory( sourcePath );
fs.setDirectoryMode( fileSet.getDirectoryMode() );
-
+
List excludes = new ArrayList();
-
+
List originalExcludes = fileSet.getExcludes();
if ( originalExcludes != null && !originalExcludes.isEmpty() )
{
excludes.addAll( originalExcludes );
}
-
+
if ( sources.isExcludeSubModuleDirectories() )
{
List modules = moduleProject.getModules();
for ( Iterator moduleIterator = modules.iterator(); moduleIterator.hasNext(); )
{
String moduleSubPath = ( String ) moduleIterator.next();
-
+
excludes.add( moduleSubPath + "/**" );
}
}
-
+
fs.setExcludes( excludes );
-
+
fs.setFileMode( fileSet.getFileMode() );
fs.setIncludes( fileSet.getIncludes() );
fs.setLineEnding( fileSet.getLineEnding() );
@@ -319,7 +371,7 @@
}
String destPath = fileSet.getOutputDirectory();
-
+
if ( destPath == null )
{
destPath = destPathPrefix;
@@ -329,8 +381,7 @@
destPath = destPathPrefix + destPath;
}
- destPath =
- AssemblyFormatUtils.getOutputDirectory( destPath, moduleProject, "" );
+ destPath = AssemblyFormatUtils.getOutputDirectory( destPath, moduleProject, "" );
fs.setOutputDirectory( destPath );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java Wed Sep 20 15:17:38 2006
@@ -76,6 +76,7 @@
task.setDirectoryMode( Integer.parseInt( repository.getDirectoryMode(), 8 ) );
task.setFileMode( Integer.parseInt( repository.getFileMode(), 8 ) );
+ task.setUseDefaultExcludes( repository.isUseDefaultExcludes() );
task.setOutputDirectory( outputDirectory );
task.execute( archiver, configSource );
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?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- 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 Wed Sep 20 15:17:38 2006
@@ -8,6 +8,7 @@
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.util.FileUtils;
public class AddDirectoryTask
implements ArchiverTask
@@ -17,6 +18,7 @@
private List includes;
private List excludes;
private String outputDirectory;
+ private boolean useDefaultExcludes = true;
private int directoryMode = -1;
private int fileMode = -1;
@@ -54,6 +56,11 @@
{
directoryExcludes = new ArrayList();
}
+
+ if ( useDefaultExcludes )
+ {
+ directoryExcludes.addAll( FileUtils.getDefaultExcludesAsList() );
+ }
try
{
@@ -104,6 +111,11 @@
public void setFileMode( int fileMode )
{
this.fileMode = fileMode;
+ }
+
+ public void setUseDefaultExcludes( boolean useDefaultExcludes )
+ {
+ this.useDefaultExcludes = useDefaultExcludes;
}
}
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?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- 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 Wed Sep 20 15:17:38 2006
@@ -119,6 +119,7 @@
task.setDirectoryMode( Integer.parseInt( fileSet.getDirectoryMode(), 8 ) );
task.setFileMode( Integer.parseInt( fileSet.getFileMode(), 8 ) );
+ task.setUseDefaultExcludes( fileSet.isUseDefaultExcludes() );
task.setExcludes( fileSet.getExcludes() );
task.setIncludes( fileSet.getIncludes() );
task.setOutputDirectory( destDirectory );
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?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Wed Sep 20 15:17:38 2006
@@ -50,11 +50,11 @@
<class rootElement="true" xml.tagName="component">
<name>Component</name>
<description>Describes the component layout and packaging.</description>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
<name>fileSets</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>FileSet</type>
<multiplicity>*</multiplicity>
@@ -69,7 +69,7 @@
</field>
<field>
<name>files</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>FileItem</type>
<multiplicity>*</multiplicity>
@@ -84,7 +84,7 @@
</field>
<field>
<name>dependencySets</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>DependencySet</type>
<multiplicity>*</multiplicity>
@@ -99,7 +99,7 @@
</field>
<field>
<name>repositories</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<association>
<type>Repository</type>
<multiplicity>*</multiplicity>
@@ -117,11 +117,22 @@
<class>
<name>SetBase</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
+ <name>useDefaultExcludes</name>
+ <version>1.1.0</version>
+ <type>boolean</type>
+ <defaultValue>true</defaultValue>
+ <description>
+ Whether standard exclusion patterns, such as those matching CVS and Subversion
+ metadata files, should be used when calculating the files affected by this set.
+ For backward compatibility, the default value is true.
+ </description>
+ </field>
+ <field>
<name>outputDirectory</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
Sets the output directory relative to the root
@@ -131,7 +142,7 @@
</field>
<field>
<name>includes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>String</type>
<multiplicity>*</multiplicity>
@@ -146,7 +157,7 @@
</field>
<field>
<name>excludes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>String</type>
<multiplicity>*</multiplicity>
@@ -161,7 +172,7 @@
</field>
<field>
<name>fileMode</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>0644</defaultValue>
<description>
@@ -176,7 +187,7 @@
</field>
<field>
<name>directoryMode</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>0755</defaultValue>
<description>
@@ -193,7 +204,7 @@
</class>
<class>
<name>FileSet</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<superClass>SetBase</superClass>
<description>
A fileSet allows the inclusion of groups of files into the assembly.
@@ -201,7 +212,7 @@
<fields>
<field>
<name>directory</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
Sets the absolute or relative location from the module's
@@ -212,7 +223,7 @@
</field>
<field>
<name>lineEnding</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
<![CDATA[
@@ -232,7 +243,7 @@
</class>
<class>
<name>FileItem</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
A file allows individual file inclusion with the option to change
the destination filename not supported by fileSets.
@@ -240,7 +251,7 @@
<fields>
<field>
<name>source</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<required>true</required>
<description>
@@ -250,7 +261,7 @@
</field>
<field>
<name>outputDirectory</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<required>false</required>
<description>
@@ -261,7 +272,7 @@
</field>
<field>
<name>destName</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
Sets the destination filename in the outputDirectory.
@@ -270,7 +281,7 @@
</field>
<field>
<name>fileMode</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>0644</defaultValue>
<description>
@@ -285,7 +296,7 @@
</field>
<field>
<name>lineEnding</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
<![CDATA[
@@ -303,7 +314,7 @@
</field>
<field>
<name>filtered</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>boolean</type>
<description>
Sets whether to determine if the file is filtered.
@@ -314,7 +325,7 @@
<class>
<name>DependencySet</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<superClass>SetBase</superClass>
<description>
A dependencySet allows inclusion and exclusion of project dependencies
@@ -323,7 +334,7 @@
<fields>
<field>
<name>outputFileNameMapping</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>${artifactId}-${version}.${extension}</defaultValue>
<description>
@@ -344,7 +355,7 @@
</field>
<field>
<name>scope</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>runtime</defaultValue>
<required>true</required>
@@ -358,13 +369,13 @@
<class>
<name>Repository</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<superClass>SetBase</superClass>
<description>Defines a Maven repository to be included in the assembly.</description>
<fields>
<field>
<name>includeMetadata</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -375,7 +386,7 @@
</field>
<field>
<name>groupVersionAlignments</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<description>Align a group to a version or an individual artifact.</description>
<association>
<type>GroupVersionAlignment</type>
@@ -384,7 +395,7 @@
</field>
<field>
<name>scope</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>String</type>
<defaultValue>runtime</defaultValue>
<required>true</required>
@@ -397,24 +408,24 @@
</class>
<class>
<name>GroupVersionAlignment</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<description>Defines a Maven repository to be included in the assembly.</description>
<fields>
<field>
<name>id</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>String</type>
<description>The groupId for which you want to align the versions.</description>
</field>
<field>
<name>version</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>String</type>
<description>The version you want to align this group to.</description>
</field>
<field>
<name>excludes</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<description>Artifact Ids of the artifacts you want excluded from version alignment.</description>
<association>
<type>String</type>
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?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Wed Sep 20 15:17:38 2006
@@ -63,11 +63,11 @@
a stand-alone application.
]]>
</description>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
<name>id</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<type>String</type>
<description>
@@ -80,7 +80,7 @@
</field>
<field>
<name>formats</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<required>true</required>
<association>
<type>String</type>
@@ -118,7 +118,7 @@
</field>
<field>
<name>baseDirectory</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>String</type>
<description>
Sets the base directory of the resulting assembly archive. If this is not
@@ -137,7 +137,7 @@
</field>
<field>
<name>moduleSets</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>ModuleSet</type>
<multiplicity>*</multiplicity>
@@ -152,7 +152,7 @@
</field>
<field>
<name>fileSets</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>FileSet</type>
<multiplicity>*</multiplicity>
@@ -167,7 +167,7 @@
</field>
<field>
<name>files</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>FileItem</type>
<multiplicity>*</multiplicity>
@@ -182,7 +182,7 @@
</field>
<field>
<name>dependencySets</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>DependencySet</type>
<multiplicity>*</multiplicity>
@@ -197,7 +197,7 @@
</field>
<field>
<name>repositories</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>Repository</type>
<multiplicity>*</multiplicity>
@@ -212,7 +212,7 @@
</field>
<field>
<name>componentDescriptors</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>String</type>
<multiplicity>*</multiplicity>
@@ -235,11 +235,22 @@
<class>
<name>SetBase</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
+ <name>useDefaultExcludes</name>
+ <version>1.1.0</version>
+ <type>boolean</type>
+ <defaultValue>true</defaultValue>
+ <description>
+ Whether standard exclusion patterns, such as those matching CVS and Subversion
+ metadata files, should be used when calculating the files affected by this set.
+ For backward compatibility, the default value is true.
+ </description>
+ </field>
+ <field>
<name>outputDirectory</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
Sets the output directory relative to the root
@@ -249,7 +260,7 @@
</field>
<field>
<name>includes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>String</type>
<multiplicity>*</multiplicity>
@@ -264,7 +275,7 @@
</field>
<field>
<name>excludes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<association>
<type>String</type>
<multiplicity>*</multiplicity>
@@ -279,7 +290,7 @@
</field>
<field>
<name>fileMode</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>0644</defaultValue>
<description>
@@ -294,7 +305,7 @@
</field>
<field>
<name>directoryMode</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>0755</defaultValue>
<description>
@@ -311,7 +322,7 @@
</class>
<class>
<name>FileSet</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<superClass>SetBase</superClass>
<description>
A fileSet allows the inclusion of groups of files into the assembly.
@@ -319,7 +330,7 @@
<fields>
<field>
<name>directory</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
Sets the absolute or relative location from the module's
@@ -330,7 +341,7 @@
</field>
<field>
<name>lineEnding</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
<![CDATA[
@@ -350,7 +361,7 @@
</class>
<class>
<name>FileItem</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
A file allows individual file inclusion with the option to change
the destination filename not supported by fileSets.
@@ -358,7 +369,7 @@
<fields>
<field>
<name>source</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<required>true</required>
<description>
@@ -368,7 +379,7 @@
</field>
<field>
<name>outputDirectory</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<required>false</required>
<description>
@@ -379,7 +390,7 @@
</field>
<field>
<name>destName</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
Sets the destination filename in the outputDirectory.
@@ -388,7 +399,7 @@
</field>
<field>
<name>fileMode</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>0644</defaultValue>
<description>
@@ -403,7 +414,7 @@
</field>
<field>
<name>lineEnding</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
<![CDATA[
@@ -421,7 +432,7 @@
</field>
<field>
<name>filtered</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>boolean</type>
<description>
Sets whether to determine if the file is filtered.
@@ -432,7 +443,7 @@
<class>
<name>DependencySet</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<superClass>SetBase</superClass>
<description>
A dependencySet allows inclusion and exclusion of project dependencies
@@ -441,7 +452,7 @@
<fields>
<field>
<name>outputFileNameMapping</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>${artifactId}-${version}.${extension}</defaultValue>
<description>
@@ -462,7 +473,7 @@
</field>
<field>
<name>scope</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>runtime</defaultValue>
<required>true</required>
@@ -487,11 +498,11 @@
assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.
]]>
</description>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<fields>
<field>
<name>includeSubModules</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -502,7 +513,7 @@
</field>
<field>
<name>includes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
<![CDATA[
This is a list of <include/> subelements, each containing a
@@ -518,7 +529,7 @@
</field>
<field>
<name>excludes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
<![CDATA[
This is a list of <exclude/> subelements, each containing a
@@ -533,7 +544,7 @@
</field>
<field>
<name>sources</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
When this is present, the plugin will include the source files of
the included modules from this set in the resulting assembly.
@@ -544,7 +555,7 @@
</field>
<field>
<name>binaries</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
When this is present, the plugin will include the binaries of the
included modules from this set in the resulting assembly.
@@ -558,7 +569,8 @@
<class>
<name>ModuleSources</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
+ <superClass>SetBase</superClass>
<description>
Contains configuration options for including the source files of a
project module in an assembly.
@@ -566,7 +578,7 @@
<fields>
<field>
<name>fileSets</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<association>
<type>FileSet</type>
<multiplicity>*</multiplicity>
@@ -580,7 +592,7 @@
</field>
<field>
<name>includeModuleDirectory</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -592,7 +604,7 @@
</field>
<field>
<name>excludeSubModuleDirectories</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>boolean</type>
<defaultValue>true</defaultValue>
<description>
@@ -607,7 +619,7 @@
</field>
<field>
<name>outputDirectoryMapping</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>String</type>
<defaultValue>${artifactId}</defaultValue>
<description>
@@ -621,7 +633,7 @@
<class>
<name>ModuleBinaries</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<superClass>SetBase</superClass>
<description>
Contains configuration options for including the binary files of a
@@ -630,7 +642,7 @@
<fields>
<field>
<name>includeDependencies</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -641,7 +653,7 @@
</field>
<field>
<name>dependencySets</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<association>
<type>DependencySet</type>
<multiplicity>*</multiplicity>
@@ -667,7 +679,7 @@
</field>
<field>
<name>outputFileNameMapping</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<defaultValue>${artifactId}-${version}.${extension}</defaultValue>
<description>
@@ -681,7 +693,7 @@
<class>
<name>Repository</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<superClass>SetBase</superClass>
<description>
<![CDATA[
@@ -698,7 +710,7 @@
<fields>
<field>
<name>includeMetadata</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>
@@ -709,7 +721,7 @@
</field>
<field>
<name>groupVersionAlignments</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
<![CDATA[
Specifies that you want to align a group of artifacts to a specified
@@ -724,7 +736,7 @@
</field>
<field>
<name>scope</name>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<type>String</type>
<defaultValue>runtime</defaultValue>
<required>true</required>
@@ -737,14 +749,14 @@
</class>
<class>
<name>GroupVersionAlignment</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
Allows a group of artifacts to be aligned to a specified version.
</description>
<fields>
<field>
<name>id</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
The groupId of the artifacts for which you want to align the
@@ -753,7 +765,7 @@
</field>
<field>
<name>version</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<type>String</type>
<description>
The version you want to align this group to.
@@ -761,7 +773,7 @@
</field>
<field>
<name>excludes</name>
- <version>1.0.0</version>
+ <version>1.0.0+</version>
<description>
<![CDATA[
When <exclude> subelements are present, they define the
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Wed Sep 20 15:17:38 2006
@@ -47,6 +47,56 @@
{
fileManager.cleanUp();
}
+
+ public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchOutputDir()
+ {
+ ModuleSources sources = new ModuleSources();
+ sources.setOutputDirectory( "outdir" );
+
+ ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+
+ assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
+ }
+
+ public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchInclude()
+ {
+ ModuleSources sources = new ModuleSources();
+ sources.addInclude( "**/included.txt" );
+
+ ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+
+ assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
+ }
+
+ public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchExclude()
+ {
+ ModuleSources sources = new ModuleSources();
+ sources.addExclude( "**/excluded.txt" );
+
+ ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+
+ assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
+ }
+
+ public void testIsDeprecatedModuleSourcesConfigPresent_ShouldNotCatchFileMode()
+ {
+ ModuleSources sources = new ModuleSources();
+ sources.setFileMode( "777" );
+
+ ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+
+ assertFalse( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
+ }
+
+ public void testIsDeprecatedModuleSourcesConfigPresent_ShouldNotCatchDirMode()
+ {
+ ModuleSources sources = new ModuleSources();
+ sources.setDirectoryMode( "777" );
+
+ ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+
+ assertFalse( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
+ }
public void testCreateFileSet_ShouldUseModuleDirOnlyWhenOutDirIsNull()
throws AssemblyFormattingException
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?view=diff&rev=448368&r1=448367&r2=448368
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Wed Sep 20 15:17:38 2006
@@ -14,6 +14,7 @@
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.FileUtils;
import org.easymock.MockControl;
import java.io.File;
@@ -91,7 +92,7 @@
File outDir = new File( tempRoot, "out" );
macArchiver.expectModeChange( -1, -1, mode, mode, true );
- macArchiver.expectAddDirectory( outDir, "out/", null, new String[0] );
+ macArchiver.expectAddDirectory( outDir, "out/", null, FileUtils.getDefaultExcludes() );
macRepo.expectAssemble( outDir, repo, macCS.configSource );