djencks 2005/07/27 19:24:35
Modified: modules/openejb-builder/src/java/org/openejb/deployment Tag:
v2_0_G1M4 MdbBuilder.java
Log:
GERONIMO-824,780 default messaging-type fix
Revision Changes Path
No revision
No revision
1.20.4.2 +19 -9
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
Index: MdbBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
retrieving revision 1.20.4.1
retrieving revision 1.20.4.2
diff -u -r1.20.4.1 -r1.20.4.2
--- MdbBuilder.java 19 Jul 2005 21:44:53 -0000 1.20.4.1
+++ MdbBuilder.java 27 Jul 2005 23:24:35 -0000 1.20.4.2
@@ -101,11 +101,11 @@
for (int i = 0; i < messageDrivenBeans.length; i++) {
MessageDrivenBeanType messageDrivenBean = messageDrivenBeans[i];
- OpenejbMessageDrivenBeanType openejbMessageDrivenBean =
(OpenejbMessageDrivenBeanType)
openejbBeans.get(messageDrivenBean.getEjbName().getStringValue());
+ OpenejbMessageDrivenBeanType openejbMessageDrivenBean =
(OpenejbMessageDrivenBeanType)
openejbBeans.get(messageDrivenBean.getEjbName().getStringValue().trim());
if (openejbMessageDrivenBean == null) {
throw new DeploymentException("No openejb deployment
descriptor for mdb: " + messageDrivenBean.getEjbName().getStringValue() + ".
Known beans: " + openejbBeans.keySet().toArray());
}
- String ejbName = messageDrivenBean.getEjbName().getStringValue();
+ String ejbName =
messageDrivenBean.getEjbName().getStringValue().trim();
ObjectName messageDrivenObjectName = null;
ObjectName activationSpecName = null;
try {
@@ -123,7 +123,7 @@
openejbMessageDrivenBean.isSetActivationConfig() ?
openejbMessageDrivenBean.getActivationConfig().getActivationConfigPropertyArray()
: null,
messageDrivenBean.isSetActivationConfig() ?
messageDrivenBean.getActivationConfig().getActivationConfigPropertyArray() :
new ActivationConfigPropertyType[]{},
openejbMessageDrivenBean.getResourceAdapter(),
- messageDrivenBean.getMessagingType() == null?
javax.jms.MessageListener.class.getName():
messageDrivenBean.getMessagingType().getStringValue().trim(),
+ getMessagingType(messageDrivenBean),
containerId);
GBeanData messageDrivenGBean = createBean(earContext, ejbModule,
containerId, messageDrivenBean, openejbMessageDrivenBean, activationSpecName,
transactionPolicyHelper, cl, componentPermissions, policyContextID);
messageDrivenGBean.setName(messageDrivenObjectName);
@@ -163,14 +163,14 @@
throw new DeploymentException("openejb-jar.xml required to
deploy an mdb");
}
- String ejbName = messageDrivenBean.getEjbName().getStringValue();
+ String ejbName =
messageDrivenBean.getEjbName().getStringValue().trim();
MDBContainerBuilder builder = new MDBContainerBuilder();
builder.setClassLoader(cl);
builder.setContainerId(containerId);
builder.setEJBName(ejbName);
-
builder.setBeanClassName(messageDrivenBean.getEjbClass().getStringValue());
-
builder.setEndpointInterfaceName(OpenEJBModuleBuilder.getJ2eeStringValue(messageDrivenBean.getMessagingType()));
+
builder.setBeanClassName(messageDrivenBean.getEjbClass().getStringValue().trim());
+
builder.setEndpointInterfaceName(getMessagingType(messageDrivenBean));
builder.setTransactedTimerName(earContext.getTransactedTimerName());
builder.setNonTransactedTimerName(earContext.getNonTransactedTimerName());
@@ -191,7 +191,7 @@
UserTransactionImpl userTransaction;
//TODO this is probably wrong???
- if
("Bean".equals(messageDrivenBean.getTransactionType().getStringValue())) {
+ if
("Bean".equals(messageDrivenBean.getTransactionType().getStringValue().trim()))
{
userTransaction = new UserTransactionImpl();
builder.setUserTransaction(userTransaction);
builder.setTransactionPolicySource(TransactionPolicyHelper.BMTPolicySource);
@@ -214,6 +214,16 @@
}
}
+ private String getMessagingType(MessageDrivenBeanType messageDrivenBean)
{
+ String messageInterfaceType = null;
+ if (messageDrivenBean.isSetMessagingType()) {
+ messageInterfaceType =
messageDrivenBean.getMessagingType().getStringValue().trim();
+ } else {
+ messageInterfaceType = "javax.jms.MessageListener";
+ }
+ return messageInterfaceType;
+ }
+
private void addActivationSpecWrapperGBean(EARContext earContext,
J2eeContext moduleJ2eeContext,
URI uri,
@@ -256,8 +266,8 @@
} else {
for (int i = 0; i < activationConfigProperties.length; i++) {
ActivationConfigPropertyType activationConfigProperty =
activationConfigProperties[i];
- String propertyName =
activationConfigProperty.getActivationConfigPropertyName().getStringValue();
- String propertyValue =
activationConfigProperty.getActivationConfigPropertyValue().isNil() ? null :
activationConfigProperty.getActivationConfigPropertyValue().getStringValue();
+ String propertyName =
activationConfigProperty.getActivationConfigPropertyName().getStringValue().trim();
+ String propertyValue =
activationConfigProperty.getActivationConfigPropertyValue().isNil() ? null :
activationConfigProperty.getActivationConfigPropertyValue().getStringValue().trim();
try {
activationSpecInfo.setAttribute(Introspector.decapitalize(propertyName),
propertyValue);
} catch (Exception e) {
