[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment MdbBuilder.java

[djencks]

djencks     2005/02/19 17:26:55

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        MdbBuilder.java
  Log:

  fix mdbs, broken in earlier commit
  
  Revision  Changes    Path
  1.14      +3 -2      
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MdbBuilder.java   19 Feb 2005 20:22:58 -0000      1.13
  +++ MdbBuilder.java   19 Feb 2005 22:26:55 -0000      1.14
  @@ -215,10 +215,11 @@
               String containerId) throws DeploymentException {
           RefContext refContext = earContext.getRefContext();
           ObjectName resourceAdapterObjectName = getResourceAdapterId(uri, 
resourceAdapter, refContext, moduleJ2eeContext);
  -        J2eeContext resourceAdapterJ2eeContext = 
J2eeContextImpl.newContext(resourceAdapterObjectName, 
NameFactory.RESOURCE_ADAPTER_MODULE);
  +        J2eeContext resourceAdapterJ2eeContext = 
J2eeContextImpl.newContext(resourceAdapterObjectName, NameFactory.JCA_RESOURCE);
           ObjectName resourceModuleObjectName = null;
           try {
  -            resourceModuleObjectName = NameFactory.getModuleName(null, null, 
null, null, null, resourceAdapterJ2eeContext);
  +            //N.B. the resource adapter name has module type "JCAResource" 
but the resource adapter module has module type "ResourceAdapterModule"
  +            resourceModuleObjectName = NameFactory.getModuleName(null, null, 
null, NameFactory.RESOURCE_ADAPTER_MODULE, null, resourceAdapterJ2eeContext);
           } catch (MalformedObjectNameException e) {
               throw new DeploymentException("Could not construct resource 
module name", e);
           }