geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421764 - in /geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin: ./ src/java/org/apache/geronimo/plugin/assembly/ src/resources/META-INF/plexus/
Date Fri, 14 Jul 2006 00:32:12 GMT
Author: jdillon
Date: Thu Jul 13 17:32:11 2006
New Revision: 421764

URL: http://svn.apache.org/viewvc?rev=421764&view=rev
Log:
Include packaging + assembly bits that all operate on car files into one car plugin

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/apache/geronimo/plugin/assembly/
      - copied from r421379, geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
      - copied, changed from r421432, geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/META-INF/plexus/components.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml?rev=421764&r1=421763&r2=421764&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml Thu Jul 13 17:32:11
2006
@@ -28,18 +28,24 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-packaging-plugin</artifactId>
-    <name>Geronimo Plugins :: Packaging</name>
+    <artifactId>car-maven-plugin</artifactId>
+    <name>Geronimo Plugins :: CAR</name>
     <packaging>maven-plugin</packaging>
     
     <dependencies>
         
-        <dependency>
+    <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
@@ -64,7 +70,6 @@
             </exclusions>
         </dependency>
         
-        <!-- for processing velocity -->
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
@@ -81,7 +86,6 @@
             <version>1.4</version>
         </dependency>
 
-        <!-- These are needed for constructing the classpath for PackageBuilder -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -93,14 +97,6 @@
             <artifactId>commons-cli</artifactId>
         </dependency>
         
-        <!--
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
-        </dependency>
-        -->
-
-        <!-- test -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-qname_1.1_spec</artifactId>

Copied: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
(from r421432, geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java?p2=geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java&p1=geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java&r1=421432&r2=421764&rev=421764&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/apache/geronimo/plugin/assembly/ConfigInstallerMojo.java
Thu Jul 13 17:32:11 2006
@@ -53,6 +53,8 @@
 //
 
 /**
+ * ???
+ *
  * @goal installConfig
  * 
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/META-INF/plexus/components.xml?rev=421764&r1=421763&r2=421764&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/META-INF/plexus/components.xml
Thu Jul 13 17:32:11 2006
@@ -18,4 +18,5 @@
             </configuration>
         </component>
     </components>
-</component-set> 
+</component-set>
+



Mime
View raw message