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 2006/12/20 05:29:53 UTC
svn commit: r488916 - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/alt/config/
container/openejb-core/src/main/resources/org/apache/openejb/util/resources/
itests/openejb-itests-beans/src/main/resources/...
Author: dblevins
Date: Tue Dec 19 20:29:52 2006
New Revision: 488916
URL: http://svn.apache.org/viewvc?view=rev&rev=488916
Log:
More MDB fixes to get the itest to run
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/MessageBean.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
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/alt/config/AutoConfigAndDeploy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java?view=diff&rev=488916&r1=488915&r2=488916
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/AutoConfigAndDeploy.java Tue Dec 19 20:29:52 2006
@@ -252,6 +252,8 @@
return ProviderDefaults.DEFAULT_STATEFUL_CONTAINER;
} else if (type.equals(Bean.STATELESS)){
return ProviderDefaults.DEFAULT_STATELESS_CONTAINER;
+ } else if (type.equals(Bean.MESSAGE)){
+ return ProviderDefaults.DEFAULT_MDB_CONTAINER;
}
throw new IllegalStateException("Unknown bean type "+type);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java?view=diff&rev=488916&r1=488915&r2=488916
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/Bean.java Tue Dec 19 20:29:52 2006
@@ -25,7 +25,7 @@
public static final String CMP2_ENTITY = "CMP2_ENTITY";
public static final String STATEFUL = "STATEFUL";
public static final String STATELESS = "STATELESS";
- public static final String MESSAGE = "STATELESS";
+ public static final String MESSAGE = "MESSAGE";
public String getType();
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java?view=diff&rev=488916&r1=488915&r2=488916
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/EjbJarInfoBuilder.java Tue Dec 19 20:29:52 2006
@@ -88,8 +88,13 @@
int beansInEjbJar = jar.getEjbJar().getEnterpriseBeans().length;
if (beansInEjbJar != beansDeployed) {
+ Map<String, EjbDeployment> deployed = jar.getOpenejbJar().getDeploymentsByEjbName();
+ for (EnterpriseBean bean : jar.getEjbJar().getEnterpriseBeans()) {
+ if (!deployed.containsKey(bean.getEjbName())){
+ ConfigUtils.logger.i18n.warning("conf.0018", bean.getEjbName(), jar.getJarURI());
+ }
+ }
ConfigUtils.logger.i18n.warning("conf.0008", jar.getJarURI(), "" + beansInEjbJar, "" + beansDeployed);
-
return null;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/MessageBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/MessageBean.java?view=diff&rev=488916&r1=488915&r2=488916
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/MessageBean.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/MessageBean.java Tue Dec 19 20:29:52 2006
@@ -17,7 +17,6 @@
package org.apache.openejb.alt.config;
import org.apache.openejb.jee.MessageDrivenBean;
-import org.apache.openejb.jee.SessionType;
import org.apache.openejb.jee.ResourceRef;
public class MessageBean implements Bean {
@@ -25,8 +24,9 @@
org.apache.openejb.jee.MessageDrivenBean bean;
String type;
- MessageBean(MessageDrivenBean bean2) {
- this.bean = bean2;
+ MessageBean(MessageDrivenBean bean) {
+ this.bean = bean;
+ this.type = MESSAGE;
}
public String getType() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties?view=diff&rev=488916&r1=488915&r2=488916
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties Tue Dec 19 20:29:52 2006
@@ -155,7 +155,8 @@
conf.0005=Unable to load properties file {0}. {1}
conf.0006=Properties file {0} not found. Received message: {1}
conf.0007=Cannot read properties file {0}. {1}
-conf.0008=Jar {0} cannot be loaded. The number of beans deployed ({2}) does not match the number of beans actually in the jar ({1}). Please redeploy this jar.
+conf.0008=Cannot Load jar {0}. The number of beans deployed ({2}) does not match the number of beans actually in the jar ({1}). Please redeploy this jar.
+conf.0018=No openejb-jar Descriptor Data for ejb {0} in jar {1}.
conf.0009=Security role reference {0} is not linked. The reference will be linked to the OpenEJB default security role. Bean name is {1}, jar file is {2}.
conf.0010=Properties file {0} for JndiProvider {1} not found. Received message: {2}
conf.0011=Cannot read properties file {0} for JndiProvider {1}. Received message: {2}
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=488916&r1=488915&r2=488916
==============================================================================
--- 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 Tue Dec 19 20:29:52 2006
@@ -184,4 +184,5 @@
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
</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>