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/17 21:03:29 UTC
svn commit: r497146 [5/5] - in /geronimo/server/trunk: ./
assemblies/geronimo-jetty6-jee5/
assemblies/geronimo-jetty6-jee5/src/main/var/config/
assemblies/geronimo-tomcat6-jee5/
assemblies/geronimo-tomcat6-jee5/src/main/var/config/ configs/ configs/jee...
Added: geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/geronimo-openejb.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/geronimo-openejb.xml?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/geronimo-openejb.xml (added)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/geronimo-openejb.xml Wed Jan 17 12:03:23 2007
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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 KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ejb-jar xmlns="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+ <environment>
+ <moduleId>
+ <groupId>test</groupId>
+ <artifactId>test</artifactId>
+ <version>1</version>
+ <type>car</type>
+ </moduleId>
+ </environment>
+</ejb-jar>
\ No newline at end of file
Added: geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/plan1.xml?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/plan1.xml (added)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/test/resources/plans/plan1.xml Wed Jan 17 12:03:23 2007
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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 KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 480541 $ $Date: 2006-11-29 03:47:20 -0800 (Wed, 29 Nov 2006) $ -->
+
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+
+ <environment>
+ <moduleId>
+ <groupId>foo</groupId>
+ <artifactId>bar</artifactId>
+ <version>1</version>
+ <type>car</type>
+ </moduleId>
+ </environment>
+
+ <cmp-connection-factory>
+ <resource-link>DefaultDatasource</resource-link>
+ </cmp-connection-factory>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>SimpleStatelessSession</ejb-name>
+ <jndi-name>client/test/simple/SimpleStatelessSessionHome</jndi-name>
+ <resource-ref>
+ <ref-name>ref</ref-name>
+ <resource-link>target</resource-link>
+ </resource-ref>
+ </session>
+ <message-driven>
+ <ejb-name>SimpleMessageDriven</ejb-name>
+ <resource-adapter>
+ <resource-link>MockRA</resource-link>
+ </resource-adapter>
+ </message-driven>
+
+ </enterprise-beans>
+</openejb-jar>
Added: geronimo/server/trunk/modules/geronimo-openejb/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/LICENSE.txt?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/LICENSE.txt (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/LICENSE.txt Wed Jan 17 12:03:23 2007
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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 KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: geronimo/server/trunk/modules/geronimo-openejb/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/NOTICE.txt?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/NOTICE.txt (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/NOTICE.txt Wed Jan 17 12:03:23 2007
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache OpenEJB distribution. ==
+ =========================================================================
+
+ Apache OpenEJB Project
+ Copyright 1999-2006 The Apache Software Foundation
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
Added: geronimo/server/trunk/modules/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/pom.xml?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/pom.xml (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/pom.xml Wed Jan 17 12:03:23 2007
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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 KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Revision: 492002 $ $Date: 2007-01-02 17:36:31 -0800 (Tue, 02 Jan 2007) $ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>modules</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-openejb</artifactId>
+ <name>Geronimo :: OpenEJB</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+</project>
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ClientEjbReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ClientEjbReference.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ClientEjbReference.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/ClientEjbReference.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,49 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.util.Properties;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
+import org.apache.geronimo.naming.reference.SimpleReference;
+
+public class ClientEjbReference extends SimpleReference {
+ private final String url;
+ private final String deploymentId;
+
+ public ClientEjbReference(String url, String deploymentId) {
+ this.url = url;
+ this.deploymentId = deploymentId;
+ }
+
+ public Object getContent() throws NameNotFoundException {
+ Properties p = new Properties();
+ p.put("java.naming.factory.initial", "org.apacheopenejb.client.RemoteInitialContextFactory");
+ p.put("java.naming.provider.url", url);
+
+ try {
+ InitialContext ctx = new InitialContext(p);
+ Object value = ctx.lookup(deploymentId);
+ return value;
+ } catch (NamingException e) {
+ throw (NameNotFoundException) new NameNotFoundException().initCause(e);
+ }
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,190 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.util.Set;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBLocalHome;
+import javax.security.auth.Subject;
+import javax.naming.Context;
+
+import org.apache.geronimo.management.EJB;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.openejb.core.CoreDeploymentInfo;
+
+public class EjbDeployment implements EJB {
+ private final String objectName;
+ private final String deploymentId;
+ private final String ejbName;
+
+ private final String homeInterfaceName;
+ private final String remoteInterfaceName;
+ private final String localHomeInterfaceName;
+ private final String localInterfaceName;
+ private final String serviceEndpointInterfaceName;
+ private final String beanClassName;
+ private final ClassLoader classLoader;
+
+ private final Subject defaultSubject;
+ private final Subject runAs;
+
+ private final Context componentContext;
+
+ // connector stuff
+ private final Set unshareableResources;
+ private final Set applicationManagedSecurityResources;
+ private final TrackedConnectionAssociator trackedConnectionAssociator;
+
+ private final OpenEjbSystem openEjbSystem;
+
+
+ private CoreDeploymentInfo deploymentInfo;
+
+ public EjbDeployment(String objectName,
+ String deploymentId,
+ String ejbName,
+ String homeInterfaceName,
+ String remoteInterfaceName,
+ String localHomeInterfaceName,
+ String localInterfaceName,
+ String serviceEndpointInterfaceName,
+ String beanClassName,
+ ClassLoader classLoader,
+ Subject defaultSubject,
+ Subject runAs,
+ Context componentContext,
+ Set unshareableResources,
+ Set applicationManagedSecurityResources,
+ TrackedConnectionAssociator trackedConnectionAssociator,
+ OpenEjbSystem openEjbSystem) {
+ this.objectName = objectName;
+ this.deploymentId = deploymentId;
+ this.ejbName = ejbName;
+ this.homeInterfaceName = homeInterfaceName;
+ this.remoteInterfaceName = remoteInterfaceName;
+ this.localHomeInterfaceName = localHomeInterfaceName;
+ this.localInterfaceName = localInterfaceName;
+ this.serviceEndpointInterfaceName = serviceEndpointInterfaceName;
+ this.beanClassName = beanClassName;
+ this.classLoader = classLoader;
+ this.defaultSubject = defaultSubject;
+ this.runAs = runAs;
+ this.componentContext = componentContext;
+ this.unshareableResources = unshareableResources;
+ this.applicationManagedSecurityResources = applicationManagedSecurityResources;
+ this.trackedConnectionAssociator = trackedConnectionAssociator;
+ this.openEjbSystem = openEjbSystem;
+ }
+
+ public String getDeploymentId() {
+ return deploymentId;
+ }
+
+ public String getEjbName() {
+ return ejbName;
+ }
+
+ public String getHomeInterfaceName() {
+ return homeInterfaceName;
+ }
+
+ public String getRemoteInterfaceName() {
+ return remoteInterfaceName;
+ }
+
+ public String getLocalHomeInterfaceName() {
+ return localHomeInterfaceName;
+ }
+
+ public String getLocalInterfaceName() {
+ return localInterfaceName;
+ }
+
+ public String getServiceEndpointInterfaceName() {
+ return serviceEndpointInterfaceName;
+ }
+
+ public String getBeanClassName() {
+ return beanClassName;
+ }
+
+ public ClassLoader getClassLoader() {
+ return classLoader;
+ }
+
+ public Subject getDefaultSubject() {
+ return defaultSubject;
+ }
+
+ public Subject getRunAs() {
+ return runAs;
+ }
+
+ public Context getComponentContext() {
+ return componentContext;
+ }
+
+ public Set getUnshareableResources() {
+ return unshareableResources;
+ }
+
+ public Set getApplicationManagedSecurityResources() {
+ return applicationManagedSecurityResources;
+ }
+
+ public TrackedConnectionAssociator getTrackedConnectionAssociator() {
+ return trackedConnectionAssociator;
+ }
+
+ public EJBHome getEJBHome() {
+ return deploymentInfo.getEJBHome();
+ }
+
+ public EJBLocalHome getEJBLocalHome() {
+ return deploymentInfo.getEJBLocalHome();
+ }
+
+ public String getObjectName() {
+ return objectName;
+ }
+
+ public boolean isStateManageable() {
+ return true;
+ }
+
+ public boolean isStatisticsProvider() {
+ return false;
+ }
+
+ public boolean isEventProvider() {
+ return true;
+ }
+
+ protected void start() {
+ deploymentInfo = (CoreDeploymentInfo) openEjbSystem.getDeploymentInfo(deploymentId);
+ if (deploymentInfo == null) {
+ throw new IllegalStateException("Ejb does not exist " + deploymentId);
+ }
+ deploymentInfo.set(EjbDeployment.class, this);
+ }
+
+ protected void stop() {
+ deploymentInfo.set(EjbDeployment.class, null);
+ deploymentInfo = null;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeploymentGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,151 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.util.Map;
+import java.util.Set;
+import javax.security.auth.Subject;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.naming.enc.EnterpriseNamingContext;
+import org.apache.geronimo.security.deploy.DefaultPrincipal;
+import org.apache.geronimo.security.util.ConfigurationUtil;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+
+public class EjbDeploymentGBean extends EjbDeployment implements GBeanLifecycle {
+ public EjbDeploymentGBean(String objectName,
+ String deploymentId,
+ String ejbName,
+ String homeInterfaceName,
+ String remoteInterfaceName,
+ String localHomeInterfaceName,
+ String localInterfaceName,
+ String serviceEndpointInterfaceName,
+ String beanClassName,
+ ClassLoader classLoader,
+ DefaultPrincipal defaultPrincipal,
+ Subject runAs,
+ Map componentContext,
+ Set unshareableResources,
+ Set applicationManagedSecurityResources,
+ TrackedConnectionAssociator trackedConnectionAssociator,
+ GeronimoTransactionManager transactionManager,
+ OpenEjbSystem openEjbSystem) throws Exception {
+ super(objectName,
+ deploymentId,
+ ejbName,
+ homeInterfaceName,
+ remoteInterfaceName,
+ localHomeInterfaceName,
+ localInterfaceName,
+ serviceEndpointInterfaceName,
+ beanClassName,
+ classLoader,
+ generateDefaultSubject(defaultPrincipal, classLoader),
+ runAs,
+ EnterpriseNamingContext.createEnterpriseNamingContext(componentContext, transactionManager, null, classLoader),
+ unshareableResources,
+ applicationManagedSecurityResources,
+ trackedConnectionAssociator,
+ openEjbSystem);
+ }
+
+ private static Subject generateDefaultSubject(DefaultPrincipal defaultPrincipal, ClassLoader classLoader) throws DeploymentException {
+ if (defaultPrincipal != null) {
+ return ConfigurationUtil.generateDefaultSubject(defaultPrincipal, classLoader);
+ } else {
+ return null;
+ }
+ }
+
+ public void doStart() throws Exception {
+ start();
+ }
+
+ public void doStop() throws Exception {
+ stop();
+ }
+
+ public void doFail() {
+ stop();
+ }
+
+ // do not use this gbean info, instead use StatelessDeploymentGBean, StatefulDeploymentGBean, EntityDeploymentGBean, or MessageDrivenDeploymentGBean
+ static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class, EjbDeploymentGBean.class, NameFactory.STATELESS_SESSION_BEAN);
+
+ infoFactory.addAttribute("objectName", String.class, false);
+ infoFactory.addAttribute("deploymentId", String.class, true);
+ infoFactory.addAttribute("ejbName", String.class, true);
+
+ infoFactory.addAttribute("homeInterfaceName", String.class, true);
+ infoFactory.addAttribute("remoteInterfaceName", String.class, true);
+ infoFactory.addAttribute("localHomeInterfaceName", String.class, true);
+ infoFactory.addAttribute("localInterfaceName", String.class, true);
+ infoFactory.addAttribute("serviceEndpointInterfaceName", String.class, true);
+ infoFactory.addAttribute("beanClassName", String.class, true);
+ infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+
+ infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
+ infoFactory.addAttribute("runAs", Subject.class, true);
+
+ infoFactory.addAttribute("componentContextMap", Map.class, true);
+
+ infoFactory.addAttribute("unshareableResources", Set.class, true);
+ infoFactory.addAttribute("applicationManagedSecurityResources", Set.class, true);
+ infoFactory.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class);
+ infoFactory.addReference("TransactionManager", GeronimoTransactionManager.class);
+
+ infoFactory.addReference("OpenEjbSystem", OpenEjbSystem.class);
+
+ infoFactory.setConstructor(new String[]{
+ "objectName",
+ "deploymentId",
+ "ejbName",
+
+ "homeInterfaceName",
+ "remoteInterfaceName",
+ "localHomeInterfaceName",
+ "localInterfaceName",
+ "serviceEndpointInterfaceName",
+ "beanClassName",
+ "classLoader",
+
+ "defaultPrincipal",
+ "runAs",
+
+ "componentContextMap",
+
+ "unshareableResources",
+ "applicationManagedSecurityResources",
+ "TrackedConnectionAssociator",
+ "TransactionManager",
+
+ "OpenEjbSystem",
+ });
+
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,150 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import javax.management.ObjectName;
+
+import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
+import org.apache.geronimo.kernel.ObjectNameUtil;
+import org.apache.geronimo.management.EJB;
+import org.apache.geronimo.management.EJBModule;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+
+/**
+ * @version $Revision: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $
+ */
+public class EjbModuleImpl implements EJBModule {
+ private final J2EEServer server;
+ private final J2EEApplication application;
+ private final String deploymentDescriptor;
+ private final String objectName;
+ private final Collection<? extends EJB> ejbs;
+ private final ClassLoader classLoader;
+
+ private final OpenEjbSystem openEjbSystem;
+ private final EjbJarInfo ejbJarInfo;
+
+ public EjbModuleImpl(String objectName, J2EEServer server, J2EEApplication application, String deploymentDescriptor, Collection<? extends EJB> ejbs, ClassLoader classLoader, OpenEjbSystem openEjbSystem, EjbJarInfo ejbJarInfo) {
+ this.objectName = objectName;
+ ObjectName myObjectName = ObjectNameUtil.getObjectName(objectName);
+ verifyObjectName(myObjectName);
+
+ this.server = server;
+ this.application = application;
+ this.deploymentDescriptor = deploymentDescriptor;
+ this.ejbs = ejbs;
+
+ this.classLoader = classLoader;
+
+ this.openEjbSystem = openEjbSystem;
+ this.ejbJarInfo = ejbJarInfo;
+ }
+
+ public String getObjectName() {
+ return objectName;
+ }
+
+ public boolean isStateManageable() {
+ return true;
+ }
+
+ public boolean isStatisticsProvider() {
+ return false;
+ }
+
+ public boolean isEventProvider() {
+ return true;
+ }
+
+ public String getDeploymentDescriptor() {
+ return deploymentDescriptor;
+ }
+
+ public String getServer() {
+ return server.getObjectName();
+ }
+
+ public String getApplication() {
+ if (application == null) {
+ return null;
+ }
+ return application.getObjectName();
+ }
+
+ public String[] getJavaVMs() {
+ return server.getJavaVMs();
+ }
+
+ public String[] getEjbs() {
+ if (ejbs == null) {
+ return new String[0];
+ }
+
+ ArrayList<EJB> copy;
+ synchronized (ejbs) {
+ copy = new ArrayList<EJB>(ejbs);
+ }
+
+ String[] result = new String[copy.size()];
+ for (int i = 0; i < result.length; i++) {
+ result[i] = (copy.get(i)).getObjectName();
+ }
+ return result;
+ }
+
+
+ protected void start() throws Exception {
+ openEjbSystem.createEjbJar(ejbJarInfo, classLoader);
+ }
+
+ protected void stop() {
+ // todo enable when remove is implemented
+ // openEjbSystem.removeEjbJar(ejbJarInfo, classLoader);
+ }
+
+ /**
+ * ObjectName must match this pattern:
+ * <p/>
+ * domain:j2eeType=EJBModule,name=MyName,J2EEServer=MyServer,J2EEApplication=MyApplication
+ */
+ private void verifyObjectName(ObjectName objectName) {
+ if (objectName.isPattern()) {
+ throw new InvalidObjectNameException("ObjectName can not be a pattern", objectName);
+ }
+ Hashtable keyPropertyList = objectName.getKeyPropertyList();
+ if (!"EJBModule".equals(keyPropertyList.get("j2eeType"))) {
+ throw new InvalidObjectNameException("EJBModule object name j2eeType property must be 'EJBModule'", objectName);
+ }
+ if (!keyPropertyList.containsKey("name")) {
+ throw new InvalidObjectNameException("EJBModule object must contain a name property", objectName);
+ }
+ if (!keyPropertyList.containsKey("J2EEServer")) {
+ throw new InvalidObjectNameException("EJBModule object name must contain a J2EEServer property", objectName);
+ }
+ if (!keyPropertyList.containsKey("J2EEApplication")) {
+ throw new InvalidObjectNameException("EJBModule object name must contain a J2EEApplication property", objectName);
+ }
+ if (keyPropertyList.size() != 4) {
+ throw new InvalidObjectNameException("EJBModule object name can only have j2eeType, name, J2EEApplication, and J2EEServer properties", objectName);
+ }
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImplGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImplGBean.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImplGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImplGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.util.Collection;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.management.J2EEServer;
+import org.apache.geronimo.management.J2EEApplication;
+import org.apache.geronimo.management.EJB;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+
+/**
+ * @version $Revision$ $Date$
+ */
+public final class EjbModuleImplGBean extends EjbModuleImpl implements GBeanLifecycle {
+ public EjbModuleImplGBean(String objectName, J2EEServer server, J2EEApplication application, String deploymentDescriptor, Collection<? extends EJB> ejbs, ClassLoader classLoader, OpenEjbSystem openEjbSystem, EjbJarInfo ejbJarInfo) {
+ super(objectName, server, application, deploymentDescriptor, ejbs, classLoader, openEjbSystem, ejbJarInfo);
+ }
+
+ public void doStart() throws Exception {
+ start();
+ }
+
+ public void doStop() throws Exception {
+ stop();
+ }
+
+ public void doFail() {
+ stop();
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EjbModuleImpl.class, NameFactory.EJB_MODULE);
+ infoBuilder.addReference("J2EEServer", J2EEServer.class);
+ infoBuilder.addReference("J2EEApplication", J2EEApplication.class);
+
+ infoBuilder.addAttribute("deploymentDescriptor", String.class, true);
+
+ infoBuilder.addReference("EJBCollection", EJB.class);
+
+ infoBuilder.addAttribute("classloader", ClassLoader.class, false);
+
+ infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class);
+ infoBuilder.addAttribute("ejbJarInfo", EjbJarInfo.class, true);
+
+ infoBuilder.setConstructor(new String[]{
+ "objectName",
+ "J2EEServer",
+ "J2EEApplication",
+ "deploymentDescriptor",
+ "EJBCollection",
+ "classloader",
+ "OpenEjbSystem",
+ "ejbJarInfo"
+ });
+
+ GBEAN_INFO = infoBuilder.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbReference.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbReference.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbReference.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import javax.naming.NameNotFoundException;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.naming.reference.ConfigurationAwareReference;
+
+public class EjbReference extends ConfigurationAwareReference {
+ private final boolean remote;
+
+ public EjbReference(Artifact artifact, AbstractNameQuery abstractNameQuery, boolean remote) {
+ super(artifact, abstractNameQuery);
+ this.remote = remote;
+ }
+
+ public Object getContent() throws NameNotFoundException {
+ try {
+ AbstractName abstractName = resolveTargetName();
+ EjbDeployment ejbDeployment = (EjbDeployment) getKernel().getGBean(abstractName);
+ if (!remote) {
+ return ejbDeployment.getEJBHome();
+ } else {
+ return ejbDeployment.getEJBLocalHome();
+ }
+ } catch (GBeanNotFoundException e) {
+ throw (NameNotFoundException) new NameNotFoundException().initCause(e);
+ }
+ }
+}
\ No newline at end of file
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityDeploymentGBean.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityDeploymentGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EntityDeploymentGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,41 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EntityDeploymentGBean {
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
+ EjbDeploymentGBean.class,
+ EjbDeploymentGBean.GBEAN_INFO,
+ NameFactory.ENTITY_BEAN);
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,117 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import javax.naming.Context;
+import javax.resource.ResourceException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContextImpl;
+import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
+import org.apache.geronimo.naming.java.RootContext;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.ThreadContextListener;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GeronimoThreadContextListener implements ThreadContextListener {
+ private static final Log log = LogFactory.getLog(GeronimoThreadContextListener.class);
+
+ // A single stateless listener is used for Geronimo
+ private static final GeronimoThreadContextListener instance = new GeronimoThreadContextListener();
+ static {
+ ThreadContext.addThreadContextListener(instance);
+ }
+
+ public static void init() {
+ // do nothing.. the goal here is to kick off the onetime init above
+ }
+
+ private GeronimoThreadContextListener() {
+ }
+
+ public void contextEntered(ThreadContext oldContext, ThreadContext newContext) {
+ CoreDeploymentInfo deploymentInfo = newContext.getDeploymentInfo();
+ if (deploymentInfo == null) return;
+
+ EjbDeployment ejbDeployment = deploymentInfo.get(EjbDeployment.class);
+ if (ejbDeployment == null) return;
+
+ // Geronimo call context is used to track old state that must be restored
+ GeronimoCallContext geronimoCallContext = new GeronimoCallContext();
+
+ // Get the jndi context
+ Context jndiContext = ejbDeployment.getComponentContext();
+ geronimoCallContext.oldJndiContext = RootContext.getComponentContext();
+
+ // Demark component boundries for connection tracking if we have a tracker
+ TrackedConnectionAssociator trackedConnectionAssociator = ejbDeployment.getTrackedConnectionAssociator();
+ if (trackedConnectionAssociator != null) {
+ // create the connector context... this only works with a TrackedConnectionAssociator using lazy association
+ ConnectorInstanceContext connectorContext = new ConnectorInstanceContextImpl(ejbDeployment.getUnshareableResources(),
+ ejbDeployment.getApplicationManagedSecurityResources());
+
+ // Set connector context
+ try {
+ geronimoCallContext.oldConnectorContext = trackedConnectionAssociator.enter(connectorContext);
+ } catch (ResourceException e) {
+ log.error("Error while entering TrackedConnectionAssociator");
+ return;
+ }
+ }
+
+ // Set the jndi context into Geronimo's root context
+ RootContext.setComponentContext(jndiContext);
+
+ newContext.set(GeronimoCallContext.class, geronimoCallContext);
+ }
+
+ public void contextExited(ThreadContext exitedContext, ThreadContext reenteredContext) {
+ CoreDeploymentInfo deploymentInfo = exitedContext.getDeploymentInfo();
+ if (deploymentInfo == null) return;
+
+ EjbDeployment ejbDeployment = deploymentInfo.get(EjbDeployment.class);
+ if (ejbDeployment == null) return;
+
+ // Geronimo call context is used to track old state that must be restored
+ GeronimoCallContext geronimoCallContext = exitedContext.get(GeronimoCallContext.class);
+ if (geronimoCallContext == null) return;
+
+ // reset Geronimo's root jndi context
+ RootContext.setComponentContext(geronimoCallContext.oldJndiContext);
+
+ // reset old connector context
+ TrackedConnectionAssociator trackedConnectionAssociator = ejbDeployment.getTrackedConnectionAssociator();
+ if (trackedConnectionAssociator != null) {
+ try {
+ trackedConnectionAssociator.exit(geronimoCallContext.oldConnectorContext);
+ } catch (ResourceException e) {
+ log.error("Error while exiting TrackedConnectionAssociator");
+ }
+ }
+ }
+
+ private static final class GeronimoCallContext {
+ private Context oldJndiContext;
+ private ConnectorInstanceContext oldConnectorContext;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/MessageDrivenDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/MessageDrivenDeploymentGBean.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/MessageDrivenDeploymentGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/MessageDrivenDeploymentGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,41 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MessageDrivenDeploymentGBean {
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
+ EjbDeploymentGBean.class,
+ EjbDeploymentGBean.GBEAN_INFO,
+ NameFactory.MESSAGE_DRIVEN_BEAN);
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystem.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.io.IOException;
+import java.util.Properties;
+import javax.naming.NamingException;
+
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.alt.config.ClientModule;
+import org.apache.openejb.alt.config.EjbModule;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.spi.ContainerSystem;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface OpenEjbSystem {
+ ContainerSystem getContainerSystem();
+
+ Container configureService(String serviceId, Properties declaredProperties, String providerId, String serviceType) throws OpenEJBException;
+
+ ClientInfo configureApplication(ClientModule clientModule) throws OpenEJBException;
+
+ EjbJarInfo configureApplication(EjbModule ejbModule) throws OpenEJBException;
+
+ void createClient(ClientInfo clientInfo, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException;
+
+ void createEjbJar(EjbJarInfo ejbJarInfo, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException;
+
+ DeploymentInfo getDeploymentInfo(String deploymentId);
+}
Added: 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=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import java.util.Properties;
+import java.io.IOException;
+
+import javax.naming.NamingException;
+
+import org.apache.openejb.alt.config.ConfigurationFactory;
+import org.apache.openejb.alt.config.ClientModule;
+import org.apache.openejb.alt.config.EjbModule;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ContainerInfo;
+import org.apache.openejb.assembler.classic.ClientInfo;
+import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.Container;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class OpenEjbSystemGBean implements OpenEjbSystem {
+ private final ConfigurationFactory configurationFactory;
+ private final Assembler assembler;
+
+ public OpenEjbSystemGBean() {
+ configurationFactory = new ConfigurationFactory();
+ assembler = new Assembler();
+ GeronimoThreadContextListener.init();
+ }
+
+ public ContainerSystem getContainerSystem() {
+ return assembler.getContainerSystem();
+ }
+
+ public Container configureService(String serviceId, Properties declaredProperties, String providerId, String serviceType) throws OpenEJBException {
+ ContainerInfo containerInfo = configurationFactory.configureService(ContainerInfo.class, serviceId, declaredProperties, providerId, ContainerInfo.class.getSimpleName());
+ assembler.createContainer(containerInfo);
+ Container container = assembler.getContainerSystem().getContainer(serviceId);
+ return container;
+ }
+
+ public ClientInfo configureApplication(ClientModule clientModule) throws OpenEJBException {
+ return configurationFactory.configureApplication(clientModule);
+ }
+
+ public EjbJarInfo configureApplication(EjbModule ejbModule) throws OpenEJBException {
+ return configurationFactory.configureApplication(ejbModule);
+ }
+
+ public void createClient(ClientInfo clientInfo, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException {
+ assembler.createClient(clientInfo, classLoader);
+ }
+
+ public void createEjbJar(EjbJarInfo ejbJarInfo, ClassLoader classLoader) throws NamingException, IOException, OpenEJBException {
+ assembler.createEjbJar(ejbJarInfo, classLoader);
+ }
+
+ public DeploymentInfo getDeploymentInfo(String deploymentId) {
+ return getContainerSystem().getDeploymentInfo(deploymentId);
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbSystemGBean.class);
+ GBEAN_INFO = infoBuilder.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatefulDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatefulDeploymentGBean.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatefulDeploymentGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatefulDeploymentGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,41 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class StatefulDeploymentGBean {
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
+ EjbDeploymentGBean.class,
+ EjbDeploymentGBean.GBEAN_INFO,
+ NameFactory.STATEFUL_SESSION_BEAN);
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+}
Added: geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessDeploymentGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessDeploymentGBean.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessDeploymentGBean.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/StatelessDeploymentGBean.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,41 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class StatelessDeploymentGBean {
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EjbDeploymentGBean.class,
+ EjbDeploymentGBean.class,
+ EjbDeploymentGBean.GBEAN_INFO,
+ NameFactory.STATELESS_SESSION_BEAN);
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+}
Added: 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=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml Wed Jan 17 12:03:23 2007
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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 KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<service xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-loader</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-javaagent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-jee</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-persistence</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+</service>
Added: geronimo/server/trunk/modules/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java?view=auto&rev=497146
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java (added)
+++ geronimo/server/trunk/modules/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java Wed Jan 17 12:03:23 2007
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.openejb;
+
+import junit.framework.TestCase;
+import org.apache.geronimo.gbean.GBeanInfo;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GBeanTest extends TestCase {
+ public void testOpenEjbSystemGBean() {
+ GBeanInfo.getGBeanInfo(OpenEjbSystemGBean.class.getName(), getClass().getClassLoader());
+ }
+
+ public void testEjbModuleImplGBean() {
+ GBeanInfo.getGBeanInfo(EjbModuleImplGBean.class.getName(), getClass().getClassLoader());
+ }
+
+ public void testEntityDeploymentGBean() {
+ GBeanInfo.getGBeanInfo(EntityDeploymentGBean.class.getName(), getClass().getClassLoader());
+ }
+
+ public void testMessageDrivenDeploymentGBean() {
+ GBeanInfo.getGBeanInfo(MessageDrivenDeploymentGBean.class.getName(), getClass().getClassLoader());
+ }
+
+ public void testStatefulDeploymentGBean() {
+ GBeanInfo.getGBeanInfo(StatefulDeploymentGBean.class.getName(), getClass().getClassLoader());
+ }
+
+ public void testStatelessDeploymentGBean() {
+ GBeanInfo.getGBeanInfo(StatelessDeploymentGBean.class.getName(), getClass().getClassLoader());
+ }
+}
Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=497146&r1=497145&r2=497146
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Wed Jan 17 12:03:23 2007
@@ -78,6 +78,8 @@
<module>geronimo-management</module>
<module>geronimo-naming</module>
<module>geronimo-naming-builder</module>
+ <module>geronimo-openejb</module>
+ <module>geronimo-openejb-builder</module>
<module>geronimo-security</module>
<module>geronimo-security-builder</module>
<module>geronimo-service-builder</module>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=497146&r1=497145&r2=497146
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Jan 17 12:03:23 2007
@@ -61,7 +61,7 @@
<!--
Having a single well named property makes automatic updating for the weekly build much easier.
-->
- <openejbVersion>2.3-incubating-SNAPSHOT</openejbVersion>
+ <openejbVersion>3.0-incubating-SNAPSHOT</openejbVersion>
<!--
HACK: Used by uddi-db to execute the sql plugin with the Derby driver.
@@ -261,7 +261,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
</dependency>
<dependency>
@@ -677,46 +677,10 @@
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-axis</artifactId>
- <version>${openejbVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejbVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-corba</artifactId>
- <version>${openejbVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-builder</artifactId>
- <version>${openejbVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-corba-builder</artifactId>
- <version>${openejbVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-pkgen-builder</artifactId>
- <version>${openejbVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-yoko</artifactId>
- <version>${openejbVersion}</version>
- </dependency>
-
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql</artifactId>