geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r700566 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate/ buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/ plugingroups/framework/ plugingroups/framework/src/main/history/ plugingroups/web-jetty/ ...
Date Tue, 30 Sep 2008 20:00:00 GMT 
Author: linsun
Date: Tue Sep 30 13:00:00 2008
New Revision: 700566

URL: http://svn.apache.org/viewvc?rev=700566&view=rev
Log:
GERONIMO-4328 change boilerplate geronimo plugin to use car format

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/plugingroups/framework/pom.xml
    geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/web-jetty/pom.xml
    geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml Tue Sep 30 13:00:00 2008
@@ -32,6 +32,7 @@
 
     <groupId>org.apache.geronimo.assemblies</groupId>
     <artifactId>geronimo-boilerplate</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Assemblies :: Boilerplate</name>
 
     <description>
@@ -344,9 +345,6 @@
                             <category>Geronimo Core</category>
                             <instance>
                                 <plugin-artifact>
-                                    <module-id>
-                                        <type>jar</type>
-                                    </module-id>
                                     <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
                                 </plugin-artifact>
                             </instance>

Modified: geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
(original)
+++ geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
Tue Sep 30 13:00:00 2008
@@ -19,7 +19,7 @@
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate</artifactId>
             <version>${geronimoVersion}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
 

Modified: geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
Tue Sep 30 13:00:00 2008
@@ -19,7 +19,7 @@
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate</artifactId>
             <version>${geronimoVersion}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
 

Modified: geronimo/server/trunk/plugingroups/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/pom.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/pom.xml Tue Sep 30 13:00:00 2008
@@ -39,6 +39,7 @@
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/framework/src/main/history/dependencies.xml Tue Sep
30 13:00:00 2008
@@ -18,75 +18,20 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>online-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-deploymentfactory</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-geronimo</artifactId>
+        <artifactId>gshell-remote</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-bootstrap</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>geronimo-boilerplate</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>transformer-agent</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-remote</artifactId>
+        <artifactId>client-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-system</artifactId>
         <type>car</type>
@@ -111,4 +56,9 @@
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>gshell-geronimo</artifactId>
+        <type>car</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugingroups/web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/pom.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/pom.xml Tue Sep 30 13:00:00 2008
@@ -42,7 +42,7 @@
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/src/main/history/dependencies.xml Tue Sep
30 13:00:00 2008
@@ -8,27 +8,22 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>shutdown</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>online-deployer</artifactId>
+        <artifactId>gshell-remote</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty6-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-deploymentfactory</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jsr88-rar-configurer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-rar-configurer</artifactId>
+        <artifactId>remote-deploy-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -43,85 +38,35 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-ear-configurer</artifactId>
+        <artifactId>sharedlib</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>upgrade-cli</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jsr88-war-configurer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-bootstrap</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>geronimo-boilerplate</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>transformer-agent</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-remote</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jetty6-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>remote-deploy-jetty</artifactId>
+        <artifactId>upgrade-cli</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>sharedlib</artifactId>
+        <artifactId>jsr88-ear-configurer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-war-configurer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
+        <artifactId>jasper-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>hot-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/pom.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/pom.xml Tue Sep 30 13:00:00 2008
@@ -42,7 +42,7 @@
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-boilerplate</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml?rev=700566&r1=700565&r2=700566&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/src/main/history/dependencies.xml Tue Sep
30 13:00:00 2008
@@ -8,22 +8,12 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>shutdown</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>online-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
+        <artifactId>gshell-remote</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jsr88-deploymentfactory</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>remote-deploy-tomcat</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -43,85 +33,40 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6-deployer</artifactId>
+        <artifactId>sharedlib</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-ear-configurer</artifactId>
+        <artifactId>jsr88-war-configurer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>upgrade-cli</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>tomcat6-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-bootstrap</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>geronimo-boilerplate</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>transformer-agent</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>gshell-remote</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>remote-deploy-tomcat</artifactId>
+        <artifactId>upgrade-cli</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>sharedlib</artifactId>
+        <artifactId>jsr88-ear-configurer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jsr88-war-configurer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>j2ee-system</artifactId>
+        <artifactId>jasper-deployer</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-rmi-spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>hot-deployer</artifactId>
         <type>car</type>
Mime
View raw message