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

[djencks]

djencks     2005/01/26 09:57:39

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

  Interface changes related to GERONIMO-552, keep the deployment context 
gbeandatas in a queriable container
  
  Revision  Changes    Path
  1.24      +8 -7      
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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- OpenEJBModuleBuilder.java 24 Jan 2005 21:16:49 -0000      1.23
  +++ OpenEJBModuleBuilder.java 26 Jan 2005 14:57:38 -0000      1.24
  @@ -53,7 +53,6 @@
   import java.net.URI;
   import java.net.URISyntaxException;
   import java.net.URL;
  -import java.util.Collections;
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.Map;
  @@ -68,9 +67,9 @@
   import org.apache.geronimo.deployment.util.DeploymentUtil;
   import org.apache.geronimo.deployment.xbeans.DependencyType;
   import org.apache.geronimo.deployment.xbeans.GbeanType;
  +import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
  -import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.j2ee.deployment.EARContext;
   import org.apache.geronimo.j2ee.deployment.EJBModule;
   import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
  @@ -390,7 +389,7 @@
               ejbModuleGBeanData.setAttribute("deploymentDescriptor", 
module.getOriginalSpecDD());
   
               if (connectionFactoryLocator != null) {
  -                ObjectName connectionFactoryObjectName = 
getResourceContainerId(ejbModule.getModuleURI(), connectionFactoryLocator, 
earContext.getRefContext(), earContext.getJ2eeContext());
  +                ObjectName connectionFactoryObjectName = 
getResourceContainerId(ejbModule.getModuleURI(), connectionFactoryLocator, 
earContext);
                   //TODO this uses connection factory rather than datasource 
for the type.
                   ejbModuleGBeanData.setReferencePattern("ConnectionFactory", 
connectionFactoryObjectName);
                   ejbModuleGBeanData.setAttribute("Delegate", delegate);
  @@ -440,7 +439,7 @@
           Security security = null;
           //TODO fix this!
           Map localSecurityRealms = new HashMap();
  -        security = 
SecurityBuilder.buildSecurityConfig(Collections.EMPTY_SET, 
openejbEjbJar.getSecurity(), collectRoleNames(ejbJar), localSecurityRealms, 
kernel);
  +        security = 
SecurityBuilder.buildSecurityConfig(openejbEjbJar.getSecurity(), 
collectRoleNames(ejbJar));
   
           EnterpriseBeansType enterpriseBeans = ejbJar.getEnterpriseBeans();
   
  @@ -468,10 +467,12 @@
           return roleNames;
       }
   
  -    private static ObjectName getResourceContainerId(URI uri, 
GerResourceLocatorType resourceLocator, RefContext refContext, J2eeContext 
j2eeContext) throws DeploymentException {
  +    private static ObjectName getResourceContainerId(URI uri, 
GerResourceLocatorType resourceLocator, EARContext earContext) throws 
DeploymentException {
  +        RefContext refContext = earContext.getRefContext();
  +        J2eeContext j2eeContext = earContext.getJ2eeContext();
           try {
               if (resourceLocator.isSetResourceLink()) {
  -                String containerId = 
refContext.getConnectionFactoryContainerId(uri, 
resourceLocator.getResourceLink(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, 
j2eeContext);
  +                String containerId = 
refContext.getConnectionFactoryContainerId(uri, 
resourceLocator.getResourceLink(), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, 
j2eeContext, earContext);
                   return ObjectName.getInstance(containerId);
               } else if (resourceLocator.isSetTargetName()) {
                   String containerId = resourceLocator.getTargetName();