You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2006/08/25 12:39:11 UTC

svn commit: r436749 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java src/main/resources/META-INF/plexus/components.xml

Author: evenisse
Date: Fri Aug 25 03:39:10 2006
New Revision: 436749

URL: http://svn.apache.org/viewvc?rev=436749&view=rev
Log:
Fix plexus component descriptor generation

Modified:
    maven/plugins/trunk/maven-assembly-plugin/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=436749&r1=436748&r2=436749&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Aug 25 03:39:10 2006
@@ -101,9 +101,21 @@
         <executions>
           <execution>
             <id>create-component-descriptor</id>
-            <phase>generate-resources</phase>
             <goals>
               <goal>descriptor</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>merge</id>
+            <configuration>
+              <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
+              <descriptors>
+                <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+                <descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <goals>
+              <goal>merge-descriptors</goal>
             </goals>
           </execution>
         </executions>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java?rev=436749&r1=436748&r2=436749&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java Fri Aug 25 03:39:10 2006
@@ -3,7 +3,6 @@
 import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
 
 /**
- * @plexus.component role="org.codehaus.plexus.archiver.UnArchiver" role-hint="sar"
  * @author jdcasey
  * @todo delete this class once the plexus maven plugin can merge a generated components.xml with an existing one.
  */

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml?rev=436749&r1=436748&r2=436749&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/META-INF/plexus/components.xml Fri Aug 25 03:39:10 2006
@@ -21,12 +21,6 @@
     <!-- UnArchiver -->
     <component>
       <role>org.codehaus.plexus.archiver.UnArchiver</role>
-      <role-hint>pom</role-hint>
-      <implementation>org.apache.maven.plugin.assembly.archive.archiver.NoOpUnArchiver</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.archiver.UnArchiver</role>
       <role-hint>sar</role-hint>
       <implementation>org.codehaus.plexus.archiver.zip.ZipUnArchiver</implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>