geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r463096 - in /geronimo/server/trunk: maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml pom.xml
Date Thu, 12 Oct 2006 01:17:41 GMT
Author: jdillon
Date: Wed Oct 11 18:17:40 2006
New Revision: 463096

URL: http://svn.apache.org/viewvc?view=rev&rev=463096
Log:
Disable the geronimo-module packaging lifecycle and artifact handlers for now...
for some reason these components are messing with the artifact handlers defined in the
tools-maven-plugin... pending more help from #maven to know exactly why

Modified:
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=463096&r1=463095&r2=463096
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Wed Oct 11 18:17:40 2006
@@ -31,19 +31,30 @@
             <role-hint>car</role-hint>
             <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
             <configuration>
-                <phases>
-                    <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-                    <compile>org.apache.geronimo.plugins:car-maven-plugin:prepare-plan</compile>
-                    <package>org.apache.geronimo.plugins:car-maven-plugin:package</package>
-                    <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-                    <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-                </phases>
+                <lifecycles>
+                    <lifecycle>
+                        <id>default</id>
+                        <phases>
+                            <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+                            <compile>org.apache.geronimo.plugins:car-maven-plugin:prepare-plan</compile>
+                            <package>org.apache.geronimo.plugins:car-maven-plugin:package</package>
+                            <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+                            <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+                        </phases>
+                    </lifecycle>
+                </lifecycles>
             </configuration>
         </component>
         
         <!--
+        FIXME: For some crazy reason, when the following are enabled it causes other packagings
+               picked up from tools-maven-plugin to now configure their artifact handlers?!?!!
+        -->
+        
+        <!--
         Custom packaging for geronimo modules.
         -->
+        <!--
         <component>
             <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
             <role-hint>geronimo-module</role-hint>
@@ -63,10 +74,12 @@
                 </lifecycles>
             </configuration>
         </component>
+        -->
         
         <!--
         Install geronimo-module artifact files as .car files
         -->
+        <!--
         <component>
             <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
             <role-hint>geronimo-module</role-hint>
@@ -79,6 +92,7 @@
                 <language>java</language>
             </configuration>
         </component>
+        -->
         
     </components>
 </component-set>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=463096&r1=463095&r2=463096
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Oct 11 18:17:40 2006
@@ -1060,9 +1060,9 @@
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
 
-                <!-- Tools includes custom packagings, install as extention to pick them
up -->
+                <!-- Tools includes custom packagings, install as extension to pick them
up -->
                 <extensions>true</extensions>
-
+                
                 <executions>
                     <execution>
                         <id>validate-java-version</id>
@@ -1170,7 +1170,7 @@
                 <module>assemblies</module>
             </modules>
         </profile>
-
+        
         <!--
         NOTE: This profile is used to enable plugin prefixes for easy command-line usage,
as in:
 
@@ -1266,11 +1266,11 @@
                 <module>modules</module>
                 <module>maven-plugins</module>
                 <module>applications</module>
-
+                <module>configs</module>
+                
                 <!--
                 NOTE: Probably do not want to publish these to the repo...  Or do we?
 
-                <module>configs</module>
                 <module>assemblies</module>
                 -->
             </modules>



Mime
View raw message