You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/21 04:22:45 UTC

svn commit: r498239 - in /incubator/openejb/trunk/openejb3/container/openejb-jee/src: main/java/org/apache/openejb/jee/g2/ main/java/org/apache/openejb/jee/oej2/ test/java/org/apache/openejb/jee/oej2/ test/resources/

Author: dblevins
Date: Sat Jan 20 19:22:44 2007
New Revision: 498239

URL: http://svn.apache.org/viewvc?view=rev&rev=498239
Log:
Jaxb elements for the new geronimo-openejb.xml file

Added:
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/GeronimoEjbJar.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/package-info.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml
Modified:
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/GeronimoEjbJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/GeronimoEjbJar.java?view=auto&rev=498239
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/GeronimoEjbJar.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/GeronimoEjbJar.java Sat Jan 20 19:22:44 2007
@@ -0,0 +1,75 @@
+/**
+ * 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.openejb.jee.g2;
+
+import org.apache.openejb.jee.oej2.EnvironmentType;
+import org.apache.openejb.jee.oej2.MessageDestinationType;
+import org.apache.openejb.jee.oej2.AbstractSecurityType;
+import org.apache.openejb.jee.oej2.AbstractServiceType;
+import org.apache.openejb.jee.oej2.AbstractNamingEntryType;
+import org.apache.openejb.jee.oej2.EjbRefType;
+import org.apache.openejb.jee.oej2.EjbLocalRefType;
+import org.apache.openejb.jee.oej2.ServiceRefType;
+import org.apache.openejb.jee.oej2.ResourceRefType;
+import org.apache.openejb.jee.oej2.ResourceEnvRefType;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.JAXBElement;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "geronimo-ejb-jarType", namespace = "http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0", propOrder = {
+    "environment",
+    "messageDestination",
+    "security",
+    "service"
+})
+public class GeronimoEjbJar {
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+    protected EnvironmentType environment;
+
+    @XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
+    protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
+
+    @XmlElement(name = "ejb-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EjbRefType> ejbRef;
+
+    @XmlElement(name = "ejb-local-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EjbLocalRefType> ejbLocalRef;
+
+    @XmlElement(name = "service-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ServiceRefType> serviceRef;
+
+    @XmlElement(name = "resource-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ResourceRefType> resourceRef;
+
+    @XmlElement(name = "resource-env-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ResourceEnvRefType> resourceEnvRef;
+
+    @XmlElement(name = "message-destination", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<MessageDestinationType> messageDestination;
+
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+    protected AbstractSecurityType security;
+
+    @XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", type = JAXBElement.class)
+    protected List<JAXBElement<? extends AbstractServiceType>> service;
+}

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/package-info.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/package-info.java?view=auto&rev=498239
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/package-info.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/g2/package-info.java Sat Jan 20 19:22:44 2007
@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value=javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class,type=String.class)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.openejb.jee.g2;

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java?view=diff&rev=498239&r1=498238&r2=498239
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java Sat Jan 20 19:22:44 2007
@@ -85,22 +85,31 @@
 
     @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
     protected EnvironmentType environment;
+
     @XmlElement(name = "cmp-connection-factory")
     protected ResourceLocatorType cmpConnectionFactory;
+
     @XmlElement(name = "ejb-ql-compiler-factory", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected java.lang.String ejbQlCompilerFactory;
+
     @XmlElement(name = "db-syntax-factory", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected java.lang.String dbSyntaxFactory;
+
     @XmlElement(name = "enforce-foreign-key-constraints", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected EmptyType enforceForeignKeyConstraints;
+
     @XmlElement(name = "enterprise-beans", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
     protected OpenejbJarType.EnterpriseBeans enterpriseBeans;
+
     @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected RelationshipsType relationships;
+
     @XmlElement(name = "message-destination")
     protected List<MessageDestinationType> messageDestination;
+
     @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
     protected AbstractSecurityType security;
+
     @XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractServiceType>> service;
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java?view=diff&rev=498239&r1=498238&r2=498239
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java Sat Jan 20 19:22:44 2007
@@ -91,24 +91,34 @@
     protected java.lang.String tssLink;
     @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected PatternType tss;
+
     @XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
-    @XmlElement(name = "ejb-ref")
+
+    @XmlElement(name = "ejb-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<EjbRefType> ejbRef;
-    @XmlElement(name = "ejb-local-ref")
+
+    @XmlElement(name = "ejb-local-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<EjbLocalRefType> ejbLocalRef;
-    @XmlElement(name = "service-ref")
+
+    @XmlElement(name = "service-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<ServiceRefType> serviceRef;
-    @XmlElement(name = "resource-ref")
+
+    @XmlElement(name = "resource-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<ResourceRefType> resourceRef;
-    @XmlElement(name = "resource-env-ref")
+
+    @XmlElement(name = "resource-env-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<ResourceEnvRefType> resourceEnvRef;
+
     @XmlElement(name = "web-service-address", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected java.lang.String webServiceAddress;
+
     @XmlElement(name = "web-service-virtual-host", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected List<java.lang.String> webServiceVirtualHost;
+
     @XmlElement(name = "web-service-security", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
     protected WebServiceSecurityType webServiceSecurity;
+
     @XmlAttribute
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java?view=auto&rev=498239
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java Sat Jan 20 19:22:44 2007
@@ -0,0 +1,24 @@
+/**
+ * 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.openejb.jee.oej2;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConversionTest {
+    
+}

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml?view=auto&rev=498239
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml Sat Jan 20 19:22:44 2007
@@ -0,0 +1,833 @@
+<?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.
+-->
+
+<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+  xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
+  xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+    <environment>
+        <moduleId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-itests-core</artifactId>
+            <version>${openejbVersion}</version>
+            <type>car</type>
+        </moduleId>
+
+        <dependencies>
+          <dependency>
+              <groupId>org.apache.geronimo.configs</groupId>
+              <artifactId>j2ee-corba-yoko</artifactId>
+              <version>${version}</version>
+              <type>car</type>
+          </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${version}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+            </dependency>
+        </dependencies>
+    </environment>
+
+    <cmp-connection-factory>
+        <resource-link>SystemDatasource</resource-link>
+    </cmp-connection-factory>
+
+    <enterprise-beans>
+        <!--
+        ########################################################
+        Stateless
+        ########################################################
+        -->
+        <session>
+            <ejb-name>BasicStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateless/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BasicBMTStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BeanManagedBasicStatelessHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateless/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>DatabaseBean</ejb-name>
+            <jndi-name>client/tools/DatabaseHome</jndi-name>
+            <resource-ref>
+                <ref-name>database</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BMTStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BeanManagedTransactionTests/EJBHome</jndi-name>
+            <resource-ref>
+                <ref-name>database</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>EncStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/EncBean</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>StatelessRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/stateless/RMI-over-IIOP/EJBHome</jndi-name>
+        </session>
+        <session>
+            <ejb-name>BasicStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateless/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>SessionFacadeBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/SessionFacadeBean</jndi-name>
+        </session>
+
+        <!--
+        ########################################################
+        Stateless
+        ########################################################
+        -->
+        <session>
+            <ejb-name>BasicStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BasicStatefulHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateful/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BasicBMTStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BeanManagedBasicStatefulHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateful/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BMTStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BeanManagedTransactionTests/EJBHome</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>EncStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/EncBean</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>StatefulRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/stateful/RMI-over-IIOP/EJBHome</jndi-name>
+        </session>
+
+        <!--
+        ########################################################
+        BMP
+        ########################################################
+        -->
+        <entity>
+            <ejb-name>BasicBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/BasicBmpHome</jndi-name>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>AOBasicBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/allowed_operations/EntityHome</jndi-name>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>entity/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>EncBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/EncBean</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>BmpRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/RMI-over-IIOP/EJBHome</jndi-name>
+        </entity>
+
+        <!--
+        ########################################################
+        CMP 2
+        ########################################################
+        -->
+
+        <entity>
+            <ejb-name>BasicCmp2Bean</ejb-name>
+            <jndi-name>client/tests/entity/cmp2/BasicCmpHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>AOBasicCmp2Bean</ejb-name>
+            <jndi-name>client/tests/entity/cmp2/allowed_operations/EntityHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>entity/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>EncCmp2Bean</ejb-name>
+            <jndi-name>client/tests/entity/cmp2/EncBean</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM EncCmp2 AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+        </entity>
+        <entity>
+            <ejb-name>Cmp2RMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp2/RMI-over-IIOP/EJBHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM Cmp2RmiIiop AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+        </entity>
+
+        <!--
+        ########################################################
+        CMP
+        ########################################################
+        -->
+
+        <entity>
+            <ejb-name>BasicCmpBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <query>
+                <query-method>
+                    <method-name>findByLastName</method-name>
+                    <method-params>
+                        <method-param>java.lang.String</method-param>
+                    </method-params>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM BasicCmpBean AS a WHERE a.lastName = ?1]]>
+                </ejb-ql>
+            </query>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM BasicCmpBean AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+        </entity>
+        <entity>
+            <ejb-name>BasicCmpBeanExplicitPK</ejb-name>
+            <table-name>entity_explicit_pk</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM BasicCmpBeanExplicitPK AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+            <query>
+                <query-method>
+                    <method-name>findByPrimaryKey</method-name>
+                    <method-params>
+                        <method-param>java.lang.Integer</method-param>
+                    </method-params>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM BasicCmpBeanExplicitPK AS a]]>
+                </ejb-ql>
+                <no-cache-flush/>
+            </query>
+            <query>
+                <query-method>
+                    <method-name>findByLastName</method-name>
+                    <method-params>
+                        <method-param>java.lang.String</method-param>
+                    </method-params>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM BasicCmpBeanExplicitPK AS a WHERE a.lastName = ?1]]>
+                </ejb-ql>
+            </query>
+        </entity>
+        <entity>
+            <ejb-name>AOBasicCmpBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/allowed_operations/EntityHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>entity/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <query>
+                <query-method>
+                    <method-name>findByLastName</method-name>
+                    <method-params>
+                        <method-param>java.lang.String</method-param>
+                    </method-params>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM AOBasicCmpBean AS a WHERE a.lastName = ?1]]>
+                </ejb-ql>
+            </query>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM AOBasicCmpBean AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+        </entity>
+        <entity>
+            <ejb-name>EncCmpBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/EncBean</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+             <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM EncCmpBean AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+        </entity>
+        <entity>
+            <ejb-name>CmpRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/RMI-over-IIOP/EJBHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <ejb-ql>
+                    <![CDATA[SELECT OBJECT(a) FROM CmpRMIIIOPBean AS a WHERE 1 = 0]]>
+                </ejb-ql>
+            </query>
+        </entity>
+
+        <!--
+        ########################################################
+        CMP2 - CMRMapping
+        ########################################################
+        -->
+
+        <entity>
+            <ejb-name>OneOwningSideBean</ejb-name>
+            <table-name>OneOwning</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>col_id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>field1</cmp-field-name>
+                <table-column>col_field1</table-column>
+            </cmp-field-mapping>
+        </entity>
+        <entity>
+            <ejb-name>OneInverseSideBean</ejb-name>
+            <table-name>OneInverse</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>col_id</table-column>
+            </cmp-field-mapping>
+        </entity>
+        <entity>
+            <ejb-name>ManyOwningSideBean</ejb-name>
+            <table-name>ManyOwning</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>col_id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>field1</cmp-field-name>
+                <table-column>col_field1</table-column>
+            </cmp-field-mapping>
+        </entity>
+
+        <entity>
+            <ejb-name>AddressEJB</ejb-name>
+            <jndi-name>client/tests/cmp2/petstore/Address</jndi-name>
+            <table-name>address</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <cmp-field-class>java.lang.Integer</cmp-field-class>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>street</cmp-field-name>
+                <table-column>street</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>city</cmp-field-name>
+                <table-column>city</table-column>
+            </cmp-field-mapping>
+            <primkey-field>id</primkey-field>
+            <key-generator xmlns="http://openejb.apache.org/xml/ns/pkgen-2.1">
+                <auto-increment-table>
+                    <sql>insert into sequence_table (dummy) values (1)</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+        </entity>
+
+        <entity>
+            <ejb-name>StorageBean</ejb-name>
+            <jndi-name>cmp2/Storage</jndi-name>
+            <table-name>storage</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>blob</cmp-field-name>
+                <table-column>blob_column</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>char</cmp-field-name>
+                <table-column>char_column</table-column>
+                <sql-type>CHAR</sql-type>
+            </cmp-field-mapping>
+            <resource-ref>
+                <ref-name>jdbc/DefaultDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+
+        <session>
+            <ejb-name>CMRMappingFacadeBean</ejb-name>
+            <jndi-name>cmp2/CMRMappingFacade</jndi-name>
+        </session>
+
+    </enterprise-beans>
+
+    <relationships>
+        <ejb-relation>
+            <ejb-relationship-role>
+                <relationship-role-source>
+                    <ejb-name>OneInverseSideBean</ejb-name>
+                </relationship-role-source>
+                <cmr-field>
+                    <cmr-field-name>oneOwningSide</cmr-field-name>
+                </cmr-field>
+                <role-mapping>
+                    <cmr-field-mapping>
+                        <key-column>col_id</key-column>
+                        <foreign-key-column>col_field1</foreign-key-column>
+                    </cmr-field-mapping>
+                </role-mapping>
+            </ejb-relationship-role>
+        </ejb-relation>
+        <ejb-relation>
+            <ejb-relationship-role>
+                <relationship-role-source>
+                    <ejb-name>OneInverseSideBean</ejb-name>
+                </relationship-role-source>
+                <cmr-field>
+                    <cmr-field-name>manyOwningSide</cmr-field-name>
+                </cmr-field>
+                <role-mapping>
+                    <cmr-field-mapping>
+                        <key-column>col_id</key-column>
+                        <foreign-key-column>col_field1</foreign-key-column>
+                    </cmr-field-mapping>
+                </role-mapping>
+            </ejb-relationship-role>
+        </ejb-relation>
+    </relationships>
+
+    <!--
+      ########################################################
+      ########################################################
+      -->
+
+    <gbean name="ORBConfigAdapter" class="org.apache.openejb.yoko.ORBConfigAdapterGBean"/>
+
+</openejb-jar>