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

[djencks]

djencks     2005/06/25 14:48:17

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

  GERONIMO-685 (partial) Stop compiling ties we don't use
  
  Revision  Changes    Path
  1.39      +4 -33     
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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- OpenEJBModuleBuilder.java 8 May 2005 19:37:13 -0000       1.38
  +++ OpenEJBModuleBuilder.java 25 Jun 2005 18:48:17 -0000      1.39
  @@ -94,7 +94,6 @@
   import org.apache.xmlbeans.XmlObject;
   import org.openejb.EJBModuleImpl;
   import org.openejb.corba.CORBAHandleDelegate;
  -import org.openejb.corba.compiler.CompilerException;
   import org.openejb.corba.compiler.SkeletonGenerator;
   import org.openejb.corba.proxy.CORBAProxyReference;
   import 
org.openejb.deployment.corba.NoDistributedTxTransactionImportPolicyBuilder;
  @@ -132,14 +131,12 @@
       private final SessionBuilder sessionBuilder;
       private final EntityBuilder entityBuilder;
       private final MdbBuilder mdbBuilder;
  -    private final SkeletonGenerator skeletonGenerator;
       private final TransactionImportPolicyBuilder 
transactionImportPolicyBuilder;
       private final Repository repository;
   
  -    public OpenEJBModuleBuilder(URI defaultParentId, ObjectName listener, 
SkeletonGenerator skeletonGenerator, Repository repository) {
  +    public OpenEJBModuleBuilder(URI defaultParentId, ObjectName listener, 
Repository repository) {
           this.defaultParentId = defaultParentId;
           this.listener = listener;
  -        this.skeletonGenerator = skeletonGenerator;
           this.transactionImportPolicyBuilder = new 
NoDistributedTxTransactionImportPolicyBuilder();
           this.cmpEntityBuilder = new CMPEntityBuilder(this);
           this.sessionBuilder = new SessionBuilder(this);
  @@ -148,10 +145,6 @@
           this.repository = repository;
       }
   
  -    public SkeletonGenerator getSkeletonGenerator() {
  -        return skeletonGenerator;
  -    }
  -
       public TransactionImportPolicyBuilder 
getTransactionImportPolicyBuilder() {
           return transactionImportPolicyBuilder;
       }
  @@ -315,27 +308,6 @@
           entityBuilder.initContext(refContext, moduleJ2eeContext, moduleUri, 
cl, enterpriseBeans, interfaces);
           mdbBuilder.initContext(cl, enterpriseBeans);
   
  -        if (skeletonGenerator != null) {
  -            File tempJar = null;
  -            try {
  -                tempJar = DeploymentUtil.createTempFile();
  -
  -                /**
  -                 * Windoze may be holding on to this
  -                 */
  -                tempJar.delete();
  -
  -                skeletonGenerator.generateSkeletons(interfaces, tempJar, cl);
  -
  -                earContext.addIncludeAsPackedJar(URI.create("corba.jar"), 
new JarFile(tempJar));
  -            } catch (IOException e) {
  -                throw new DeploymentException("Unable to generate CORBA 
skels for: " + moduleUri, e);
  -            } catch (CompilerException e) {
  -                throw new DeploymentException("Unable to generate CORBA 
skels for: " + moduleUri, e);
  -            } finally {
  -                DeploymentUtil.recursiveDelete(tempJar);
  -            }
  -        }
       }
   
       public Reference createEJBLocalReference(String objectName, boolean 
session, String localHome, String local) {
  @@ -516,7 +488,7 @@
   
           earContext.addSecurityContext(policyContextID, componentPermissions);
       }
  -    
  +
       private static ObjectName getResourceContainerId(URI uri, 
GerResourceLocatorType resourceLocator, EARContext earContext) throws 
DeploymentException {
           RefContext refContext = earContext.getRefContext();
           J2eeContext j2eeContext = earContext.getJ2eeContext();
  @@ -581,12 +553,11 @@
           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, NameFactory.CORBA_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", "Repository"});
           GBEAN_INFO = infoBuilder.getBeanInfo();
       }