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

[dain]

dain        2004/04/09 15:04:01

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

  Added jndi naming bindings
  Fixed many problems with ContainerIndex GBean
  Converted EJB protocol stack to GBeans
  Cleaned up code formating of several classes
  
  Revision  Changes    Path
  1.7       +21 -5     
openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java
  
  Index: EJBConfigBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/deployment/EJBConfigBuilder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EJBConfigBuilder.java     8 Apr 2004 00:03:28 -0000       1.6
  +++ EJBConfigBuilder.java     9 Apr 2004 19:04:01 -0000       1.7
  @@ -368,10 +368,18 @@
               throw new DeploymentException("Unable to create EJB jndi environment: 
ejbName" + ejbName, e);
           }
   
  +        if (openejbSessionBean != null) {
  +            builder.setJndiNames(openejbSessionBean.getJndiNameArray());
  +            builder.setLocalJndiNames(openejbSessionBean.getLocalJndiNameArray());
  +        } else {
  +            builder.setJndiNames(new String[] {ejbName});
  +            builder.setLocalJndiNames(new String[] {"local/" + ejbName});
  +        }
  +
           try {
               GBeanMBean gbean = builder.createConfiguration();
  -            gbean.setReferencePatterns("transactionManager", 
Collections.singleton(new ObjectName("*:type=TransactionManager,*")));
  -            gbean.setReferencePatterns("trackedConnectionAssociator", 
Collections.singleton(new ObjectName("*:type=ConnectionTracker,*")));
  +            gbean.setReferencePatterns("TransactionManager", 
Collections.singleton(new ObjectName("*:type=TransactionManager,*")));
  +            gbean.setReferencePatterns("TrackedConnectionAssociator", 
Collections.singleton(new ObjectName("*:type=ConnectionTracker,*")));
               return gbean;
           } catch (Exception e) {
               throw new DeploymentException("Unable to initialize EJBContainer GBean: 
ejbName" + ejbName, e);
  @@ -418,10 +426,18 @@
               throw new DeploymentException("Unable to create EJB jndi environment: 
ejbName=" + ejbName, e);
           }
   
  +        if (openejbEntityBean != null) {
  +            builder.setJndiNames(openejbEntityBean.getJndiNameArray());
  +            builder.setLocalJndiNames(openejbEntityBean.getLocalJndiNameArray());
  +        } else {
  +            builder.setJndiNames(new String[] {ejbName});
  +            builder.setLocalJndiNames(new String[] {"local/" + ejbName});
  +        }
  +
           try {
               GBeanMBean gbean = builder.createConfiguration();
  -            gbean.setReferencePatterns("transactionManager", 
Collections.singleton(new ObjectName("*:type=TransactionManager,*")));
  -            gbean.setReferencePatterns("trackedConnectionAssociator", 
Collections.singleton(new ObjectName("*:type=ConnectionTracker,*")));
  +            gbean.setReferencePatterns("TransactionManager", 
Collections.singleton(new ObjectName("*:type=TransactionManager,*")));
  +            gbean.setReferencePatterns("TrackedConnectionAssociator", 
Collections.singleton(new ObjectName("*:type=ConnectionTracker,*")));
               return gbean;
           } catch (Exception e) {
               throw new DeploymentException("Unable to initialize EJBContainer GBean: 
ejbName=" + ejbName, e);