geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1144867 - in /geronimo/server/trunk/plugins: corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
Date Sun, 10 Jul 2011 14:38:55 GMT
Author: genspring
Date: Sun Jul 10 14:38:55 2011
New Revision: 1144867

URL: http://svn.apache.org/viewvc?rev=1144867&view=rev
Log:
OPENEJB-1567 Overriding of per-interface transaction attributes only supported for different
method signatures

Geronimo Corba side need coresponding changes to build correct transaction policies.

Modified:
    geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java?rev=1144867&r1=1144866&r2=1144867&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java
(original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java
Sun Jul 10 14:38:55 2011
@@ -33,6 +33,7 @@ import org.apache.geronimo.corba.transac
 import org.apache.geronimo.corba.transaction.nodistributedtransactions.NoDTxServerTransactionPolicies;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.openejb.EjbDeployment;
+import org.apache.openejb.InterfaceType;
 import org.apache.openejb.core.transaction.TransactionType;
 
 import org.omg.CORBA.Policy;
@@ -103,7 +104,7 @@ public class TSSLink implements GBeanLif
         if (ejb.getHomeInterface() == null) {
             return null;
         }
-        Serializable policy = buildTransactionImportPolicy(ejb.getHomeInterface());
+        Serializable policy = buildTransactionImportPolicy(ejb.getHomeInterface(), InterfaceType.EJB_HOME);
         return policy;
     }
 
@@ -115,11 +116,11 @@ public class TSSLink implements GBeanLif
         if (ejb.getRemoteInterface() == null) {
             return null;
         }
-        Serializable policy = buildTransactionImportPolicy(ejb.getRemoteInterface());
+        Serializable policy = buildTransactionImportPolicy(ejb.getRemoteInterface(), InterfaceType.BUSINESS_REMOTE);
         return policy;
     }
 
-    private Serializable buildTransactionImportPolicy(Class intf) {
+    private Serializable buildTransactionImportPolicy(Class intf, InterfaceType interfaceType)
{
 
         Map policies = new HashMap();
 
@@ -130,7 +131,7 @@ public class TSSLink implements GBeanLif
             String operation = (String) entry.getValue();
 
             if (!ejb.isBeanManagedTransaction()) {
-            	TransactionType transactionType = ejb.getTransactionType(method);
+            	TransactionType transactionType = ejb.getTransactionType(method, interfaceType);
                 OperationTxPolicy operationTxPolicy = NoDTxServerTransactionPolicies.getContainerTransactionPolicy(transactionType);
                 policies.put(operation, operationTxPolicy);
             } else {

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java?rev=1144867&r1=1144866&r2=1144867&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbDeployment.java
Sun Jul 10 14:38:55 2011
@@ -270,6 +270,10 @@ public class EjbDeployment implements EJ
     public TransactionType getTransactionType(Method method) {
         return getDeploymentInfo().getTransactionType(method);
     }
+    
+    public TransactionType getTransactionType(Method method, InterfaceType interfaceType)
{
+        return getDeploymentInfo().getTransactionType(method, interfaceType);
+    }
 
     public String getObjectName() {
         return objectName;



Mime
View raw message