[openejb-scm] openejb/modules/core/src/java/org/openejb/config NovaAssembler.java

[djencks]

djencks     2004/11/07 12:30:54

  Modified:    modules/core/src/java/org/openejb/config NovaAssembler.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.4       +11 -3     
openejb/modules/core/src/java/org/openejb/config/NovaAssembler.java
  
  Index: NovaAssembler.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/config/NovaAssembler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NovaAssembler.java        3 Nov 2004 19:29:27 -0000       1.3
  +++ NovaAssembler.java        7 Nov 2004 17:30:54 -0000       1.4
  @@ -61,6 +61,8 @@
   import java.io.ObjectInputStream;
   import java.net.URL;
   import java.net.URLClassLoader;
  +import java.net.URI;
  +import java.net.URISyntaxException;
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.HashSet;
  @@ -114,6 +116,7 @@
       private static Log log;
       private String configLocation;
       private Openejb openejb;
  +    private static URI defaultParentId;
   
       static {
           // This MUST be done before the first log is acquired
  @@ -130,6 +133,11 @@
           }
           // Install the lame tools jar hack
           ToolsJarHack.install();
  +        try {
  +            defaultParentId = new URI("org/apache/geronimo/Server");
  +        } catch (URISyntaxException e) {
  +            throw new RuntimeException(e);
  +        }
       }
   
   
  @@ -288,8 +296,8 @@
   
   
       private static GBeanMBean setUpEarModule(File earFile, File tempDir, 
ClassLoader classLoader) throws MalformedObjectNameException, IOException, 
DeploymentException, AttributeNotFoundException, ReflectionException, 
ClassNotFoundException, OpenEJBException {
  -        OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
  -        EARConfigBuilder earConfigBuilder = new EARConfigBuilder(new 
ObjectName(j2eeDomainName + ":j2eeType=J2EEServer,name=" + j2eeServerName),
  +        OpenEJBModuleBuilder moduleBuilder = new 
OpenEJBModuleBuilder(defaultParentId, null);
  +        EARConfigBuilder earConfigBuilder = new 
EARConfigBuilder(defaultParentId, new ObjectName(j2eeDomainName + 
":j2eeType=J2EEServer,name=" + j2eeServerName),
                   getObjectName("TransactionContextManager"),
                   getObjectName("ConnectionTracker"),
                   getObjectName("TransactionalTimer"),