svn commit: r568668 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

[jd...@apache.org]

Author: jdcasey
Date: Wed Aug 22 09:00:29 2007
New Revision: 568668

URL: http://svn.apache.org/viewvc?rev=568668&view=rev
Log:
Fixing unit test for new debug output (still making these things more resilient to this sort of change), and disabling the custom componentDescriptorHandler stuff until I can get it to build in maven 2.0.x.

Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
    maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=568668&r1=568667&r2=568668&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Aug 22 09:00:29 2007
@@ -342,6 +342,10 @@
                     <pomExclude>**/descriptor/pom.xml</pomExclude>
                     <pomExclude>**/handler-def/pom.xml</pomExclude>
                     <pomExclude>**/assembly/pom.xml</pomExclude>
+                    
+                    <!-- MASSEMBLY-233 -->
+                    <pomExclude>**/container-descriptors/**</pomExclude>
+                    
                   </pomExcludes>
                   <postBuildHookScript>verify.bsh</postBuildHookScript>
                   <localRepositoryPath>${project.build.directory}/local-repository</localRepositoryPath>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=568668&r1=568667&r2=568668&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Wed Aug 22 09:00:29 2007
@@ -91,7 +91,7 @@
                                                                   null, finalName );
             }
 
-            List containerHandlers = createContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers() );
+            List containerHandlers = selectContainerDescriptorHandlers( assembly.getContainerDescriptorHandlers() );
 
             Archiver archiver = createArchiver( format, assembly.isIncludeBaseDirectory(), basedir, configSource,
                                                 containerHandlers );
@@ -123,9 +123,14 @@
         return destFile;
     }
 
-    private List createContainerDescriptorHandlers( List requestedContainerDescriptorHandlers )
+    private List selectContainerDescriptorHandlers( List requestedContainerDescriptorHandlers )
         throws InvalidAssemblerConfigurationException
     {
+        getLogger().debug(
+                           "All known ContainerDescritporHandler components: "
+                                           + ( containerDescriptorHandlers == null ? "none; map is null."
+                                                           : "" + containerDescriptorHandlers.keySet() ) );
+
         if ( requestedContainerDescriptorHandlers == null )
         {
             requestedContainerDescriptorHandlers = new ArrayList();

Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=568668&r1=568667&r2=568668&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Wed Aug 22 09:00:29 2007
@@ -19,6 +19,7 @@
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.collections.ActiveCollectionManager;
 import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.FileUtils;
 import org.easymock.ArgumentsMatcher;
 import org.easymock.MockControl;
@@ -411,10 +412,12 @@
     {
         DefaultAssemblyArchiver subject = new DefaultAssemblyArchiver( macMgr.archiverManager, macMgr.collectionManager, phases );
 
-        if ( logger != null )
+        if ( logger == null )
         {
-            subject.enableLogging( logger );
+            logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
         }
+
+        subject.enableLogging( logger );
 
         return subject;
     }