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/03/08 03:38:32 UTC
svn commit: r515900 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-jee/src/main/java/org/apache/openejb/jee/
container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ it...
Author: dblevins
Date: Wed Mar 7 18:38:31 2007
New Revision: 515900
URL: http://svn.apache.org/viewvc?view=rev&rev=515900
Log:
Dialed down the logging on deploy. Created resource links for most of the refs in itests openejb-jar.xml. Added a DynamicDeployer at the end of the chain that will write your descriptors back out to disk so you can see/have the generated openejb-jar.xml and generated ejb-jar.xml (for annotated beans).
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java
incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?view=diff&rev=515900&r1=515899&r2=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Wed Mar 7 18:38:31 2007
@@ -217,7 +217,7 @@
if (!autoCreateConnectors){
throw new OpenEJBException(message);
}
- logger.error(message);
+ logger.info(message);
// if there is a provider with the specified name. use it
if (!ServiceUtils.hasServiceProvider(resourceId)) {
@@ -254,7 +254,7 @@
if (!autoCreateConnectors){
throw new OpenEJBException(message);
}
- logger.error(message);
+ logger.info(message);
// if there is a provider with the specified name. use it
if (ServiceUtils.hasServiceProvider(name)) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?view=diff&rev=515900&r1=515899&r2=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Wed Mar 7 18:38:31 2007
@@ -148,6 +148,8 @@
DeploymentLoader.logger.info("Validation is disabled.");
}
+ // TODO: How do we want this plugged in?
+ //chain.add(new OutputGeneratedDescriptors());
this.deployer = chain;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java?view=diff&rev=515900&r1=515899&r2=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/InitEjbDeployments.java Wed Mar 7 18:38:31 2007
@@ -71,7 +71,7 @@
ejbDeployment.setEjbName(bean.getEjbName());
ejbDeployment.setDeploymentId(autoAssignDeploymentId(bean, contextData));
- logger.warning("Auto-deploying ejb " + bean.getEjbName() + ": EjbDeployment(deployment-id=" + ejbDeployment.getDeploymentId() + ", container-id=" + ejbDeployment.getContainerId() + ")");
+ logger.info("Auto-deploying ejb " + bean.getEjbName() + ": EjbDeployment(deployment-id=" + ejbDeployment.getDeploymentId() + ", container-id=" + ejbDeployment.getContainerId() + ")");
openejbJar.getEjbDeployment().add(ejbDeployment);
}
}
Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java?view=auto&rev=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java Wed Mar 7 18:38:31 2007
@@ -0,0 +1,85 @@
+/**
+ * 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.config;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.JaxbJavaee;
+import org.apache.openejb.jee.oejb3.JaxbOpenejbJar3;
+import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.util.Logger;
+
+import javax.xml.bind.JAXBException;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class OutputGeneratedDescriptors implements DynamicDeployer {
+ private static final Logger logger = Logger.getInstance("OpenEJB.startup.config", "org.apache.openejb.util.resources");
+
+ public AppModule deploy(AppModule appModule) throws OpenEJBException {
+ for (EjbModule ejbModule : appModule.getEjbModules()) {
+
+ if (ejbModule.getEjbJar() != null) {
+ writeEjbJar(ejbModule);
+ }
+
+ if (ejbModule.getOpenejbJar() != null) {
+ writeOpenejbJar(ejbModule);
+ }
+ }
+
+ return appModule;
+ }
+
+ private void writeOpenejbJar(EjbModule ejbModule) {
+ try {
+ OpenejbJar openejbJar = ejbModule.getOpenejbJar();
+ File tempFile = File.createTempFile(ejbModule.getModuleId(), ".openejb-jar.xml");
+ FileOutputStream fout = new FileOutputStream(tempFile);
+ BufferedOutputStream out = new BufferedOutputStream(fout);
+ try {
+ JaxbOpenejbJar3.marshal(OpenejbJar.class, openejbJar, out);
+ logger.info("Dumping Generated openejb-jar.xml to: " + tempFile.getAbsolutePath());
+ } catch (JAXBException e) {
+ } finally {
+ out.close();
+ }
+ } catch (Exception e) {
+ }
+ }
+
+ private void writeEjbJar(EjbModule ejbModule) {
+ try {
+ EjbJar ejbJar = ejbModule.getEjbJar();
+ File tempFile = File.createTempFile(ejbModule.getModuleId(), ".ejb-jar.xml");
+ FileOutputStream fout = new FileOutputStream(tempFile);
+ BufferedOutputStream out = new BufferedOutputStream(fout);
+ try {
+ JaxbJavaee.marshal(EjbJar.class, ejbJar, out);
+ logger.info("Dumping Generated ejb-jar.xml to: " + tempFile.getAbsolutePath());
+ } catch (JAXBException e) {
+ } finally {
+ out.close();
+ }
+ } catch (Exception e) {
+ }
+ }
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java?view=diff&rev=515900&r1=515899&r2=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java Wed Mar 7 18:38:31 2007
@@ -34,6 +34,7 @@
import javax.xml.transform.sax.SAXSource;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Map;
import java.util.HashMap;
@@ -45,15 +46,20 @@
private static Map<Class,JAXBContext> jaxbContexts = new HashMap<Class,JAXBContext>();
public static <T>String marshal(Class<T> type, Object object) throws JAXBException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ marshal(type, object, baos);
+
+ return new String(baos.toByteArray());
+ }
+
+ public static <T>void marshal(Class<T> type, Object object, OutputStream out) throws JAXBException {
JAXBContext ctx2 = JaxbJavaee.getContext(type);
Marshaller marshaller = ctx2.createMarshaller();
marshaller.setProperty("jaxb.formatted.output", true);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- marshaller.marshal(object, baos);
-
- return new String(baos.toByteArray());
+ marshaller.marshal(object, out);
}
private static <T>JAXBContext getContext(Class<T> type) throws JAXBException {
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java?view=diff&rev=515900&r1=515899&r2=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java Wed Mar 7 18:38:31 2007
@@ -35,6 +35,7 @@
import javax.xml.transform.sax.SAXSource;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
/**
* @version $Rev$ $Date$
@@ -43,15 +44,19 @@
private static JAXBContext jaxbContext;
public static <T>String marshal(Class<T> type, Object object) throws JAXBException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ marshal(type, object, baos);
+
+ return new String(baos.toByteArray());
+ }
+
+ public static <T> void marshal(Class<T> type, Object object, OutputStream out) throws JAXBException {
JAXBContext ctx2 = getContext(type);
Marshaller marshaller = ctx2.createMarshaller();
marshaller.setProperty("jaxb.formatted.output", true);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- marshaller.marshal(object, baos);
-
- return new String(baos.toByteArray());
+ marshaller.marshal(object, out);
}
private static <T>JAXBContext getContext(Class<T> type) throws JAXBException {
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=515900&r1=515899&r2=515900
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml Wed Mar 7 18:38:31 2007
@@ -17,8 +17,7 @@
limitations under the License.
-->
<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">
+ <ejb-deployment ejb-name="BasicCmpBean" deployment-id="client/tests/entity/cmp/BasicCmpHome" container-id="Default CMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
<query>
<query-method>
@@ -27,22 +26,17 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <object-ql>
- SELECT o FROM BasicCmpBeanX o WHERE o.lastName = ?1
- </object-ql>
+ <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>
+ <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">
+ <ejb-deployment ejb-name="BasicCmp2Bean" deployment-id="client/tests/entity/cmp2/BasicCmpHome" container-id="Default CMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
<query>
<query-method>
@@ -51,22 +45,17 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <object-ql>
- SELECT o FROM BasicCmp2Bean o WHERE o.lastName = ?1
- </object-ql>
+ <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>
+ <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">
+ <ejb-deployment ejb-name="AOBasicCmpBean" deployment-id="client/tests/entity/cmp/allowed_operations/EntityHome" container-id="Default CMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
<query>
<query-method>
@@ -75,22 +64,17 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <object-ql>
- SELECT o FROM AllowedOperationsCmpBean o WHERE o.lastName = ?1
- </object-ql>
+ <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>
+ <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">
+ <ejb-deployment ejb-name="AOBasicCmp2Bean" deployment-id="client/tests/entity/cmp2/allowed_operations/EntityHome" container-id="Default CMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
<query>
<query-method>
@@ -99,159 +83,193 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <object-ql>
- SELECT o FROM AllowedOperationsCmp2Bean o WHERE o.lastName = ?1
- </object-ql>
+ <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>
+ <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-name="EncCmpBean" deployment-id="client/tests/entity/cmp/EncBean" container-id="Default CMP Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="EncCmp2Bean" deployment-id="client/tests/entity/cmp2/EncBean"
- container-id="Default CMP Container">
+ <ejb-deployment ejb-name="EncCmp2Bean" deployment-id="client/tests/entity/cmp2/EncBean" container-id="Default CMP Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupCmpBean" deployment-id="client/tests/entity/cmp/ContextLookupCmpBean"
- container-id="Default CMP Container">
+ <ejb-deployment ejb-name="ContextLookupCmpBean" deployment-id="client/tests/entity/cmp/ContextLookupCmpBean" container-id="Default CMP Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</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"/>
-
- <!-- CMR Test Beans -->
- <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-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">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="EncStatefulBean" deployment-id="client/tests/stateful/EncBean"
- container-id="Default Stateful Container">
+ <ejb-deployment ejb-name="EncStatefulBean" deployment-id="client/tests/stateful/EncBean" container-id="Default Stateful Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionStatefulBean" deployment-id="client/tests/stateful/FieldInjectionStatefulBean"
- container-id="Default Stateful Container">
+ <ejb-deployment ejb-name="FieldInjectionStatefulBean" deployment-id="client/tests/stateful/FieldInjectionStatefulBean" container-id="Default Stateful Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="connectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="queueConnectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="topicConnectionFactory" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionStatefulBean" deployment-id="client/tests/stateful/SetterInjectionStatefulBean"
- container-id="Default Stateful Container">
+ <ejb-deployment ejb-name="SetterInjectionStatefulBean" deployment-id="client/tests/stateful/SetterInjectionStatefulBean" container-id="Default Stateful Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="connectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="queueConnectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="topicConnectionFactory" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="PersistenceContextStatefulBean" deployment-id="client/tests/stateful/PersistenceContextStatefulBean"
- container-id="Default Stateful Container">
+ <ejb-deployment ejb-name="PersistenceContextStatefulBean" deployment-id="client/tests/stateful/PersistenceContextStatefulBean" container-id="Default Stateful Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatefulBean" deployment-id="client/tests/stateful/ContextLookupStatefulBean"
- container-id="Default Stateful Container">
+ <ejb-deployment ejb-name="ContextLookupStatefulBean" deployment-id="client/tests/stateful/ContextLookupStatefulBean" container-id="Default Stateful Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatefulPojoBean" deployment-id="client/tests/stateful/ContextLookupStatefulPojoBean"
- container-id="Default Stateful Container">
+ <ejb-deployment ejb-name="ContextLookupStatefulPojoBean" deployment-id="client/tests/stateful/ContextLookupStatefulPojoBean" container-id="Default Stateful Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</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-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">
<resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="BasicStatelessPojoBean" deployment-id="client/tests/stateless/BasicStatelessPojoHome"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="BasicStatelessPojoBean" deployment-id="client/tests/stateless/BasicStatelessPojoHome" container-id="Default Stateless Container">
<resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="Basic BMT StatelessBean"
- deployment-id="client/tests/stateless/BeanManagedBasicStatelessHome"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="Basic BMT StatelessBean" deployment-id="client/tests/stateless/BeanManagedBasicStatelessHome" container-id="Default Stateless Container">
<resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="DatabaseBean" deployment-id="client/tools/DatabaseHome"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="DatabaseBean" deployment-id="client/tools/DatabaseHome" container-id="Default Stateless Container">
<resource-link res-ref-name="database" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="BMT StatelessBean"
- deployment-id="client/tests/stateless/BeanManagedTransactionTests/EJBHome"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="BMT StatelessBean" deployment-id="client/tests/stateless/BeanManagedTransactionTests/EJBHome" container-id="Default Stateless Container">
<resource-link res-ref-name="database" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="EncStatelessBean" deployment-id="client/tests/stateless/EncBean"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="EncStatelessBean" deployment-id="client/tests/stateless/EncBean" container-id="Default Stateless Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="FieldInjectionStatelessBean" deployment-id="client/tests/stateless/FieldInjectionStatelessBean"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="FieldInjectionStatelessBean" deployment-id="client/tests/stateless/FieldInjectionStatelessBean" container-id="Default Stateless Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="connectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="queueConnectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="topicConnectionFactory" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="SetterInjectionStatelessBean" deployment-id="client/tests/stateless/SetterInjectionStatelessBean"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="SetterInjectionStatelessBean" deployment-id="client/tests/stateless/SetterInjectionStatelessBean" container-id="Default Stateless Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="connectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="queueConnectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="topicConnectionFactory" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatelessBean"
- deployment-id="client/tests/stateless/ContextLookupStatelessBean"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="ContextLookupStatelessBean" deployment-id="client/tests/stateless/ContextLookupStatelessBean" container-id="Default Stateless Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupStatelessPojoBean"
- deployment-id="client/tests/stateless/ContextLookupStatelessPojoBean"
- container-id="Default Stateless Container">
+ <ejb-deployment ejb-name="ContextLookupStatelessPojoBean" deployment-id="client/tests/stateless/ContextLookupStatelessPojoBean" container-id="Default Stateless Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</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-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">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="AOBasicBmpBean" deployment-id="client/tests/entity/bmp/allowed_operations/EntityHome"
- container-id="Default BMP Container">
+ <ejb-deployment ejb-name="AOBasicBmpBean" deployment-id="client/tests/entity/bmp/allowed_operations/EntityHome" container-id="Default BMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
<resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="Default JDBC Database"/>
</ejb-deployment>
- <ejb-deployment ejb-name="EncBmpBean" deployment-id="client/tests/entity/bmp/EncBean"
- container-id="Default BMP Container">
+ <ejb-deployment ejb-name="EncBmpBean" deployment-id="client/tests/entity/bmp/EncBean" container-id="Default BMP Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</ejb-deployment>
- <ejb-deployment ejb-name="ContextLookupBmpBean" deployment-id="client/tests/entity/bmp/ContextLookupBmpBean"
- container-id="Default BMP Container">
+ <ejb-deployment ejb-name="ContextLookupBmpBean" deployment-id="client/tests/entity/bmp/ContextLookupBmpBean" container-id="Default BMP Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
</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"
- container-id="Default MDB Container"/>
-</openejb-jar>
\ No newline at end of file
+ <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" container-id="Default MDB Container">
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="Default JDBC Database"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="Basic BMT Mdb Bean" deployment-id="Basic BMT Mdb Bean" container-id="Default MDB Container">
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="stateless/references/Resource_manager_access" res-id="Default JDBC Database"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="EncMdbBean" deployment-id="EncMdbBean" container-id="Default MDB Container">
+ <resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="ContextLookupMdbBean" deployment-id="ContextLookupMdbBean" container-id="Default MDB Container">
+ <resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="ContextLookupMdbPojoBean" deployment-id="ContextLookupMdbPojoBean" container-id="Default MDB Container">
+ <resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="QueueCF" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="TopicCF" res-id="Default JMS Connection Factory"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="FieldInjectionMdbBean" deployment-id="FieldInjectionMdbBean" container-id="Default MDB Container">
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="connectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="queueConnectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="topicConnectionFactory" res-id="Default JMS Connection Factory"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="SetterInjectionMdbBean" deployment-id="SetterInjectionMdbBean" container-id="Default MDB Container">
+ <resource-link res-ref-name="jms" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
+ <resource-link res-ref-name="connectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="queueConnectionFactory" res-id="Default JMS Connection Factory"/>
+ <resource-link res-ref-name="topicConnectionFactory" res-id="Default JMS Connection Factory"/>
+ </ejb-deployment>
+ <ejb-deployment ejb-name="TimerSyncBean" deployment-id="TimerSyncBean" container-id="Default Stateless Container"/>
+</openejb-jar>