maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r525327 - in /maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src: it/dependency-sets/dependencySet-unpackedExcludingMetaInf/ it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/ it/dependency-sets/dependencySet-unpackedExc...
Date Tue, 03 Apr 2007 23:19:31 GMT
Author: jdcasey
Date: Tue Apr  3 16:19:29 2007
New Revision: 525327

URL: http://svn.apache.org/viewvc?view=rev&rev=525327
Log:
Rolling fix for MASSEMBLY-155 back in, from revId 523436.

Added:
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/pom.xml
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/App.java
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/main/java/test/App.java
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child1/src/test/java/test/AppTest.java
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/pom.xml
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/assemble/bin.xml
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/App.java
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/main/java/test/App.java
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/
      - copied from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/child2/src/test/java/test/AppTest.java
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/goals.txt
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/goals.txt
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/pom.xml
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh
      - copied unchanged from r523436, maven/plugins/trunk/maven-assembly-plugin/src/it/dependency-sets/dependencySet-unpackedExcludingMetaInf/verify.bsh
Modified:
    maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java

Modified: maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?view=diff&rev=525327&r1=525326&r2=525327
==============================================================================
--- maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
(original)
+++ maven/plugins/tags/maven-assembly-plugin-2.2-beta-1/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
Tue Apr  3 16:19:29 2007
@@ -10,6 +10,7 @@
 import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
 import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
 import org.apache.maven.plugin.assembly.model.DependencySet;
+import org.apache.maven.plugin.assembly.model.UnpackOptions;
 import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
 import org.apache.maven.plugin.assembly.utils.FilterUtils;
 import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
@@ -128,6 +129,13 @@
                 task.setDirectoryMode( dependencySet.getDirectoryMode() );
                 task.setFileMode( dependencySet.getFileMode() );
                 task.setUnpack( dependencySet.isUnpack() );
+
+                UnpackOptions opts = dependencySet.getUnpackOptions();
+                if ( dependencySet.isUnpack() && opts != null )
+                {
+                    task.setIncludes( opts.getIncludes() );
+                    task.setExcludes( opts.getExcludes() );
+                }
 
                 task.execute( archiver, configSource );
             }



Mime
View raw message