User: vancek
Date: 06/08/11 08:11:39
Modified: andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/templates/ejb3/config
ejb-jar.xml.vsl
Log:
EJB-42 switch transaction-type in ejb-jar.xml to Bean for bean managed transaction demaraction
Revision Changes Path
1.30 +6 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- changes.xml 11 Aug 2006 05:49:48 -0000 1.29
+++ changes.xml 11 Aug 2006 15:11:38 -0000 1.30
@@ -282,6 +282,12 @@
<action dev="vancek" due-to="sverker" type="update">
JIRA EJB-41 - Cleaned unused imports and some calls to deprecated methods changed to their replacements.
</action>
+ <action dev="vancek" due-to="sverker" type="fix">
+ JIRA EJB-42 - Fix IllegalStateException "it is illegal to inject UserTransaction into a CMT bean" where a
+ session bean is modelled with bean managed transactions. This fix sets the <b>transaction-type</b>
+ for the session to <b>Bean</b> instead of <b>Container</b>. This does not affect manageable entity session
+ POJOs as they remain container managed transaction demarcation.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.7 +239 -231 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- ejb-jar.xml.vsl 14 Jun 2006 04:55:21 -0000 1.6
+++ ejb-jar.xml.vsl 11 Aug 2006 15:11:39 -0000 1.7
@@ -27,7 +27,11 @@
#**##end
<ejb-class>${service.fullyQualifiedServiceName}</ejb-class>
<session-type>${service.type}</session-type>
+#**##if ($service.transactionManagementBean)
+ <transaction-type>Bean</transaction-type>
+#**##else
<transaction-type>Container</transaction-type>
+#**##end
#**##foreach($envEntry in $service.getEnvironmentEntries(true))
<env-entry>
<env-entry-name>${envEntry.name}</env-entry-name>
@@ -77,7 +81,11 @@
</description>
<ejb-name>${mdb.messageDrivenName}</ejb-name>
<ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class>
+#**##if ($mdb.transactionManagementBean)
+ <transaction-type>Bean</transaction-type>
+#**##else
<transaction-type>Container</transaction-type>
+#**##end
<message-destination-type>${mdb.destinationType}</message-destination-type>
#**##if ($mdb.transactionManagementBean || $stringUtils.isNotBlank($mdb.messageSelector) || $mdb.destinationTypeTopic || $mdb.minimumPoolSize > 0 || $mdb.maximumPoolSize > 0)
<activation-config>
|
