djencks 2005/07/19 20:01:18
Modified: modules/openejb-builder/src/java/org/openejb/deployment
MdbBuilder.java OpenEJBModuleBuilder.java
Log:
GERONIMO-552 use gbeans in the deployment context, not special lists in
RefContext. This eliminates the special lists in RefContext for all resource
related gbeans. Also GERONIMO-780.
Revision Changes Path
1.21 +6 -6
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
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MdbBuilder.java 2 Jul 2005 06:43:02 -0000 1.20
+++ MdbBuilder.java 20 Jul 2005 00:01:18 -0000 1.21
@@ -123,7 +123,7 @@
openejbMessageDrivenBean.isSetActivationConfig() ?
openejbMessageDrivenBean.getActivationConfig().getActivationConfigPropertyArray()
: null,
messageDrivenBean.isSetActivationConfig() ?
messageDrivenBean.getActivationConfig().getActivationConfigPropertyArray() :
new ActivationConfigPropertyType[]{},
openejbMessageDrivenBean.getResourceAdapter(),
-
messageDrivenBean.getMessagingType().getStringValue().trim(),
+ messageDrivenBean.getMessagingType() == null?
javax.jms.MessageListener.class.getName():
messageDrivenBean.getMessagingType().getStringValue().trim(),
containerId);
GBeanData messageDrivenGBean = createBean(earContext, ejbModule,
containerId, messageDrivenBean, openejbMessageDrivenBean, activationSpecName,
transactionPolicyHelper, cl, componentPermissions, policyContextID);
messageDrivenGBean.setName(messageDrivenObjectName);
@@ -224,7 +224,7 @@
String messageListenerInterfaceName,
String containerId) throws DeploymentException {
RefContext refContext = earContext.getRefContext();
- ObjectName resourceAdapterObjectName = getResourceAdapterId(uri,
resourceAdapter, refContext, moduleJ2eeContext);
+ ObjectName resourceAdapterObjectName = getResourceAdapterId(uri,
resourceAdapter, earContext);
J2eeContext resourceAdapterJ2eeContext =
J2eeContextImpl.newContext(resourceAdapterObjectName, NameFactory.JCA_RESOURCE);
ObjectName resourceModuleObjectName = null;
try {
@@ -233,7 +233,7 @@
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct resource
module name", e);
}
- GBeanData activationSpecInfo =
refContext.getActivationSpecInfo(resourceModuleObjectName,
messageListenerInterfaceName);
+ GBeanData activationSpecInfo =
refContext.getActivationSpecInfo(resourceModuleObjectName,
messageListenerInterfaceName, earContext);
if (activationSpecInfo == null) {
throw new DeploymentException("no activation spec found for
resource adapter: " + resourceAdapterObjectName + " and message listener type:
" + messageListenerInterfaceName);
@@ -269,10 +269,10 @@
earContext.addGBean(activationSpecInfo);
}
- private static ObjectName getResourceAdapterId(URI uri,
GerResourceLocatorType resourceLocator, RefContext refContext, J2eeContext
j2eeContext) throws DeploymentException {
+ private static ObjectName getResourceAdapterId(URI uri,
GerResourceLocatorType resourceLocator, EARContext earContext) throws
DeploymentException {
try {
if (resourceLocator.isSetResourceLink()) {
- String containerId =
refContext.getResourceAdapterContainerId(uri,
resourceLocator.getResourceLink(), j2eeContext);
+ String containerId =
earContext.getRefContext().getResourceAdapterContainerId(uri,
resourceLocator.getResourceLink(), earContext);
return ObjectName.getInstance(containerId);
} else if (resourceLocator.isSetTargetName()) {
String containerId = resourceLocator.getTargetName();
@@ -290,7 +290,7 @@
resourceLocator.getModule(),
resourceLocator.getName(),
NameFactory.JCA_RESOURCE_ADAPTER,
- j2eeContext);
+ earContext.getJ2eeContext());
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Could not construct resource
adapter object name", e);
}
1.46 +3 -3
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
Index: OpenEJBModuleBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- OpenEJBModuleBuilder.java 14 Jul 2005 02:34:04 -0000 1.45
+++ OpenEJBModuleBuilder.java 20 Jul 2005 00:01:18 -0000 1.46
@@ -453,7 +453,7 @@
if (null == connectionFactoryLocator && false ==
ejbSchema.getEntities().isEmpty()) {
throw new DeploymentException("A cmp-connection-factory element
must be specified as CMP EntityBeans are defined.");
}
-
+
EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();
Set beans = new HashSet();
EntityBeanType[] ebs = enterpriseBeans.getEntityArray();
@@ -553,7 +553,7 @@
J2eeContext j2eeContext = earContext.getJ2eeContext();
try {
if (resourceLocator.isSetResourceLink()) {
- String containerId =
refContext.getConnectionFactoryContainerId(uri,
resourceLocator.getResourceLink(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY,
j2eeContext, earContext);
+ String containerId =
refContext.getConnectionFactoryContainerId(uri,
resourceLocator.getResourceLink(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY,
earContext);
return ObjectName.getInstance(containerId);
} else if (resourceLocator.isSetTargetName()) {
String containerId = resourceLocator.getTargetName();
