Author: dblevins Date: Mon May 17 21:38:15 2010 New Revision: 945398 URL: http://svn.apache.org/viewvc?rev=945398&view=rev Log: svn merge -r 943471:943472 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=943472&view=rev ------------------------------------------------------------------------ r943472 | jlmonteiro | 2010-05-12 05:52:08 -0700 (Wed, 12 May 2010) | 15 lines OPENEJB-1276: Add #getTransactionIdentifier(Transaction tx) to o.a.o.hibernate.TransactionManagerLookup Excerpt from the Hibernate javadoc Object getTransactionIdentifier(Transaction transaction) Determine an identifier for the given transaction appropriate for use in caching/lookup usages. Generally speaking the transaction itself will be returned here. This method was added specifically for use in WebSphere and other unfriendly JEE containers (although WebSphere is still the only known such brain-dead, sales-driven impl). Parameters: transaction - The transaction to be identified. Returns: An appropropriate identifier ------------------------------------------------------------------------ Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 17 21:38:15 2010 @@ -1 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 +/openejb/trunk/openejb3:943472 Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java?rev=945398&r1=945397&r2=945398&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java (original) +++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/util/MakeTxLookup.java Mon May 17 21:38:15 2010 @@ -79,6 +79,14 @@ public class MakeTxLookup implements Opc mv.visitMaxs(1, 1); mv.visitEnd(); } + { + mv = cw.visitMethod(ACC_PUBLIC, "getTransactionIdentifier", "(Ljavax/transaction/Transaction;)Ljava/lang/Object;", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 1); + mv.visitInsn(ARETURN); + mv.visitMaxs(1, 2); + mv.visitEnd(); + } cw.visitEnd(); Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 17 21:38:15 2010 @@ -1 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 17 21:38:15 2010 @@ -1 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472
