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

[djencks]

djencks     2005/03/05 21:49:43

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

  GERONIMO-450.  Change name to gbeanName, namePart to name, and break up 
reference patterns into pieces
  
  Revision  Changes    Path
  1.32      +14 -14    
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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- OpenEJBModuleBuilder.java 4 Mar 2005 21:16:30 -0000       1.31
  +++ OpenEJBModuleBuilder.java 6 Mar 2005 02:49:43 -0000       1.32
  @@ -383,7 +383,7 @@
           // EJBModule GBean
           GerResourceLocatorType connectionFactoryLocator = 
openejbEjbJar.getCmpConnectionFactory();
           CacheFlushStrategyFactory flushStrategyFactory;
  -        if ( openejbEjbJar.isSetEnforceForeignKeyConstraints() ) {
  +        if (openejbEjbJar.isSetEnforceForeignKeyConstraints()) {
               flushStrategyFactory = new 
EnforceRelationshipsFlushStrategyFactory();
           } else {
               flushStrategyFactory = new SimpleFlushStrategyFactory();
  @@ -407,7 +407,7 @@
           } catch (Exception e) {
               throw new DeploymentException("Can not initialize 
ejb-ql-compiler-factory=" + openejbEjbJar.getEjbQlCompilerFactory(), e);
           }
  -        
  +
           DBSyntaxFactory syntaxFactory = new DerbyDBSyntaxtFactory();
           try {
               if (openejbEjbJar.isSetDbSyntaxFactory()) {
  @@ -423,9 +423,9 @@
           } catch (Exception e) {
               throw new DeploymentException("Can not initialize 
ejb-ql-compiler-factory=" + openejbEjbJar.getEjbQlCompilerFactory(), e);
           }
  -        
  +
           SQLSchema sqlSchema = new BaseSQLSchema(module.getName(), delegate, 
syntaxFactory, compilerFactory);
  -        
  +
           GlobalSchema globalSchema = new GlobalSchema(module.getName(), 
flushStrategyFactory);
   
           GBeanData ejbModuleGBeanData = new GBeanData(ejbModuleObjectName, 
EJBModuleImpl.GBEAN_INFO);
  @@ -505,11 +505,11 @@
       private static Set collectRoleNames(EjbJarType ejbJar) {
           Set roleNames = new HashSet();
   
  -        if( ejbJar.isSetAssemblyDescriptor() ) {
  -             SecurityRoleType[] securityRoles = 
ejbJar.getAssemblyDescriptor().getSecurityRoleArray();
  -             for (int i=0; i<securityRoles.length; i++) {
  -                 
roleNames.add(securityRoles[i].getRoleName().getStringValue());
  -             }
  +        if (ejbJar.isSetAssemblyDescriptor()) {
  +            SecurityRoleType[] securityRoles = 
ejbJar.getAssemblyDescriptor().getSecurityRoleArray();
  +            for (int i = 0; i < securityRoles.length; i++) {
  +                
roleNames.add(securityRoles[i].getRoleName().getStringValue());
  +            }
           }
   
           return roleNames;
  @@ -579,12 +579,12 @@
           GBeanInfoBuilder infoBuilder = new 
GBeanInfoBuilder(OpenEJBModuleBuilder.class, NameFactory.MODULE_BUILDER);
           infoBuilder.addAttribute("defaultParentId", URI.class, true);
           infoBuilder.addAttribute("listener", ObjectName.class, true);
  -        infoBuilder.addReference("SkeletonGenerator", 
SkeletonGenerator.class);
  -        infoBuilder.addReference("Repository", Repository.class);
  -         infoBuilder.addInterface(ModuleBuilder.class);
  +        infoBuilder.addReference("SkeletonGenerator", 
SkeletonGenerator.class, NameFactory.GERONIMO_SERVICE);
  +        infoBuilder.addReference("Repository", Repository.class, 
NameFactory.GERONIMO_SERVICE);
  +        infoBuilder.addInterface(ModuleBuilder.class);
           infoBuilder.addInterface(EJBReferenceBuilder.class);
   
  -        infoBuilder.setConstructor(new String[] {"defaultParentId", 
"listener", "SkeletonGenerator", "Repository"});
  +        infoBuilder.setConstructor(new String[]{"defaultParentId", 
"listener", "SkeletonGenerator", "Repository"});
           GBEAN_INFO = infoBuilder.getBeanInfo();
       }
   
  
  
  
  1.4       +2 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/RemoteEJBReferenceBuilder.java
  
  Index: RemoteEJBReferenceBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/RemoteEJBReferenceBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RemoteEJBReferenceBuilder.java    4 Mar 2005 21:16:30 -0000       1.3
  +++ RemoteEJBReferenceBuilder.java    6 Mar 2005 02:49:43 -0000       1.4
  @@ -5,6 +5,7 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import org.openejb.client.naming.RemoteEJBObjectFactory;
   import org.openejb.client.naming.RemoteEJBRefAddr;
   import org.openejb.corba.CORBAHandleDelegate;
  @@ -30,7 +31,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(RemoteEJBReferenceBuilder.class); //TODO decide what type this 
should be
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(RemoteEJBReferenceBuilder.class, NameFactory.MODULE_BUILDER); 
//TODO decide what type this should be
           infoFactory.addInterface(EJBReferenceBuilder.class);
   
           GBEAN_INFO = infoFactory.getBeanInfo();