You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/04/23 05:35:06 UTC
svn commit: r650735 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/
org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/
org.apac...
Author: mcconne
Date: Tue Apr 22 20:35:03 2008
New Revision: 650735
URL: http://svn.apache.org/viewvc?rev=650735&view=rev
Log:
GERONIMODEVTOOLS-333 Remove all GeronimoEjbJar artifacts
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java
- copied, changed from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/GeronimoOpenejbTest.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-1.xml
- copied, changed from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-1.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-2.xml
- copied, changed from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-2.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-1.xml
- copied, changed from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-1.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml
- copied, changed from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-11.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-2.xml
- copied, changed from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-2.xml
Removed:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/GeronimoEjbJar.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/TssLink.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/WebServiceBinding.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/GeronimoOpenejbTest.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-1.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-2.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-1.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-11.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-2.xml
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/ConversionHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java (from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/GeronimoOpenejbTest.java)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/GeronimoOpenejbTest.java&r1=650732&r2=650735&rev=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/GeronimoOpenejbTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java Tue Apr 22 20:35:03 2008
@@ -24,39 +24,21 @@
import java.io.InputStream;
import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.apache.geronimo.jee.deployment.Artifact;
-import org.apache.geronimo.jee.deployment.Dependencies;
-import org.apache.geronimo.jee.deployment.Dependency;
-import org.apache.geronimo.jee.deployment.Environment;
-import org.apache.geronimo.jee.naming.MessageDestination;
-import org.apache.geronimo.jee.naming.PersistenceUnitRef;
-import org.apache.geronimo.jee.persistence.Persistence;
-import org.apache.geronimo.jee.persistence.PersistenceUnitTransaction;
-import org.apache.geronimo.jee.security.Description;
-import org.apache.geronimo.jee.security.DistinguishedName;
-import org.apache.geronimo.jee.security.LoginDomainPrincipal;
-import org.apache.geronimo.jee.security.Principal;
-import org.apache.geronimo.jee.security.RealmPrincipal;
-import org.apache.geronimo.jee.security.Role;
-import org.apache.geronimo.jee.security.RoleMappings;
-import org.apache.geronimo.jee.security.Security;
-import org.apache.geronimo.jee.security.SubjectInfo;
import org.custommonkey.xmlunit.Diff;
import org.xml.sax.InputSource;
/**
- * <strong>GeronimoOpenejbTest</strong> is used to test various JAXB operations
- * on the following Geronimo-specific XML file supported by the GEP:
+ * <strong>OpenEjbJarTest</strong> is used to test various JAXB operations on
+ * the following Geronimo-specific XML file supported by the GEP:
*
* <ul>
- * <li>geronimo-openejb.xml
+ * <li>openejb-jar.xml
* </ul>
*
* <p>The following JAXB operations are performed:
@@ -65,13 +47,12 @@
* <li>Namespace conversion (TODO)
* <li>Element conversion (TODO)
* <li>Create XML with all fields
- * <li>openejb-jar.xml testcases (TODO)
* </ol>
*
*
* @version $Rev$ $Date$
*/
-public class GeronimoOpenejbTest extends TestCase {
+public class OpenEjbJarTest extends TestCase {
/*------------------------------------------------------------------------*\
| |
@@ -79,14 +60,14 @@
| |
\*------------------------------------------------------------------------*/
public void testUnmarshallAndMarshall() throws Exception {
-// unmarshallAndMarshall("openejb/geronimo-openejb-example-1.xml",
-// "openejb/geronimo-openejb-expected-1.xml");
-// unmarshallAndMarshall("openejb/geronimo-openejb-example-2.xml",
-// "openejb/geronimo-openejb-expected-2.xml");
+ unmarshallAndMarshall("openejb/openejb-jar-example-1.xml",
+ "openejb/openejb-jar-expected-1.xml");
+ unmarshallAndMarshall("openejb/openejb-jar-example-2.xml",
+ "openejb/openejb-jar-expected-2.xml");
}
public void testCompleteXML() throws Exception {
-// buildFullXMLFromScratch("openejb/geronimo-openejb-expected-11.xml");
+// buildFullXMLFromScratch("openejb/openejb-jar-expected-11.xml");
}
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-1.xml (from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-1.xml)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-1.xml?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-1.xml&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-1.xml&r1=650732&r2=650735&rev=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-1.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-1.xml Tue Apr 22 20:35:03 2008
@@ -18,7 +18,7 @@
<!-- @version $Rev$ $Date$ -->
-<ejb-jar xmlns="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<moduleId>
@@ -29,4 +29,4 @@
</moduleId>
</environment>
-</ejb-jar>
+</openejb-jar>
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-2.xml (from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-2.xml)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-2.xml?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-2.xml&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-2.xml&r1=650732&r2=650735&rev=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-example-2.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-example-2.xml Tue Apr 22 20:35:03 2008
@@ -18,408 +18,36 @@
<!-- @version $Rev$ $Date$ -->
-<ejb-jar xmlns="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
- xmlns:n="http://geronimo.apache.org/xml/ns/naming-1.2">
+<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
- <environment>
- <moduleId>
- <groupId>itests</groupId>
- <artifactId>itests</artifactId>
- <version>1</version>
- <type>car</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-ra</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
+ <cmp-connection-factory>
+ <resource-link>SystemDatasource</resource-link>
+ </cmp-connection-factory>
- <openejb-jar>
- <openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
- <ejb-deployment ejb-name="BasicCmpBean" deployment-id="client/tests/entity/cmp/BasicCmpHome" container-id="Default CMP Container">
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <object-ql>SELECT o FROM BasicCmpBeanX o WHERE o.lastName = ?1</object-ql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <object-ql>SELECT o FROM BasicCmpBean o WHERE 'true' = 'false'</object-ql>
- </query>
- </ejb-deployment>
- <ejb-deployment ejb-name="BasicCmp2Bean" deployment-id="client/tests/entity/cmp2/BasicCmpHome" container-id="Default CMP Container">
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <object-ql>SELECT o FROM BasicCmp2Bean o WHERE o.lastName = ?1</object-ql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <object-ql>SELECT o FROM BasicCmp2Bean o WHERE 'true' = 'false'</object-ql>
- </query>
- </ejb-deployment>
- <ejb-deployment ejb-name="AOBasicCmpBean" deployment-id="client/tests/entity/cmp/allowed_operations/EntityHome" container-id="Default CMP Container">
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <object-ql>SELECT o FROM AllowedOperationsCmpBean o WHERE o.lastName = ?1</object-ql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <object-ql>SELECT o FROM AllowedOperationsCmpBean o WHERE 'true' = 'false'</object-ql>
- </query>
- </ejb-deployment>
- <ejb-deployment ejb-name="AOBasicCmp2Bean" deployment-id="client/tests/entity/cmp2/allowed_operations/EntityHome" container-id="Default CMP Container">
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <object-ql>SELECT o FROM AllowedOperationsCmp2Bean o WHERE o.lastName = ?1</object-ql>
- </query>
- <query>
- <query-method>
- <method-name>findEmptyCollection</method-name>
- <method-params/>
- </query-method>
- <object-ql>SELECT o FROM AllowedOperationsCmp2Bean o WHERE 'true' = 'false'</object-ql>
- </query>
- </ejb-deployment>
- <ejb-deployment ejb-name="EncCmpBean" deployment-id="client/tests/entity/cmp/EncBean" container-id="Default CMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="EncCmp2Bean" deployment-id="client/tests/entity/cmp2/EncBean" container-id="Default CMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupCmpBean" deployment-id="client/tests/entity/cmp/ContextLookupCmpBean" container-id="Default CMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="Cmp RMI-IIOP Bean" deployment-id="client/tests/entity/cmp/RMI-over-IIOP/EJBHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="Cmp2 RMI-IIOP Bean" deployment-id="client/tests/entity/cmp2/RMI-over-IIOP/EJBHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="OneToOneA" deployment-id="client/tests/entity/cmr/oneToOne/AHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="OneToOneB" deployment-id="client/tests/entity/cmr/oneToOne/BHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="OneToManyA" deployment-id="client/tests/entity/cmr/oneToMany/AHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="OneToManyB" deployment-id="client/tests/entity/cmr/oneToMany/BHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="OneOwningSideBean" deployment-id="client/tests/entity/cmp2/OneOwningSideBean/EJBHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="OneInverseSideBean" deployment-id="client/tests/entity/cmp2/OneInverseSideBean/EJBHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="ManyOwningSideBean" deployment-id="client/tests/entity/cmp2/ManyOwningSideBean/EJBHome" container-id="Default CMP Container"/>
- <ejb-deployment ejb-name="BasicStatefulBean" deployment-id="client/tests/stateful/BasicStatefulHome" container-id="Default Stateful Container"/>
- <ejb-deployment ejb-name="BasicStatefulPojoBean" deployment-id="client/tests/stateful/BasicStatefulPojoHome" container-id="Default Stateful Container"/>
- <ejb-deployment ejb-name="Basic BMT StatefulBean" deployment-id="client/tests/stateful/BeanManagedBasicStatefulHome" container-id="Default Stateful Container"/>
- <ejb-deployment ejb-name="BMT StatefulBean" deployment-id="client/tests/stateful/BeanManagedTransactionTests/EJBHome" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="EncStatefulBean" deployment-id="client/tests/stateful/EncBean" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionStatefulBean" deployment-id="client/tests/stateful/FieldInjectionStatefulBean" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionStatefulBean" deployment-id="client/tests/stateful/SetterInjectionStatefulBean" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="PersistenceContextStatefulBean" deployment-id="client/tests/stateful/PersistenceContextStatefulBean" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatefulBean" deployment-id="client/tests/stateful/ContextLookupStatefulBean" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatefulPojoBean" deployment-id="client/tests/stateful/ContextLookupStatefulPojoBean" container-id="Default Stateful Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="Stateful RMI-IIOP Bean" deployment-id="client/tests/stateful/RMI-over-IIOP/EJBHome" container-id="Default Stateful Container"/>
- <ejb-deployment ejb-name="BasicStatelessBean" deployment-id="client/tests/stateless/BasicStatelessHome" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="BasicStatelessPojoBean" deployment-id="client/tests/stateless/BasicStatelessPojoHome" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="Basic BMT StatelessBean" deployment-id="client/tests/stateless/BeanManagedBasicStatelessHome" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="DatabaseBean" deployment-id="client/tools/DatabaseHome" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="BMT StatelessBean" deployment-id="client/tests/stateless/BeanManagedTransactionTests/EJBHome" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="EncStatelessBean" deployment-id="client/tests/stateless/EncBean" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionStatelessBean" deployment-id="client/tests/stateless/FieldInjectionStatelessBean" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionStatelessBean" deployment-id="client/tests/stateless/SetterInjectionStatelessBean" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatelessBean" deployment-id="client/tests/stateless/ContextLookupStatelessBean" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatelessPojoBean" deployment-id="client/tests/stateless/ContextLookupStatelessPojoBean" container-id="Default Stateless Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="Stateless RMI-IIOP Bean" deployment-id="client/tests/stateless/RMI-over-IIOP/EJBHome" container-id="Default Stateless Container"/>
- <ejb-deployment ejb-name="BasicBmpBean" deployment-id="client/tests/entity/bmp/BasicBmpHome" container-id="Default BMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="AOBasicBmpBean" deployment-id="client/tests/entity/bmp/allowed_operations/EntityHome" container-id="Default BMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="EncBmpBean" deployment-id="client/tests/entity/bmp/EncBean" container-id="Default BMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupBmpBean" deployment-id="client/tests/entity/bmp/ContextLookupBmpBean" container-id="Default BMP Container">
- </ejb-deployment>
- <ejb-deployment ejb-name="Bmp RMI-IIOP Bean" deployment-id="client/tests/entity/bmp/RMI-over-IIOP/EJBHome" container-id="Default BMP Container"/>
- <ejb-deployment ejb-name="BasicMdbBean" deployment-id="client/tests/messagedriven/mdb/BasicMdb">
- </ejb-deployment>
- <ejb-deployment ejb-name="Basic BMT Mdb Bean" deployment-id="Basic BMT Mdb Bean">
- </ejb-deployment>
- <ejb-deployment ejb-name="EncMdbBean" deployment-id="EncMdbBean">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupMdbBean" deployment-id="ContextLookupMdbBean">
- </ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupMdbPojoBean" deployment-id="ContextLookupMdbPojoBean">
- </ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionMdbBean" deployment-id="FieldInjectionMdbBean">
- </ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionMdbBean" deployment-id="SetterInjectionMdbBean">
- </ejb-deployment>
- <ejb-deployment ejb-name="TimerSyncBean" deployment-id="TimerSyncBean" container-id="Default Stateless Container"/>
- </openejb-jar>
- </openejb-jar>
-
- <n:resource-ref>
- <n:ref-name>jms</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>QueueCF</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>TopicCF</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>connectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>queueConnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>topicConnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/coonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/queueCoonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/topicCoonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/coonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/queueCoonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/topicCoonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/coonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/queueCoonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/topicCoonnectionFactory</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>activemq</n:artifactId>
- <n:name>DefaultActiveMQConnectionFactory</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>database</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>datasource</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>jdbc/basic/entityDatabase</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>stateless/references/Resource_manager_access</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/daataSource</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/daataSource</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:resource-ref>
- <n:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/daataSource</n:ref-name>
- <n:pattern>
- <n:groupId>org.apache.geronimo.configs</n:groupId>
- <n:artifactId>system-database</n:artifactId>
- <n:name>SystemDatasource</n:name>
- </n:pattern>
- </n:resource-ref>
-
- <n:persistence-context-ref>
- <n:persistence-context-ref-name>persistence/TestContext</n:persistence-context-ref-name>
- <n:persistence-unit-name>openjpa-test-unit</n:persistence-unit-name>
- <n:persistence-context-type>Transactional</n:persistence-context-type>
- </n:persistence-context-ref>
-
- <n:persistence-context-ref>
- <n:persistence-context-ref-name>persistence/ExtendedTestContext</n:persistence-context-ref-name>
- <n:persistence-unit-name>openjpa-test-unit</n:persistence-unit-name>
- <n:persistence-context-type>Extended</n:persistence-context-type>
- </n:persistence-context-ref>
-
- <n:persistence-unit-ref>
- <n:persistence-unit-ref-name>persistence/TestUnit</n:persistence-unit-ref-name>
- <n:persistence-unit-name>openjpa-test-unit</n:persistence-unit-name>
- </n:persistence-unit-ref>
+ <enterprise-beans>
-</ejb-jar>
+ <session>
+ <ejb-name>SimpleStatelessSession</ejb-name>
+ <jndi-name>client/test/simple/SimpleStatelessSessionHome</jndi-name>
+ </session>
+
+ <entity>
+ <ejb-name>SimpleCMPEntity</ejb-name>
+ <table-name>SimpleCMP</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>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
+ </entity>
+
+ </enterprise-beans>
+
+</openejb-jar>
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-1.xml (from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-1.xml)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-1.xml?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-1.xml&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-1.xml&r1=650732&r2=650735&rev=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-1.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-1.xml Tue Apr 22 20:35:03 2008
@@ -18,7 +18,7 @@
<!-- @version $Rev$ $Date$ -->
-<ns4:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
+<ns4:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
<environment>
<moduleId>
<groupId>geronimo</groupId>
@@ -27,4 +27,4 @@
<type>car</type>
</moduleId>
</environment>
-</ns4:ejb-jar>
+</ns4:openejb-jar>
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml (from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-11.xml)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-11.xml&r1=650732&r2=650735&rev=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml Tue Apr 22 20:35:03 2008
@@ -18,7 +18,7 @@
<!-- @version $Rev$ $Date$ -->
-<ns2:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns6="http://java.sun.com/xml/ns/persistence">
+<ns2:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns6="http://java.sun.com/xml/ns/persistence">
<environment>
<moduleId>
<groupId>org.apache.geronimo.testsuite</groupId>
@@ -126,4 +126,4 @@
</ns6:properties>
</ns6:persistence-unit>
</ns6:persistence>
-</ns2:ejb-jar>
+</ns2:openejb-jar>
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-2.xml (from r650732, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-2.xml)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-2.xml?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-2.xml&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-2.xml&r1=650732&r2=650735&rev=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/geronimo-openejb-expected-2.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-2.xml Tue Apr 22 20:35:03 2008
@@ -18,349 +18,27 @@
<!-- @version $Rev$ $Date$ -->
-<ns4:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns9="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <ns4:openejb-jar>
- <openejb-jar:openejb-jar xmlns:openejb-jar="http://www.openejb.org/openejb-jar/1.1">
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp/BasicCmpHome" ejb-name="BasicCmpBean">
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findByLastName</openejb-jar:method-name>
- <openejb-jar:method-params>
- <openejb-jar:method-param>java.lang.String</openejb-jar:method-param>
- </openejb-jar:method-params>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM BasicCmpBeanX o WHERE o.lastName = ?1</openejb-jar:object-ql>
- </openejb-jar:query>
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findEmptyCollection</openejb-jar:method-name>
- <openejb-jar:method-params/>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM BasicCmpBean o WHERE 'true' = 'false'</openejb-jar:object-ql>
- </openejb-jar:query>
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/BasicCmpHome" ejb-name="BasicCmp2Bean">
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findByLastName</openejb-jar:method-name>
- <openejb-jar:method-params>
- <openejb-jar:method-param>java.lang.String</openejb-jar:method-param>
- </openejb-jar:method-params>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM BasicCmp2Bean o WHERE o.lastName = ?1</openejb-jar:object-ql>
- </openejb-jar:query>
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findEmptyCollection</openejb-jar:method-name>
- <openejb-jar:method-params/>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM BasicCmp2Bean o WHERE 'true' = 'false'</openejb-jar:object-ql>
- </openejb-jar:query>
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp/allowed_operations/EntityHome" ejb-name="AOBasicCmpBean">
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findByLastName</openejb-jar:method-name>
- <openejb-jar:method-params>
- <openejb-jar:method-param>java.lang.String</openejb-jar:method-param>
- </openejb-jar:method-params>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM AllowedOperationsCmpBean o WHERE o.lastName = ?1</openejb-jar:object-ql>
- </openejb-jar:query>
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findEmptyCollection</openejb-jar:method-name>
- <openejb-jar:method-params/>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM AllowedOperationsCmpBean o WHERE 'true' = 'false'</openejb-jar:object-ql>
- </openejb-jar:query>
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/allowed_operations/EntityHome" ejb-name="AOBasicCmp2Bean">
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findByLastName</openejb-jar:method-name>
- <openejb-jar:method-params>
- <openejb-jar:method-param>java.lang.String</openejb-jar:method-param>
- </openejb-jar:method-params>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM AllowedOperationsCmp2Bean o WHERE o.lastName = ?1</openejb-jar:object-ql>
- </openejb-jar:query>
- <openejb-jar:query>
- <openejb-jar:query-method>
- <openejb-jar:method-name>findEmptyCollection</openejb-jar:method-name>
- <openejb-jar:method-params/>
- </openejb-jar:query-method>
- <openejb-jar:object-ql>SELECT o FROM AllowedOperationsCmp2Bean o WHERE 'true' = 'false'</openejb-jar:object-ql>
- </openejb-jar:query>
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp/EncBean" ejb-name="EncCmpBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/EncBean" ejb-name="EncCmp2Bean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp/ContextLookupCmpBean" ejb-name="ContextLookupCmpBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp/RMI-over-IIOP/EJBHome" ejb-name="Cmp RMI-IIOP Bean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/RMI-over-IIOP/EJBHome" ejb-name="Cmp2 RMI-IIOP Bean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmr/oneToOne/AHome" ejb-name="OneToOneA"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmr/oneToOne/BHome" ejb-name="OneToOneB"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmr/oneToMany/AHome" ejb-name="OneToManyA"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmr/oneToMany/BHome" ejb-name="OneToManyB"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/OneOwningSideBean/EJBHome" ejb-name="OneOwningSideBean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/OneInverseSideBean/EJBHome" ejb-name="OneInverseSideBean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default CMP Container" deployment-id="client/tests/entity/cmp2/ManyOwningSideBean/EJBHome" ejb-name="ManyOwningSideBean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/BasicStatefulHome" ejb-name="BasicStatefulBean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/BasicStatefulPojoHome" ejb-name="BasicStatefulPojoBean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/BeanManagedBasicStatefulHome" ejb-name="Basic BMT StatefulBean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/BeanManagedTransactionTests/EJBHome" ejb-name="BMT StatefulBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/EncBean" ejb-name="EncStatefulBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/FieldInjectionStatefulBean" ejb-name="FieldInjectionStatefulBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/SetterInjectionStatefulBean" ejb-name="SetterInjectionStatefulBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/PersistenceContextStatefulBean" ejb-name="PersistenceContextStatefulBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/ContextLookupStatefulBean" ejb-name="ContextLookupStatefulBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/ContextLookupStatefulPojoBean" ejb-name="ContextLookupStatefulPojoBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateful Container" deployment-id="client/tests/stateful/RMI-over-IIOP/EJBHome" ejb-name="Stateful RMI-IIOP Bean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/BasicStatelessHome" ejb-name="BasicStatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/BasicStatelessPojoHome" ejb-name="BasicStatelessPojoBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/BeanManagedBasicStatelessHome" ejb-name="Basic BMT StatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tools/DatabaseHome" ejb-name="DatabaseBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/BeanManagedTransactionTests/EJBHome" ejb-name="BMT StatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/EncBean" ejb-name="EncStatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/FieldInjectionStatelessBean" ejb-name="FieldInjectionStatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/SetterInjectionStatelessBean" ejb-name="SetterInjectionStatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/ContextLookupStatelessBean" ejb-name="ContextLookupStatelessBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/ContextLookupStatelessPojoBean" ejb-name="ContextLookupStatelessPojoBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="client/tests/stateless/RMI-over-IIOP/EJBHome" ejb-name="Stateless RMI-IIOP Bean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default BMP Container" deployment-id="client/tests/entity/bmp/BasicBmpHome" ejb-name="BasicBmpBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default BMP Container" deployment-id="client/tests/entity/bmp/allowed_operations/EntityHome" ejb-name="AOBasicBmpBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default BMP Container" deployment-id="client/tests/entity/bmp/EncBean" ejb-name="EncBmpBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default BMP Container" deployment-id="client/tests/entity/bmp/ContextLookupBmpBean" ejb-name="ContextLookupBmpBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default BMP Container" deployment-id="client/tests/entity/bmp/RMI-over-IIOP/EJBHome" ejb-name="Bmp RMI-IIOP Bean"/>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="client/tests/messagedriven/mdb/BasicMdb" ejb-name="BasicMdbBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="Basic BMT Mdb Bean" ejb-name="Basic BMT Mdb Bean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="EncMdbBean" ejb-name="EncMdbBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="ContextLookupMdbBean" ejb-name="ContextLookupMdbBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="ContextLookupMdbPojoBean" ejb-name="ContextLookupMdbPojoBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="FieldInjectionMdbBean" ejb-name="FieldInjectionMdbBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" deployment-id="SetterInjectionMdbBean" ejb-name="SetterInjectionMdbBean">
- </openejb-jar:ejb-deployment>
- <openejb-jar:ejb-deployment xmlns:ns11="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" container-id="Default Stateless Container" deployment-id="TimerSyncBean" ejb-name="TimerSyncBean"/>
- </openejb-jar:openejb-jar>
- </ns4:openejb-jar>
- <ns3:resource-ref>
- <ns3:ref-name>jms</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>QueueCF</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>TopicCF</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>connectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>queueConnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>topicConnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/coonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/queueCoonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/topicCoonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/coonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/queueCoonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/topicCoonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/coonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/queueCoonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/topicCoonnectionFactory</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>activemq</ns3:artifactId>
- <ns3:name>DefaultActiveMQConnectionFactory</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>database</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>datasource</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>jdbc/basic/entityDatabase</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>stateless/references/Resource_manager_access</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateless.AnnotatedFieldInjectionStatelessBean/daataSource</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.stateful.AnnotatedFieldInjectionStatefulBean/daataSource</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:resource-ref>
- <ns3:ref-name>org.apache.openejb.test.mdb.AnnotatedFieldInjectionMdbBean/daataSource</ns3:ref-name>
- <ns3:pattern>
- <ns3:groupId>org.apache.geronimo.configs</ns3:groupId>
- <ns3:artifactId>system-database</ns3:artifactId>
- <ns3:name>SystemDatasource</ns3:name>
- </ns3:pattern>
- </ns3:resource-ref>
- <ns3:persistence-context-ref>
- <ns3:persistence-context-ref-name>persistence/TestContext</ns3:persistence-context-ref-name>
- <ns3:persistence-unit-name>openjpa-test-unit</ns3:persistence-unit-name>
- <ns3:persistence-context-type>Transactional</ns3:persistence-context-type>
- </ns3:persistence-context-ref>
- <ns3:persistence-context-ref>
- <ns3:persistence-context-ref-name>persistence/ExtendedTestContext</ns3:persistence-context-ref-name>
- <ns3:persistence-unit-name>openjpa-test-unit</ns3:persistence-unit-name>
- <ns3:persistence-context-type>Extended</ns3:persistence-context-type>
- </ns3:persistence-context-ref>
- <ns3:persistence-unit-ref>
- <ns3:persistence-unit-ref-name>persistence/TestUnit</ns3:persistence-unit-ref-name>
- <ns3:persistence-unit-name>openjpa-test-unit</ns3:persistence-unit-name>
- </ns3:persistence-unit-ref>
-</ns4:ejb-jar>
+<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns4="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+ <enterprise-beans>
+ <session>
+ <ejb-name>SimpleStatelessSession</ejb-name>
+ <jndi-name>client/test/simple/SimpleStatelessSessionHome</jndi-name>
+ </session>
+ <entity>
+ <ejb-name>SimpleCMPEntity</ejb-name>
+ <table-name>SimpleCMP</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>firstName</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>lastName</table-column>
+ </cmp-field-mapping>
+ </entity>
+ </enterprise-beans>
+</openejb-jar>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/ConversionHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/ConversionHelper.java?rev=650735&r1=650734&r2=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/ConversionHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/ConversionHelper.java Tue Apr 22 20:35:03 2008
@@ -50,14 +50,14 @@
/**
- * Convert a geronimo-openejb.xml deployment plan file (if necessary)
- * and return the JAXB representation
+ * Convert an openejb-jar.xml deployment plan file (if necessary) and return the
+ * JAXB representation
*
- * @param plan Geronimo deployment plan
+ * @param plan OpenEJB deployment plan
*
* @exception JAXBException if JAXB error
*/
- public static void convertGeronimoOpenEjbFile( IFile plan ) throws JAXBException {
+ public static void convertOpenEjbJarFile( IFile plan ) throws JAXBException {
Trace.tracePoint("Entry", "ConversionHelper.convertGeronimoOpenEjbFile", plan);
convertNamespace( plan );
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java?rev=650735&r1=650734&r2=650735&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java Tue Apr 22 20:35:03 2008
@@ -76,7 +76,7 @@
}
else if (type.equals(IModuleConstants.JST_EJB_MODULE)) {
planFile = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
- ConversionHelper.convertGeronimoOpenEjbFile(planFile);
+ ConversionHelper.convertOpenEjbJarFile(planFile);
}
else if (type.equals(IModuleConstants.JST_EAR_MODULE)) {
planFile = GeronimoUtils.getApplicationDeploymentPlanFile(comp);