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/07 15:14:05 UTC
svn commit: r942064 - in /geronimo/server/trunk: ./
framework/configs/client-system/src/main/history/
framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/
framework/configs/geronimo-gbean-deployer/src/main/history/
framework/configs/j2...
Author: rickmcguire
Date: Fri May 7 13:14:04 2010
New Revision: 942064
URL: http://svn.apache.org/viewvc?rev=942064&view=rev
Log:
The java ee concurrent JSR appears dead, and this code has some serious problems
within an OSGi environment. Removing this from the base Geronimo server because
of these issues. If the concurrent support ever becomes real, hopefully the split
package problems will be fixed in the final spec.
Removed:
geronimo/server/trunk/plugins/concurrent/
geronimo/server/trunk/testsuite/concurrent-testsuite/
Modified:
geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/pom.xml
Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -123,6 +123,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -153,6 +153,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -68,6 +68,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -138,6 +138,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -193,6 +193,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -138,6 +138,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -338,6 +338,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -123,6 +123,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -193,6 +193,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml Fri May 7 13:14:04 2010
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -102,12 +102,6 @@
<!-- end plugin groups -->
<!--other plugins-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>concurrent-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -136,7 +130,7 @@
<!--<version>${version}</version>-->
<!--<type>car</type>-->
<!--</dependency>-->
-
+
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
<!--<artifactId>agent-car-jmx</artifactId>-->
Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -88,6 +88,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -208,6 +208,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -243,6 +243,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<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.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -143,6 +143,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Fri May 7 13:14:04 2010
@@ -133,6 +133,11 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Fri May 7 13:14:04 2010
@@ -187,7 +187,6 @@
<!--<module>remote-deploy</module>-->
<!--<module>sharedlib</module>-->
<module>welcome</module>
- <!--<module>concurrent</module>-->
<!--<module>procrun</module>-->
<module>jetty8</module>
<module>tomcat</module>
@@ -262,7 +261,6 @@
<module>remote-deploy</module>
<module>sharedlib</module>
<module>welcome</module>
- <module>concurrent</module>
<module>procrun</module>
<module>jetty8</module>
<module>tomcat</module>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri May 7 13:14:04 2010
@@ -80,7 +80,7 @@
<xbeanVersion>3.7-SNAPSHOT</xbeanVersion>
<jetty>jetty8</jetty>
- <txmanagerVersion>3.0-SNAPSHOT</txmanagerVersion>
+ <txmanagerVersion>3.0</txmanagerVersion>
<monitoringConsoleVersion>${version}</monitoringConsoleVersion>
<pax.logging.version>1.5.0</pax.logging.version>
@@ -164,12 +164,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-concurrent_1.0_spec</artifactId>
- <version>1.1-EA-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<version>1.0</version>
</dependency>
@@ -388,34 +382,12 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
- <version>1.1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.envoisolutions.sxc</groupId>
- <artifactId>sxc-jaxb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<classifier>tests</classifier>
</dependency>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=942064&r1=942063&r2=942064&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri May 7 13:14:04 2010
@@ -185,7 +185,6 @@
<module>corba-testsuite</module>
<module>enterprise-testsuite</module>
<!--
- <module>concurrent-testsuite</module>
<module>console-testsuite</module>
<module>deployment-testsuite</module>
-->