You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2007/01/20 23:26:19 UTC
svn commit: r498197 - in /geronimo/server/trunk: ./ applications/magicGball/
configs/client-corba-yoko/ configs/jee-specs/ modules/geronimo-axis/
modules/geronimo-j2ee/
modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/
modules/geronim...
Author: dain
Date: Sat Jan 20 14:26:17 2007
New Revision: 498197
URL: http://svn.apache.org/viewvc?view=rev&rev=498197
Log:
Switch all of Geronimo to use the EJB 3.0 specification apis.
Add application server instance to openejbsystem service.
Add dependency on openjpa to openejb module.
Modified:
geronimo/server/trunk/applications/magicGball/pom.xml
geronimo/server/trunk/configs/client-corba-yoko/pom.xml
geronimo/server/trunk/configs/jee-specs/pom.xml
geronimo/server/trunk/modules/geronimo-axis/pom.xml
geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
geronimo/server/trunk/modules/geronimo-transaction/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml
geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml
Modified: geronimo/server/trunk/applications/magicGball/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/applications/magicGball/pom.xml (original)
+++ geronimo/server/trunk/applications/magicGball/pom.xml Sat Jan 20 14:26:17 2007
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/configs/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/pom.xml Sat Jan 20 14:26:17 2007
@@ -52,7 +52,7 @@
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-ejb_2.1_spec</artifactId>-->
+ <!--<artifactId>geronimo-ejb_3.0_spec</artifactId>-->
<!--</dependency>-->
<dependency>
Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jee-specs/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/configs/jee-specs/pom.xml Sat Jan 20 14:26:17 2007
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Sat Jan 20 14:26:17 2007
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee/pom.xml Sat Jan 20 14:26:17 2007
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Sat Jan 20 14:26:17 2007
@@ -29,6 +29,8 @@
import org.apache.openejb.Container;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.core.ServerFederation;
import org.apache.openejb.util.proxy.Jdk13ProxyFactory;
import org.apache.openejb.alt.config.ClientModule;
import org.apache.openejb.alt.config.ConfigurationFactory;
@@ -42,6 +44,7 @@
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.dynamic.PassthroughFactory;
import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.spi.ApplicationServer;
/**
* @version $Rev$ $Date$
@@ -63,6 +66,10 @@
boolean offline = true;
configurationFactory = new ConfigurationFactory(offline);
assembler = new Assembler();
+
+ // install application server
+ ApplicationServer applicationServer = new ServerFederation();
+ SystemInstance.get().setComponent(ApplicationServer.class, applicationServer);
// install transaction manager
transactionManager = getRawService(kernel, transactionManager);
Modified: geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml Sat Jan 20 14:26:17 2007
@@ -117,4 +117,26 @@
<artifactId>activemq-core</artifactId>
</dependency>
<!-- end activemq -->
+ <!-- openjpa -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>0.9.6-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>1.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <!-- end openjpa -->
</service>
Modified: geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml Sat Jan 20 14:26:17 2007
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Sat Jan 20 14:26:17 2007
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Jan 20 14:26:17 2007
@@ -90,12 +90,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<version>1.0</version>
</dependency>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar/pom.xml Sat Jan 20 14:26:17 2007
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Sat Jan 20 14:26:17 2007
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Sat Jan 20 14:26:17 2007
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Sat Jan 20 14:26:17 2007
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Sat Jan 20 14:26:17 2007
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml Sat Jan 20 14:26:17 2007
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/pom.xml Sat Jan 20 14:26:17 2007
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/pom.xml Sat Jan 20 14:26:17 2007
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml?view=diff&rev=498197&r1=498196&r2=498197
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-ejb-javaee_5/pom.xml Sat Jan 20 14:26:17 2007
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>