geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r425286 - in /geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main: java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java resources/META-INF/plexus/components.xml
Date Tue, 25 Jul 2006 05:20:22 GMT
Author: jdillon
Date: Mon Jul 24 22:20:22 2006
New Revision: 425286

URL: http://svn.apache.org/viewvc?rev=425286&view=rev
Log:
Rename goal car:dependencies to car:prepare-plan
Change car:prepare-plan to run from compile phase and enable resources plugin for prepare-resources
phase

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java?rev=425286&r1=425285&r2=425286&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PlanProcessorMojo.java
Mon Jul 24 22:20:22 2006
@@ -46,13 +46,13 @@
 import org.apache.xmlbeans.XmlOptions;
 
 //
-// TODO: Rename to DependenciesMojo, or preprocess-plan (or prepare)
+// TODO: Rename to PreparePlanMojo
 //
 
 /**
  * Add dependencies to a plan and process with velocity
  * 
- * @goal dependencies
+ * @goal prepare-plan
  *
  * @version $Rev$ $Date$
  */

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=425286&r1=425285&r2=425286&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Mon Jul 24 22:20:22 2006
@@ -10,7 +10,8 @@
             <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
             <configuration>
                 <phases>
-                    <process-resources>org.apache.geronimo.plugins:car-maven-plugin:dependencies</process-resources>
+                    <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>
                 </phases>



Mime
View raw message