maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r453074 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/dependency-sets/dependencySet-withExecutedProject/ src/it/descriptor-refs/ src/it/descriptor-refs/jar-with-dependencies/ src/it/descriptor-refs/jar-with-dependencies/deps-un...
Date Thu, 05 Oct 2006 00:52:10 GMT
Author: jdcasey
Date: Wed Oct  4 17:52:07 2006
New Revision: 453074

URL: http://svn.apache.org/viewvc?view=rev&rev=453074
Log:
Fixing jar-with-dependencies descriptorRef, and adding IT to verify that it's correct.

Added:
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
  (with props)
    maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-withExecutedProject/goals.txt
    maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml

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=453074&r1=453073&r2=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct  4 17:52:07 2006
@@ -291,7 +291,7 @@
       <artifactId>maven-archiver</artifactId>
       <version>2.2</version>
     </dependency>
-    <!-- FIXME: upgrade to p-u 1.3 when available, to fix
+    <!-- FIXME: upgrade to p-u 1.4 when available, to fix
          workaround in DefaultAssemblyReader for NPE caused
          by DirectoryScanner.scandir(..) and UnixFileSystem's
          implementation of File.list().
@@ -299,7 +299,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.3-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-withExecutedProject/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-withExecutedProject/goals.txt?view=diff&rev=453074&r1=453073&r2=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-withExecutedProject/goals.txt
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-withExecutedProject/goals.txt
Wed Oct  4 17:52:07 2006
@@ -1 +1 @@
-package
+install

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
Wed Oct  4 17:52:07 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><project>
+  <parent>
+    <artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
+    <groupId>test</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>test</groupId>
+  <artifactId>child1</artifactId>
+  <name>Maven Quick Start Archetype</name>
+  <version>1.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
Wed Oct  4 17:52:07 2006
@@ -0,0 +1,13 @@
+package test;
+
+/**
+ * Hello world!
+ *
+ */
+public class AppChild1 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child1/src/main/java/test/AppChild1.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
Wed Oct  4 17:52:07 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0"?><project>
+  <parent>
+    <artifactId>jar-with-dependencies-unpacked-to-root-dir</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>test</groupId>
+      <artifactId>child1</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <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>attach-binary-assembly</id>
+            <phase>package</phase>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+            </configuration>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
Wed Oct  4 17:52:07 2006
@@ -0,0 +1,21 @@
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <includes>
+        <include>test:child1</include>
+      </includes>
+      <unpack>true</unpack>
+      <outputDirectory>/</outputDirectory>
+      <outputFileNameMapping>${artifactId}</outputFileNameMapping>
+      <scope>test</scope>
+      <excludes>
+        <exclude>junit:junit</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
Wed Oct  4 17:52:07 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/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/main/java/test/App.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
Wed Oct  4 17:52:07 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/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/child2/src/test/java/test/AppTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt
Wed Oct  4 17:52:07 2006
@@ -0,0 +1 @@
+package
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/goals.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
Wed Oct  4 17:52:07 2006
@@ -0,0 +1,13 @@
+<?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>
+  <groupId>test</groupId>
+  <artifactId>jar-with-dependencies-unpacked-to-root-dir</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0-SNAPSHOT</version>
+  
+  <modules>
+    <module>child1</module>
+    <module>child2</module>
+  </modules>
+</project>

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh?view=auto&rev=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
(added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
Wed Oct  4 17:52:07 2006
@@ -0,0 +1,48 @@
+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, "child2/target/child2-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 );
+    
+    System.out.println( "Looking for 'test/AppChild1.class' jar entry." );
+    
+    if ( jf.getEntry( "test/AppChild1.class" ) == null )
+    {
+        System.err.println( "child1 class is missing." );
+        result = false;
+    }
+    
+    System.out.println( "Looking for absence of 'junit/' jar entry." );
+    
+    if ( jf.getEntry( "junit/framework/TestCase.class" ) != null )
+    {
+        System.err.println( "junit jar should not be present." );
+        result = false;
+    }
+    
+}
+catch( IOException e )
+{
+    e.printStackTrace();
+    result = false;
+}
+
+return result;

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt?view=diff&rev=453074&r1=453073&r2=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/forking-tests/assembly-assembly-with-module-binaries/goals.txt
Wed Oct  4 17:52:07 2006
@@ -1 +1 @@
-package assembly:assembly
+install assembly:assembly

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?view=diff&rev=453074&r1=453073&r2=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
Wed Oct  4 17:52:07 2006
@@ -53,7 +53,7 @@
 
         if ( unpack )
         {
-            if ( !outputLocation.endsWith( "/" ) )
+            if ( outputLocation.length() > 0 && !outputLocation.endsWith( "/"
) )
             {
                 outputLocation += "/";
             }

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml?view=diff&rev=453074&r1=453073&r2=453074
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
Wed Oct  4 17:52:07 2006
@@ -25,7 +25,8 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory></outputDirectory>
+      <outputFileNameMapping></outputFileNameMapping>
       <unpack>true</unpack>
       <scope>runtime</scope>
     </dependencySet>



Mime
View raw message