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

[dain]

dain        2005/07/13 16:49:30

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

  Removed openorb/tmporb
  Removed tools jar hack
  Removed all stub/tie compiler code since is used openorb
  
  Revision  Changes    Path
  1.4       +13 -9     
openejb/modules/openejb-builder/src/java/org/openejb/deployment/corba/NoDistributedTxTransactionImportPolicyBuilder.java
  
  Index: NoDistributedTxTransactionImportPolicyBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/corba/NoDistributedTxTransactionImportPolicyBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NoDistributedTxTransactionImportPolicyBuilder.java        23 Jun 2005 
15:16:28 -0000      1.3
  +++ NoDistributedTxTransactionImportPolicyBuilder.java        13 Jul 2005 
20:49:30 -0000      1.4
  @@ -17,15 +17,16 @@
   package org.openejb.deployment.corba;
   
   import java.io.Serializable;
  +import java.lang.reflect.Method;
   import java.util.HashMap;
  +import java.util.Iterator;
   import java.util.Map;
   
   import org.openejb.corba.transaction.MappedServerTransactionPolicyConfig;
   import org.openejb.corba.transaction.OperationTxPolicy;
   import org.openejb.corba.transaction.ServerTransactionPolicyConfig;
   import 
org.openejb.corba.transaction.nodistributedtransactions.NoDTxServerTransactionPolicies;
  -import org.openejb.corba.compiler.IiopOperation;
  -import org.openejb.corba.compiler.PortableStubCompiler;
  +import org.openejb.corba.util.Util;
   import org.openejb.dispatch.InterfaceMethodSignature;
   import org.openejb.transaction.TransactionPolicySource;
   import org.openejb.transaction.TransactionPolicyType;
  @@ -37,14 +38,17 @@
   
       public Serializable buildTransactionImportPolicy(String methodIntf, 
Class intf, boolean isHomeMethod, TransactionPolicySource 
transactionPolicySource, ClassLoader classLoader) {
           Map policies = new HashMap();
  -        IiopOperation[] iiopOperations = 
PortableStubCompiler.createIiopOperations(intf);
  -        for (int i = 0; i < iiopOperations.length; i++) {
  -            IiopOperation iiopOperation = iiopOperations[i];
  -            InterfaceMethodSignature interfaceMethodSignature = new 
InterfaceMethodSignature(iiopOperation.getMethod(), isHomeMethod);
  +
  +        Map methodToOperation = Util.mapMethodToOperation(intf);
  +        for (Iterator iterator = methodToOperation.entrySet().iterator(); 
iterator.hasNext();) {
  +            Map.Entry entry = (Map.Entry) iterator.next();
  +            Method method = (Method) entry.getKey();
  +            String operation = (String) entry.getValue();
  +
  +            InterfaceMethodSignature interfaceMethodSignature = new 
InterfaceMethodSignature(method, isHomeMethod);
               TransactionPolicyType transactionPolicyType = 
transactionPolicySource.getTransactionPolicy(methodIntf, 
interfaceMethodSignature);
               OperationTxPolicy operationTxPolicy = 
NoDTxServerTransactionPolicies.getTransactionPolicy(transactionPolicyType);
  -            String IDLOperationName = iiopOperation.getName();
  -            policies.put(IDLOperationName, operationTxPolicy);
  +            policies.put(operation, operationTxPolicy);
           }
           ServerTransactionPolicyConfig serverTransactionPolicyConfig = new 
MappedServerTransactionPolicyConfig(policies);