You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/05/21 15:06:42 UTC
svn commit: r946993 - in /geronimo/server/branches/3.0-M1: plugingroups/
plugingroups/javaee6-jetty/ plugingroups/javaee6-jetty/src/main/history/
plugingroups/javaee6-tomcat/ plugingroups/javaee6-tomcat/src/main/history/
plugingroups/webservices-axis2/...
Author: rickmcguire
Date: Fri May 21 13:06:41 2010
New Revision: 946993
URL: http://svn.apache.org/viewvc?rev=946993&view=rev
Log:
Remove axis2 and cxf and disable web services deployers
Removed:
geronimo/server/branches/3.0-M1/plugingroups/webservices-axis2/
geronimo/server/branches/3.0-M1/plugingroups/webservices-cxf/
geronimo/server/branches/3.0-M1/plugins/axis2/
geronimo/server/branches/3.0-M1/plugins/cxf/
Modified:
geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/pom.xml
geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/pom.xml
geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M1/plugingroups/pom.xml
geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml
geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml
geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M1/plugins/pom.xml
geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/pom.xml
geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/pom.xml
geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
Modified: geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/pom.xml Fri May 21 13:06:41 2010
@@ -85,20 +85,6 @@
<version>${project.version}</version>
<type>car</type>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>webservices-axis2</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.plugingroups</groupId>-->
- <!--<artifactId>webservices-cxf</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
<!-- end plugin groups -->
<!--other plugins-->
Modified: geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/src/main/history/dependencies.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M1/plugingroups/javaee6-jetty/src/main/history/dependencies.xml Fri May 21 13:06:41 2010
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>javaee6-jetty</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -46,9 +46,4 @@
<artifactId>jms</artifactId>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>webservices-axis2</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/pom.xml Fri May 21 13:06:41 2010
@@ -86,20 +86,6 @@
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>webservices-axis2</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.plugingroups</groupId>-->
- <!--<artifactId>webservices-cxf</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
-
<!--other plugins-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.configs</groupId>-->
Modified: geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M1/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml Fri May 21 13:06:41 2010
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>javaee6-tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -46,9 +46,4 @@
<artifactId>jms</artifactId>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>webservices-axis2</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/branches/3.0-M1/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugingroups/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugingroups/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugingroups/pom.xml Fri May 21 13:06:41 2010
@@ -31,8 +31,6 @@
<modules>
<module>client</module>
- <!--<module>clustering-jetty</module>-->
- <!--<module>clustering-tomcat</module>-->
<module>ejb</module>
<module>jms</module>
<module>javaee6-jetty</module>
@@ -44,8 +42,6 @@
<module>eba-jetty</module>
<module>console-tomcat</module>
<module>console-jetty</module>
- <module>webservices-axis2</module>
- <!--<module>webservices-cxf</module>-->
</modules>
<build>
Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml Fri May 21 13:06:41 2010
@@ -60,12 +60,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder-1_6</artifactId>
<version>${project.version}</version>
</dependency>
Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml Fri May 21 13:06:41 2010
@@ -59,12 +59,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb-builder</artifactId>
<version>${project.version}</version>
</dependency>
Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml Fri May 21 13:06:41 2010
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -26,9 +26,4 @@
<artifactId>geronimo-openejb-builder</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-webservices-builder</artifactId>
- <type>jar</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/branches/3.0-M1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/pom.xml Fri May 21 13:06:41 2010
@@ -159,13 +159,11 @@
<module>system-database</module>
<module>activemq</module>
<module>aspectj</module>
- <module>axis2</module>
<module>client</module>
<module>clustering</module>
<module>connector-1_6</module>
<module>console</module>
<module>corba</module>
- <module>cxf</module>
<module>dojo</module>
<module>hotdeploy</module>
<module>j2ee</module>
@@ -175,8 +173,8 @@
<module>myfaces</module>
<module>openejb</module>
<module>openjpa2</module>
- <module>webservices</module>
<module>uddi</module>
+ <module>webservices</module>
<module>remote-deploy</module>
<module>welcome</module>
<module>procrun</module>
@@ -225,13 +223,11 @@
<module>system-database</module>
<module>activemq</module>
<module>aspectj</module>
- <module>axis2</module>
<module>client</module>
<module>clustering</module>
<module>connector-1_6</module>
<module>console</module>
<module>corba</module>
- <module>cxf</module>
<module>dojo</module>
<module>hotdeploy</module>
<module>j2ee</module>
Modified: geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/pom.xml Fri May 21 13:06:41 2010
@@ -52,21 +52,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi-db</artifactId>
<version>${project.version}</version>
@@ -109,7 +94,6 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${cxfDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<category>Web Services</category>
Modified: geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml Fri May 21 13:06:41 2010
@@ -3,7 +3,7 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>uddi-jetty</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
@@ -13,11 +13,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/pom.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/pom.xml Fri May 21 13:06:41 2010
@@ -49,20 +49,6 @@
<type>car</type>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -102,7 +88,6 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${cxfDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<category>Web Services</category>
Modified: geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?rev=946993&r1=946992&r2=946993&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Fri May 21 13:06:41 2010
@@ -3,16 +3,11 @@
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>uddi-tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M1-SNAPSHOT</version>
<type>car</type>
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>cxf</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<type>car</type>
</dependency>