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

[djencks]

djencks     2005/08/26 04:09:08

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

  GERONIMO-892, GERONIMO-767 Deal with message-destination and 
message-destination-link elements correctly
  
  Revision  Changes    Path
  1.51      +17 -1     
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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- OpenEJBModuleBuilder.java 10 Aug 2005 02:24:56 -0000      1.50
  +++ OpenEJBModuleBuilder.java 26 Aug 2005 08:09:08 -0000      1.51
  @@ -99,12 +99,17 @@
   import org.apache.geronimo.security.deployment.SecurityConfiguration;
   import org.apache.geronimo.security.jacc.ComponentPermissions;
   import org.apache.geronimo.xbeans.geronimo.naming.GerResourceLocatorType;
  +import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType;
   import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
   import org.apache.geronimo.xbeans.j2ee.EjbJarType;
   import org.apache.geronimo.xbeans.j2ee.EnterpriseBeansType;
   import org.apache.geronimo.xbeans.j2ee.EntityBeanType;
   import org.apache.geronimo.xbeans.j2ee.SessionBeanType;
   import org.apache.geronimo.xbeans.j2ee.MessageDrivenBeanType;
  +import org.apache.geronimo.xbeans.j2ee.WebAppType;
  +import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
  +import org.apache.geronimo.xbeans.j2ee.AssemblyDescriptorType;
  +import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
   import org.apache.xmlbeans.XmlException;
   import org.apache.xmlbeans.XmlObject;
   import org.openejb.EJBModuleImpl;
  @@ -332,6 +337,17 @@
   
           EJBModule ejbModule = (EJBModule) module;
           EjbJarType ejbJar = (EjbJarType) ejbModule.getSpecDD();
  +
  +        if (ejbJar.isSetAssemblyDescriptor()) {
  +            AssemblyDescriptorType assemblyDescriptor = 
ejbJar.getAssemblyDescriptor();
  +
  +            MessageDestinationType[] messageDestinations = 
assemblyDescriptor.getMessageDestinationArray();
  +            OpenejbOpenejbJarType openejbJar = (OpenejbOpenejbJarType) 
module.getVendorDD();
  +            GerMessageDestinationType[] gerMessageDestinations = 
openejbJar.getMessageDestinationArray();
  +
  +            
ENCConfigBuilder.registerMessageDestinations(earContext.getRefContext(), 
module.getName(), messageDestinations, gerMessageDestinations);
  +        }
  +
           EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();
   
           sessionBuilder.initContext(earContext, moduleJ2eeContext, moduleUri, 
cl, enterpriseBeans);