[openejb-scm] openejb/modules/core/src/java/org/openejb/deployment OpenEJBModuleBuilder.java

[djencks]

djencks     2004/06/26 03:19:52

  Modified:    modules/core/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
  Log:

  hook up message-destination-refs (not tested)
  
  Revision  Changes    Path
  1.11      +12 -6     
openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- OpenEJBModuleBuilder.java 25 Jun 2004 21:35:11 -0000      1.10
  +++ OpenEJBModuleBuilder.java 26 Jun 2004 07:19:52 -0000      1.11
  @@ -888,7 +888,9 @@
               openejbResourceEnvRefs = openejbSessionBean.getResourceEnvRefArray();
           }
   
  -        return buildComponentContext(earContext, ejbModule, envEntries, ejbRefs, 
ejbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs, 
openejbResourceEnvRefs, userTransaction, cl);
  +        MessageDestinationRefType[] messageDestinationRefs = 
sessionBean.getMessageDestinationRefArray();
  +
  +        return buildComponentContext(earContext, ejbModule, envEntries, ejbRefs, 
ejbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs, 
openejbResourceEnvRefs, messageDestinationRefs, userTransaction, cl);
   
       }
   
  @@ -914,7 +916,9 @@
               openejbResourceEnvRefs = openejbEntityBean.getResourceEnvRefArray();
           }
   
  -        return buildComponentContext(earContext, ejbModule, envEntries, ejbRefs, 
ejbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs, 
openejbResourceEnvRefs, userTransaction, cl);
  +        MessageDestinationRefType[] messageDestinationRefs = 
entityBean.getMessageDestinationRefArray();
  +
  +        return buildComponentContext(earContext, ejbModule, envEntries, ejbRefs, 
ejbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs, 
openejbResourceEnvRefs, messageDestinationRefs, userTransaction, cl);
   
       }
   
  @@ -941,7 +945,9 @@
               openejbResourceEnvRefs = 
openejbMessageDrivenBean.getResourceEnvRefArray();
           }
   
  -        return buildComponentContext(earContext, ejbModule, envEntries, ejbRefs, 
ejbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs, 
openejbResourceEnvRefs, userTransaction, cl);
  +        MessageDestinationRefType[] messageDestinationRefs = 
messageDrivenBean.getMessageDestinationRefArray();
  +
  +        return buildComponentContext(earContext, ejbModule, envEntries, ejbRefs, 
ejbLocalRefs, resourceRefs, openejbResourceRefs, resourceEnvRefs, 
openejbResourceEnvRefs, messageDestinationRefs, userTransaction, cl);
   
       }
   
  @@ -954,7 +960,7 @@
                                                            OpenejbLocalRefType[] 
openejbResourceRefs,
                                                            ResourceEnvRefType[] 
resourceEnvRefs,
                                                            OpenejbLocalRefType[] 
openejbResourceEnvRefs,
  -                                                         UserTransaction 
userTransaction,
  +                                                         
MessageDestinationRefType[] messageDestinationRefs, UserTransaction userTransaction,
                                                            ClassLoader cl) throws 
NamingException, DeploymentException {
           ComponentContextBuilder builder = new ComponentContextBuilder(new 
JMXReferenceFactory());
   
  @@ -980,7 +986,7 @@
               addResourceEnvRefs(resourceEnvRefs, openejbResourceEnvRefs, cl, 
builder);
           }
   
  -        // todo message-destination-ref
  +        addMessageDestinationRefs(messageDestinationRefs, cl, builder);
   
           return builder.getContext();
       }