You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/05/28 21:12:03 UTC
svn commit: r779728 - in
/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src:
it/projects/descriptor-refs/bin/jars-in-archive-root/
it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/
it/projects/descriptor-refs/jar...
Author: jdcasey
Date: Thu May 28 19:12:01 2009
New Revision: 779728
URL: http://svn.apache.org/viewvc?rev=779728&view=rev
Log:
[MASSEMBLY-416] Fixing standard descriptors, along with processing of project paths during the descriptor interpolation process to ensure that ${project.basedir}/src doesn't interpolate to /src.
Added:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh (with props)
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/bin.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/jar-with-dependencies.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/project.xml
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/src.xml
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/bin/jars-in-archive-root/pom.xml Thu May 28 19:12:01 2009
@@ -1,5 +1,11 @@
<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>jars-in-archive-root</artifactId>
<packaging>jar</packaging>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/pom.xml Thu May 28 19:12:01 2009
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>component-descriptors-merged</artifactId>
<packaging>pom</packaging>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml Thu May 28 19:12:01 2009
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
<packaging>pom</packaging>
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt Thu May 28 19:12:01 2009
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>jar-with-dependencies-no-target-dir</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,20 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <unpack>true</unpack>
+ <outputDirectory>${artifact.artifactId}</outputDirectory>
+ <scope>test</scope>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/assemble/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh Thu May 28 19:12:01 2009
@@ -0,0 +1,46 @@
+import java.io.*;
+import java.net.*;
+import java.util.jar.*;
+
+boolean result = true;
+
+try
+{
+ System.out.println( "Creating JarFile java.io.File." );
+
+ File jarFile = new File( basedir, "target/jar-with-dependencies-no-target-dir-1.0-SNAPSHOT-jar-with-dependencies.jar" );
+
+ System.out.println( "Checking for existence and file-ishness of: " + jarFile );
+
+ if ( !jarFile.exists() || jarFile.isDirectory() )
+ {
+ System.err.println( "jar file is missing or a directory." );
+ return false;
+ }
+
+ System.out.println( "Creating JarFile instance." );
+
+ JarFile jf = new JarFile( jarFile );
+
+ if ( jf.getEntry( "test/App.class" ) == null )
+ {
+ System.err.println( "App class is missing." );
+ result = false;
+ }
+
+ System.out.println( "Looking for absence of 'target/classes/test/App.class' jar entry." );
+
+ if ( jf.getEntry( "target/classes/test/App.class" ) != null )
+ {
+ System.err.println( "target directory should not be present." );
+ result = false;
+ }
+
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/multimodule-sources-copied/pom.xml Thu May 28 19:12:01 2009
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>multimodule-sources-copied</artifactId>
<packaging>pom</packaging>
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>multimodule-sources-copied</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child1/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>multimodule-sources-copied</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt Thu May 28 19:12:01 2009
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>multimodule-sources-copied</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh Thu May 28 19:12:01 2009
@@ -0,0 +1,133 @@
+import java.io.*;
+import java.net.*;
+import java.util.zip.*;
+
+boolean result = true;
+
+String basename = "multimodule-sources-copied-1.0-SNAPSHOT";
+
+try
+{
+ File zipFile = new File( basedir, "target/" + basename + "-project.zip" );
+
+ System.out.println( "Checking for existence and file-ishness of: " + zipFile );
+
+ if ( !zipFile.exists() || zipFile.isDirectory() )
+ {
+ System.err.println( "zip file is missing or a directory." );
+ return false;
+ }
+
+ System.out.println( "Creating zipFile instance." );
+
+ ZipFile zf = new ZipFile( zipFile );
+
+ String childPath = basename + "/child1";
+
+ System.out.println( "Checking child1 project files..." );
+
+ System.out.println( "Looking for project source file." );
+
+ ZipEntry je = zf.getEntry( childPath + "/src/main/java/test/App.java" );
+
+ if ( je == null )
+ {
+ System.out.println( childPath + " source file missing." );
+ result = false;
+ }
+
+ System.out.println( "Looking for project test-source file." );
+
+ je = null;
+ je = zf.getEntry( childPath + "/src/test/java/test/AppTest.java" );
+
+ if ( je == null )
+ {
+ System.out.println( childPath + " test-source file missing." );
+ result = false;
+ }
+
+ System.out.println( "Looking for pom.xml file." );
+
+ je = null;
+ je = zf.getEntry( childPath + "/pom.xml" );
+
+ if ( je == null )
+ {
+ System.out.println( childPath + " POM missing." );
+ result = false;
+ }
+
+ je = null;
+ je = zf.getEntry( childPath + "/target/child1-1.0-SNAPSHOT.jar" );
+
+ if ( je != null )
+ {
+ System.out.println( childPath + " target directory should not be included." );
+ result = false;
+ }
+
+ childPath = basename + "/child2";
+
+ System.out.println( "Checking child2 project files..." );
+
+ System.out.println( "Looking for project source file." );
+
+ je = null;
+ je = zf.getEntry( childPath + "/src/main/java/test/App.java" );
+
+ if ( je == null )
+ {
+ System.out.println( childPath + " source file missing." );
+ result = false;
+ }
+
+ System.out.println( "Looking for project test-source file." );
+
+ je = null;
+ je = zf.getEntry( childPath + "/src/test/java/test/AppTest.java" );
+
+ if ( je == null )
+ {
+ System.out.println( childPath + " test-source file missing." );
+ result = false;
+ }
+
+ System.out.println( "Looking for pom.xml file." );
+
+ je = null;
+ je = zf.getEntry( childPath + "/pom.xml" );
+
+ if ( je == null )
+ {
+ System.out.println( childPath + " POM missing." );
+ result = false;
+ }
+
+ je = null;
+ je = zf.getEntry( childPath + "/target/child2-1.0-SNAPSHOT.jar" );
+
+ if ( je != null )
+ {
+ System.out.println( childPath + " target directory should not be included." );
+ result = false;
+ }
+
+ System.out.println( "Looking for main pom.xml file." );
+
+ je = null;
+ je = zf.getEntry( basename + "/pom.xml" );
+
+ if ( je == null )
+ {
+ System.out.println( "project POM missing." );
+ result = false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace( System.out );
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt Thu May 28 19:12:01 2009
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,44 @@
+<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>no-target-dir</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh Thu May 28 19:12:01 2009
@@ -0,0 +1,41 @@
+import java.io.*;
+import java.net.*;
+import java.util.zip.*;
+
+boolean result = true;
+
+String basename = "no-target-dir-1.0-SNAPSHOT";
+
+try
+{
+ File zipFile = new File( basedir, "target/" + basename + "-project.zip" );
+
+ System.out.println( "Checking for existence and file-ishness of: " + zipFile );
+
+ if ( !zipFile.exists() || zipFile.isDirectory() )
+ {
+ System.err.println( "zip file is missing or a directory." );
+ return false;
+ }
+
+ System.out.println( "Creating zipFile instance." );
+
+ ZipFile zf = new ZipFile( zipFile );
+
+ System.out.println( "Looking for project classes." );
+
+ ZipEntry je = zf.getEntry( basename + "/target/classes/test/App.java" );
+
+ if ( je != null )
+ {
+ System.out.println( "project classes should not be included." );
+ result = false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace( System.out );
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/no-target-dir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/project/sources-copied/pom.xml Thu May 28 19:12:01 2009
@@ -1,5 +1,11 @@
<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>sources-copied</artifactId>
<packaging>jar</packaging>
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt Thu May 28 19:12:01 2009
@@ -0,0 +1 @@
+package
\ No newline at end of file
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml Thu May 28 19:12:01 2009
@@ -0,0 +1,44 @@
+<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>no-target-dir</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/main/java/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java Thu May 28 19:12:01 2009
@@ -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/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh?rev=779728&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh Thu May 28 19:12:01 2009
@@ -0,0 +1,41 @@
+import java.io.*;
+import java.net.*;
+import java.util.zip.*;
+
+boolean result = true;
+
+String basename = "no-target-dir-1.0-SNAPSHOT";
+
+try
+{
+ File zipFile = new File( basedir, "target/" + basename + "-src.zip" );
+
+ System.out.println( "Checking for existence and file-ishness of: " + zipFile );
+
+ if ( !zipFile.exists() || zipFile.isDirectory() )
+ {
+ System.err.println( "zip file is missing or a directory." );
+ return false;
+ }
+
+ System.out.println( "Creating zipFile instance." );
+
+ ZipFile zf = new ZipFile( zipFile );
+
+ System.out.println( "Looking for project classes." );
+
+ ZipEntry je = zf.getEntry( basename + "/target/classes/test/App.class" );
+
+ if ( je != null )
+ {
+ System.out.println( "project classes should not be present." );
+ result = false;
+ }
+}
+catch( IOException e )
+{
+ e.printStackTrace( System.out );
+ result = false;
+}
+
+return result;
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/no-target-dir/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/descriptor-refs/src/src-dir-copied/pom.xml Thu May 28 19:12:01 2009
@@ -1,11 +1,16 @@
<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>test</groupId>
<artifactId>src-dir-copied</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Maven Quick Start Archetype</name>
- <url>http://maven.apache.org</url>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -14,6 +19,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java Thu May 28 19:12:01 2009
@@ -21,6 +21,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
@@ -105,11 +106,49 @@
String[] includesArray = null;
if ( includes != null && !includes.isEmpty() )
{
- includesArray = (String[]) includes.toArray( new String[0] );
+ includesArray = new String[includes.size()];
+
+ int i = 0;
+ for ( Iterator it = includes.iterator(); it.hasNext(); )
+ {
+ String value = (String) it.next();
+ if ( value.startsWith( "./" ) || value.startsWith( ".\\" ) )
+ {
+ value = value.substring( 2 );
+ }
+
+ if ( value.startsWith( "/" ) || value.startsWith( "\\" ) )
+ {
+ value = value.substring( 1 );
+ }
+
+ includesArray[i] = value;
+
+ i++;
+ }
}
// this one is guaranteed to be non-null by code above.
- String[] excludesArray = (String[]) directoryExcludes.toArray( new String[0] );
+ String[] excludesArray = new String[directoryExcludes.size()];
+
+ int i = 0;
+ for ( Iterator it = directoryExcludes.iterator(); it.hasNext(); )
+ {
+ String value = (String) it.next();
+ if ( value.startsWith( "./" ) || value.startsWith( ".\\" ) )
+ {
+ value = value.substring( 2 );
+ }
+
+ if ( value.startsWith( "/" ) || value.startsWith( "\\" ) )
+ {
+ value = value.substring( 1 );
+ }
+
+ excludesArray[i] = value;
+
+ i++;
+ }
DefaultFileSet fs = new DefaultFileSet();
fs.setUsingDefaultExcludes( useDefaultExcludes );
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Thu May 28 19:12:01 2009
@@ -173,7 +173,7 @@
{
String sourceDirectory = fileSet.getDirectory();
- if ( sourceDirectory == null )
+ if ( sourceDirectory == null || sourceDirectory.trim().length() < 1 )
{
sourceDirectory = basedir.getAbsolutePath();
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Thu May 28 19:12:01 2009
@@ -79,10 +79,10 @@
}
}
-// if ( path.length() == 0 )
-// {
-// path = ".";
-// }
+ if ( path.length() == 0 )
+ {
+ path = ".";
+ }
}
if ( !new File( path ).isAbsolute() )
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java Thu May 28 19:12:01 2009
@@ -233,6 +233,8 @@
value = StringUtils.replace( value, "//", "/" );
value = StringUtils.replace( value, "\\\\", "\\" );
+ value = StringUtils.replace( value, "./", "" );
+ value = StringUtils.replace( value, ".\\", "" );
return value;
}
@@ -423,6 +425,8 @@
value = StringUtils.replace( value, "//", "/" );
value = StringUtils.replace( value, "\\\\", "\\" );
+ value = StringUtils.replace( value, "./", "" );
+ value = StringUtils.replace( value, ".\\", "" );
return value;
}
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/bin.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/bin.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/bin.xml Thu May 28 19:12:01 2009
@@ -27,18 +27,24 @@
</formats>
<fileSets>
<fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
- <include>${project.basedir}/README*</include>
- <include>${project.basedir}/LICENSE*</include>
- <include>${project.basedir}/NOTICE*</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
</includes>
</fileSet>
- <!-- TODO: docs? -->
<fileSet>
<directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/jar-with-dependencies.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/jar-with-dependencies.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/jar-with-dependencies.xml Thu May 28 19:12:01 2009
@@ -35,6 +35,7 @@
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/project.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/project.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/project.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/project.xml Thu May 28 19:12:01 2009
@@ -28,8 +28,10 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
+ <exclude>**/*.log</exclude>
<exclude>**/${project.build.directory}/**</exclude>
</excludes>
</fileSet>
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/src.xml?rev=779728&r1=779727&r2=779728&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/src.xml (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/resources/assemblies/src.xml Thu May 28 19:12:01 2009
@@ -27,11 +27,12 @@
</formats>
<fileSets>
<fileSet>
+ <directory>${project.basedir}</directory>
<includes>
- <include>${project.basedir}/README*</include>
- <include>${project.basedir}/LICENSE*</include>
- <include>${project.basedir}/NOTICE*</include>
- <include>${project.basedir}/pom.xml</include>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>pom.xml</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>