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

[djencks]

djencks     2004/11/07 12:30:54

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

  implement GERONIMO-435. Every builder can specify the default parentId.  For 
services, a module can specify the empty string parentId="" to get no parent.
  
  Revision  Changes    Path
  1.47      +16 -16    
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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- OpenEJBModuleBuilder.java 7 Nov 2004 08:04:27 -0000       1.46
  +++ OpenEJBModuleBuilder.java 7 Nov 2004 17:30:54 -0000       1.47
  @@ -109,14 +109,18 @@
    * @version $Revision$ $Date$
    */
   public class OpenEJBModuleBuilder implements ModuleBuilder, 
EJBReferenceBuilder {
  +
  +    private final URI defaultParentId;
       private final CMPEntityBuilder cmpEntityBuilder;
       private final SessionBuilder sessionBuilder;
       private final EntityBuilder entityBuilder;
       private final MdbBuilder mdbBuilder;
       private final SecurityBuilder securityBuilder;
  -    private SkeletonGenerator skeletonGenerator;
  +    private final SkeletonGenerator skeletonGenerator;
   
  -    public OpenEJBModuleBuilder() {
  +    public OpenEJBModuleBuilder(URI defaultParentId, SkeletonGenerator 
skeletonGenerator) {
  +        this.defaultParentId = defaultParentId;
  +        this.skeletonGenerator = skeletonGenerator;
           this.securityBuilder = new SecurityBuilder(this);
           this.cmpEntityBuilder = new CMPEntityBuilder(this);
           this.sessionBuilder = new SessionBuilder(this);
  @@ -128,14 +132,6 @@
           return securityBuilder;
       }
   
  -    public SkeletonGenerator getSkeletonGenerator() {
  -        return skeletonGenerator;
  -    }
  -
  -    public void setSkeletonGenerator(SkeletonGenerator skeletonGenerator) {
  -        this.skeletonGenerator = skeletonGenerator;
  -    }
  -
       public Module createModule(File plan, JarFile moduleFile) throws 
DeploymentException {
           return createModule(plan, moduleFile, "war", null, true);
       }
  @@ -184,6 +180,8 @@
               } catch (URISyntaxException e) {
                   throw new DeploymentException("Invalid parentId " + 
openejbJar.getParentId(), e);
               }
  +        } else {
  +            parentId = defaultParentId;
           }
   
           return new EJBModule(standAlone, configId, parentId, moduleFile, 
targetPath, ejbJar, openejbJar, specDD);
  @@ -498,12 +496,14 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(OpenEJBModuleBuilder.class);
  -        infoFactory.addInterface(ModuleBuilder.class);
  -        infoFactory.addInterface(EJBReferenceBuilder.class);
  -        infoFactory.addReference("SkeletonGenerator", 
SkeletonGenerator.class);
  +        GBeanInfoBuilder infoBuilder = new 
GBeanInfoBuilder(OpenEJBModuleBuilder.class);
  +        infoBuilder.addAttribute("defaultParentId", URI.class, true);
  +        infoBuilder.addInterface(ModuleBuilder.class);
  +        infoBuilder.addInterface(EJBReferenceBuilder.class);
  +        infoBuilder.addReference("SkeletonGenerator", 
SkeletonGenerator.class);
   
  -        GBEAN_INFO = infoFactory.getBeanInfo();
  +        infoBuilder.setConstructor(new String[] {"defaultParentId", 
"SkeletonGenerator"});
  +        GBEAN_INFO = infoBuilder.getBeanInfo();
       }
   
       public static GBeanInfo getGBeanInfo() {