svn commit: r558185 - in /maven/plugins/trunk/maven-assembly-plugin: maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java

[jd...@apache.org]

Author: jdcasey
Date: Fri Jul 20 15:41:25 2007
New Revision: 558185

URL: http://svn.apache.org/viewvc?view=rev&rev=558185
Log:
Adding null check to the manifest finalizer, and removing the classifiers in the assembly-artifact-types, since it's only used on the resolve side (not the install/deploy side, when the descriptor is the main project artifact)...which only confuses things.

Modified:
    maven/plugins/trunk/maven-assembly-plugin/maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java

Modified: maven/plugins/trunk/maven-assembly-plugin/maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=558185&r1=558184&r2=558185
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/maven-assembly-artifact-types/src/main/resources/META-INF/plexus/components.xml Fri Jul 20 15:41:25 2007
@@ -5,7 +5,6 @@
       <role-hint>assembly-component</role-hint>
       <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
       <configuration>
-        <classifier>assembly-component</classifier>
         <packaging>assembly-component</packaging>
         <extension>xml</extension>
         <type>assembly-component</type>
@@ -37,7 +36,6 @@
       <role-hint>assembly-descriptor</role-hint>
       <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
       <configuration>
-        <classifier>assembly-descriptor</classifier>
         <packaging>assembly-descriptor</packaging>
         <extension>xml</extension>
         <type>assembly-descriptor</type>
@@ -53,13 +51,13 @@
         <lifecycles>
           <lifecycle>
             <id>default</id>
-            <!-- START SNIPPET: assembly-component-lifecycle -->
+            <!-- START SNIPPET: assembly-descriptor-lifecycle -->
             <phases>
               <package>org.apache.maven.plugins:maven-assembly-plugin:attach-assembly-descriptor</package>
               <install>org.apache.maven.plugins:maven-install-plugin:install</install>
               <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
             </phases>
-            <!-- END SNIPPET: assembly-component-lifecycle -->
+            <!-- END SNIPPET: assembly-descriptor-lifecycle -->
           </lifecycle>
         </lifecycles>
       </configuration>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?view=diff&rev=558185&r1=558184&r2=558185
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java Fri Jul 20 15:41:25 2007
@@ -22,7 +22,7 @@
 public class ManifestCreationFinalizer
     extends AbstractArchiveFinalizer
 {
-    
+
     private final MavenProject project;
     private final MavenArchiveConfiguration archiveConfiguration;
 
@@ -75,7 +75,7 @@
                     manifest = mavenArchiver.getManifest( project, archiveConfiguration );
                 }
 
-                if ( manifest != null && ( archiver instanceof JarArchiver ) )
+                if ( ( manifest != null ) && ( archiver instanceof JarArchiver ) )
                 {
                     JarArchiver jarArchiver = (JarArchiver) archiver;
                     jarArchiver.addConfiguredManifest( manifest );
@@ -94,20 +94,23 @@
 
     public List getVirtualFiles()
     {
-        try
+        if ( archiveConfiguration != null )
         {
-            if ( mavenArchiver.getManifest( project, archiveConfiguration.getManifest() ) != null )
+            try
+            {
+                if ( mavenArchiver.getManifest( project, archiveConfiguration.getManifest() ) != null )
+                {
+                    return Collections.singletonList( "META-INF/MANIFEST.MF" );
+                }
+            }
+            catch ( ManifestException e )
+            {
+            }
+            catch ( DependencyResolutionRequiredException e )
             {
-                return Collections.singletonList( "META-INF/MANIFEST.MF" );
             }
         }
-        catch ( ManifestException e )
-        {
-        }
-        catch ( DependencyResolutionRequiredException e )
-        {
-        }
-        
+
         return null;
     }