You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/02/19 21:26:41 UTC
svn commit: r911969 - in /geronimo/server/trunk/plugingroups: ./ eba-jetty/
eba-jetty/src/main/history/ eba-tomcat/ eba-tomcat/src/main/history/
javaee6-jetty/ javaee6-jetty/src/main/history/ javaee6-tomcat/
javaee6-tomcat/src/main/history/ wab-jetty/ ...
Author: dwoods
Date: Fri Feb 19 20:26:41 2010
New Revision: 911969
URL: http://svn.apache.org/viewvc?rev=911969&view=rev
Log:
minimal grouping is now wab and eba builds upon that
Modified:
geronimo/server/trunk/plugingroups/eba-jetty/pom.xml
geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml
geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/pom.xml
geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/plugingroups/eba-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-jetty/pom.xml Fri Feb 19 20:26:41 2010
@@ -69,19 +69,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>myfaces-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>web-extender</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-jetty/src/main/history/dependencies.xml Fri Feb 19 20:26:41 2010
@@ -2,7 +2,7 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>wab-jetty</artifactId>
+ <artifactId>eba-jetty</artifactId>
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -23,11 +23,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>myfaces-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
</dependency>
@@ -37,13 +32,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>web-extender</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>web-jetty</artifactId>
+ <artifactId>wab-jetty</artifactId>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml Fri Feb 19 20:26:41 2010
@@ -69,19 +69,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>myfaces-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>web-extender</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml Fri Feb 19 20:26:41 2010
@@ -2,7 +2,7 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>wab-tomcat</artifactId>
+ <artifactId>eba-tomcat</artifactId>
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
@@ -23,11 +23,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>myfaces-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<type>car</type>
</dependency>
@@ -37,13 +32,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>web-extender</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>web-tomcat</artifactId>
+ <artifactId>wab-tomcat</artifactId>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml Fri Feb 19 20:26:41 2010
@@ -45,17 +45,9 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>wab-jetty</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-jetty</artifactId>
+ <artifactId>eba-jetty</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml Fri Feb 19 20:26:41 2010
@@ -13,12 +13,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>wab-jetty</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-jetty</artifactId>
+ <artifactId>eba-jetty</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml Fri Feb 19 20:26:41 2010
@@ -45,17 +45,9 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>wab-tomcat</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-tomcat</artifactId>
+ <artifactId>eba-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml Fri Feb 19 20:26:41 2010
@@ -13,12 +13,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>wab-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-tomcat</artifactId>
+ <artifactId>eba-tomcat</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Fri Feb 19 20:26:41 2010
@@ -37,10 +37,10 @@
<module>javaee6-jetty</module>
<module>javaee6-tomcat</module>
<module>persistence</module>
- <module>web-tomcat</module>
- <module>web-jetty</module>
<module>wab-tomcat</module>
<module>wab-jetty</module>
+ <module>eba-tomcat</module>
+ <module>eba-jetty</module>
<module>webservices-axis2</module>
<!--<module>webservices-cxf</module>-->
</modules>
Modified: geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/pom.xml Fri Feb 19 20:26:41 2010
@@ -31,7 +31,7 @@
<artifactId>wab-jetty</artifactId>
<packaging>car</packaging>
- <name>Geronimo Plugin Group :: RFC66 WAB Jetty</name>
+ <name>Geronimo Plugin Group :: WAB Jetty</name>
<description>
This plugin group provides the OSGi RFC66 WAB on Jetty functionality.
@@ -45,6 +45,25 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>${jetty}-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>web-extender</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>upgrade-cli</artifactId>
<version>${version}</version>
@@ -86,7 +105,6 @@
<!--<version>${version}</version>-->
<!--<type>car</type>-->
<!--</dependency>-->
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.framework</groupId>-->
<!--<artifactId>gshell-geronimo</artifactId>-->
@@ -101,12 +119,6 @@
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${jetty}-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml Fri Feb 19 20:26:41 2010
@@ -2,12 +2,27 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>web-jetty</artifactId>
+ <artifactId>wab-jetty</artifactId>
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>web-extender</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-jetty</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>myfaces-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml Fri Feb 19 20:26:41 2010
@@ -31,7 +31,7 @@
<artifactId>wab-tomcat</artifactId>
<packaging>car</packaging>
- <name>Geronimo Plugin Group :: RFC66 WAB Tomcat</name>
+ <name>Geronimo Plugin Group :: WAB Tomcat</name>
<description>
This plugin group provides the OSGi RFC66 WAB on Tomcat functionality.
@@ -45,6 +45,25 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>web-extender</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>upgrade-cli</artifactId>
<version>${version}</version>
@@ -101,12 +120,6 @@
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml?rev=911969&r1=911968&r2=911969&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml Fri Feb 19 20:26:41 2010
@@ -2,12 +2,27 @@
<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>web-tomcat</artifactId>
+ <artifactId>wab-tomcat</artifactId>
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>web-extender</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>welcome-tomcat</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>myfaces-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
<type>car</type>
</dependency>