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

[djencks]

djencks     2005/04/19 19:37:03

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

  use correct corba operation names for overloaded methods
  
  Revision  Changes    Path
  1.2       +13 -16    
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NoDistributedTxTransactionImportPolicyBuilder.java        15 Mar 2005 
05:32:41 -0000      1.1
  +++ NoDistributedTxTransactionImportPolicyBuilder.java        19 Apr 2005 
23:37:03 -0000      1.2
  @@ -17,32 +17,32 @@
   package org.openejb.deployment.corba;
   
   import java.io.Serializable;
  -import java.util.Map;
   import java.util.HashMap;
  -import java.lang.reflect.Method;
  +import java.util.Map;
   
  -import org.openejb.transaction.TransactionPolicySource;
  -import org.openejb.transaction.TransactionPolicyType;
  -import org.openejb.dispatch.InterfaceMethodSignature;
  +import org.openejb.corba.transaction.MappedServerTransactionPolicyConfig;
   import org.openejb.corba.transaction.OperationTxPolicy;
   import org.openejb.corba.transaction.ServerTransactionPolicyConfig;
  -import org.openejb.corba.transaction.MappedServerTransactionPolicyConfig;
   import 
org.openejb.corba.transaction.nodistributedtransactions.NoDTxServerTransactionPolicies;
  +import org.openejb.dispatch.InterfaceMethodSignature;
  +import org.openejb.transaction.TransactionPolicySource;
  +import org.openejb.transaction.TransactionPolicyType;
   
   /**
    * @version $Rev:  $ $Date$
    */
   public class NoDistributedTxTransactionImportPolicyBuilder implements 
TransactionImportPolicyBuilder {
   
  -    public Serializable buildTransactionImportPolicy(String methodIntf, 
Class intf, boolean isHomeMethod, TransactionPolicySource 
transactionPolicySource) {
  +    public Serializable buildTransactionImportPolicy(String methodIntf, 
Class intf, boolean isHomeMethod, TransactionPolicySource 
transactionPolicySource, ClassLoader classLoader) {
           Map policies = new HashMap();
  -        Method[]  methods = intf.getMethods();
  -        for (int i = 0; i < methods.length; i++) {
  -            Method method = methods[i];
  -            InterfaceMethodSignature interfaceMethodSignature = new 
InterfaceMethodSignature(method, isHomeMethod);
  +        org.apache.geronimo.interop.rmi.iiop.compiler.Compiler compiler = 
new org.apache.geronimo.interop.rmi.iiop.compiler.Compiler(null, classLoader);
  +        
org.apache.geronimo.interop.rmi.iiop.compiler.Compiler.MethodOverload[] 
methodOverloads = compiler.getMethodOverloads(intf, false);
  +        for (int i = 0; i < methodOverloads.length; i++) {
  +            
org.apache.geronimo.interop.rmi.iiop.compiler.Compiler.MethodOverload 
methodOverload = methodOverloads[i];
  +            InterfaceMethodSignature interfaceMethodSignature = new 
InterfaceMethodSignature(methodOverload.method, isHomeMethod);
               TransactionPolicyType transactionPolicyType = 
transactionPolicySource.getTransactionPolicy(methodIntf, 
interfaceMethodSignature);
               OperationTxPolicy operationTxPolicy = 
NoDTxServerTransactionPolicies.getTransactionPolicy(transactionPolicyType);
  -            String IDLOperationName = 
getIDLOperationName(interfaceMethodSignature);
  +            String IDLOperationName = methodOverload.iiop_name;
               policies.put(IDLOperationName, operationTxPolicy);
           }
           ServerTransactionPolicyConfig serverTransactionPolicyConfig = new 
MappedServerTransactionPolicyConfig(policies);
  @@ -50,7 +50,4 @@
           return serverTransactionPolicyConfig;
       }
   
  -    private String getIDLOperationName(InterfaceMethodSignature 
interfaceMethodSignature) {
  -        return interfaceMethodSignature.getMethodName();
  -    }
   }
  
  
  
  1.2       +2 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/corba/TransactionImportPolicyBuilder.java
  
  Index: TransactionImportPolicyBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/corba/TransactionImportPolicyBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransactionImportPolicyBuilder.java       15 Mar 2005 05:32:41 -0000      
1.1
  +++ TransactionImportPolicyBuilder.java       19 Apr 2005 23:37:03 -0000      
1.2
  @@ -25,6 +25,6 @@
    */
   public interface TransactionImportPolicyBuilder {
   
  -    Serializable buildTransactionImportPolicy(String methodIntf, Class intf, 
boolean isHomeMethod, TransactionPolicySource transactionPolicySource);
  +    Serializable buildTransactionImportPolicy(String methodIntf, Class intf, 
boolean isHomeMethod, TransactionPolicySource transactionPolicySource, 
ClassLoader classLoader);
   
   }