Context Navigation

Changeset 1038

Timestamp:

10/12/06 14:38:30 (2 years ago)

Author:

jmoore

Message:

#427 Fixing JTA/container transactions!

Location:

trunk/components/server

Files:

r921	r1038
66	66	Scope: private
67	67	</description>
	68	<property name="userTransactionName" value="UserTransaction"/>
68	69	</bean>
69	70
70		~~<!-- Does nothing; the Application Server will handle this -->~~
71	71	<bean id="transactionHandler"
72		class="org.springframework.~~aop.interceptor.Debug~~Interceptor">
	72	class="org.springframework.transaction.interceptor.TransactionInterceptor">
73	73	<description>
74	74	Scope: private
75	75	</description>
	76	<property name="transactionManager" ref="transactionManager"/>
	77	<property name="transactionAttributeSource">
	78	<bean class="org.springframework.transaction.annotation.AnnotationTransactionAttributeSource"/>
	79	</property>
76	80	</bean>
77	81

r1006	r1038
41	41	import javax.ejb.Remote;
42	42	import javax.ejb.Stateless;
	43	import javax.ejb.TransactionManagement;
	44	import javax.ejb.TransactionManagementType;
43	45	import javax.interceptor.Interceptors;
44	46	import javax.management.InstanceNotFoundException;
…	…
114	116	* @since 3.0-M3
115	117	*/
	118	@TransactionManagement(TransactionManagementType.BEAN)
	119	@Transactional
116	120	@RevisionDate("$Date$")
117	121	@RevisionNumber("$Revision$")
118		~~@Transactional~~
119	122	@Stateless
120	123	@Remote(IAdmin.class)

r903	r1038
41	41	import java.util.Set;
42	42
	43	import javax.ejb.TransactionManagement;
	44	import javax.ejb.TransactionManagementType;
	45
43	46	//Third-party libraries
44	47	import org.springframework.transaction.annotation.Transactional;
…	…
62	65	* @since OMERO 1.0
63	66	*/
	67	@TransactionManagement(TransactionManagementType.BEAN)
64	68	@Transactional(readOnly=true)
65	69	public class AnalysisImpl extends AbstractLevel2Service implements IAnalysis {

r920	r1038
44	44	import javax.ejb.Remote;
45	45	import javax.ejb.Stateless;
	46	import javax.ejb.TransactionManagement;
	47	import javax.ejb.TransactionManagementType;
46	48	import javax.interceptor.Interceptors;
47	49
…	…
89	91	// ~ Service annotations
90	92	// =============================================================================
	93
	94	/* Source: EJB3 Specification
	95	* Purpose: Prevents the Container from managing transactions (CMT), and
	96	* instead delegates commits and rollbacks to user code. This is, however,
	97	* managed by Spring (@Transactional below)
	98	* @see https://trac.openmicroscopy.org.uk/omero/ticket/427
	99	*/
	100	@TransactionManagement(TransactionManagementType.BEAN)
91	101
92	102	/* Source: Spring

r992	r1038
39	39	import javax.ejb.Remote;
40	40	import javax.ejb.Stateless;
	41	import javax.ejb.TransactionManagement;
	42	import javax.ejb.TransactionManagementType;
41	43	import javax.interceptor.Interceptors;
42	44
…	…
72	74	* @since OME2.2
73	75	*/
	76	@TransactionManagement(TransactionManagementType.BEAN)
74	77	@Transactional(readOnly=true)
75	78	@Stateless

r908	r1038
50	50	import javax.ejb.Remote;
51	51	import javax.ejb.Stateless;
	52	import javax.ejb.TransactionManagement;
	53	import javax.ejb.TransactionManagementType;
52	54	import javax.interceptor.Interceptors;
53	55
…	…
98	100	* @since OMERO 2.0
99	101	*/
	102	@TransactionManagement(TransactionManagementType.BEAN)
100	103	@Transactional
101	104	@Stateless

r1005	r1038
40	40	import javax.ejb.Remote;
41	41	import javax.ejb.Stateless;
	42	import javax.ejb.TransactionManagement;
	43	import javax.ejb.TransactionManagementType;
42	44	import javax.interceptor.Interceptors;
43	45
…	…
84	86	*
85	87	*/
	88	@TransactionManagement(TransactionManagementType.BEAN)
86	89	@Transactional(readOnly=true)
87	90	@Stateless

r1017	r1038
43	43	import javax.ejb.Remote;
44	44	import javax.ejb.Stateless;
	45	import javax.ejb.TransactionManagement;
	46	import javax.ejb.TransactionManagementType;
45	47	import javax.imageio.IIOImage;
46	48	import javax.imageio.ImageIO;
…	…
86	88	*
87	89	*/
	90	@TransactionManagement(TransactionManagementType.BEAN)
88	91	@Transactional
89	92	@Stateless

r992	r1038
46	46	import javax.ejb.Remote;
47	47	import javax.ejb.Stateless;
	48	import javax.ejb.TransactionManagement;
	49	import javax.ejb.TransactionManagementType;
48	50	import javax.interceptor.Interceptors;
49	51
…	…
77	79	* @since OMERO 3.0
78	80	*/
	81	@TransactionManagement(TransactionManagementType.BEAN)
79	82	@Transactional
80	83	@Stateless

r977	r1038
46	46	import javax.ejb.Remote;
47	47	import javax.ejb.Stateless;
	48	import javax.ejb.TransactionManagement;
	49	import javax.ejb.TransactionManagementType;
48	50	import javax.interceptor.Interceptors;
49	51
…	…
76	78	* @since OMERO 3.0
77	79	*/
	80	@TransactionManagement(TransactionManagementType.BEAN)
78	81	@Transactional(readOnly=false)
79	82	@Stateless

r1032	r1038
31	31
32	32	// Java imports
	33	import static javax.ejb.TransactionAttributeType.REQUIRED;
	34
33	35	import java.io.IOException;
34	36	import java.io.Serializable;
…	…
44	46	import javax.ejb.Remote;
45	47	import javax.ejb.Stateful;
	48	import javax.ejb.TransactionManagement;
	49	import javax.ejb.TransactionManagementType;
46	50
47	51	// Third-party libraries
…	…
49	53	import org.jboss.annotation.ejb.RemoteBinding;
50	54	import org.jboss.annotation.security.SecurityDomain;
	55	import org.springframework.transaction.annotation.Transactional;
51	56
52	57	// Application-internal dependencies
…	…
75	80	* @since OMERO3
76	81	*/
	82	@TransactionManagement(TransactionManagementType.BEAN)
	83	@Transactional
77	84	@Stateful
78	85	@Remote(RawPixelsStore.class)
…	…
142	149
143	150	@RolesAllowed("user")
	151	@Transactional( readOnly = true )
144	152	public void setPixelsId( long pixelsId )
145	153	{

r1032	r1038
45	45	import javax.ejb.Remote;
46	46	import javax.ejb.Stateful;
47		import javax.ejb.TransactionAttribute;
	47	import javax.ejb.TransactionManagement;
	48	import javax.ejb.TransactionManagementType;
48	49
49	50	import static javax.ejb.TransactionAttributeType.*;
…	…
125	126	@SecurityDomain("OmeroSecurity")
126	127	@Cache(NoPassivationCache.class)
	128	@TransactionManagement(TransactionManagementType.BEAN)
127	129	@Transactional // TODO previously not here. examine the difference.
128	130	public class RenderingBean extends AbstractLevel2Service
…	…
242	244	*/
243	245	@RolesAllowed("user")
244		~~@TransactionAttribute(REQUIRED)~~
245	246	public void lookupPixels(long pixelsId)
246	247	{
…	…
269	270	*/
270	271	@RolesAllowed("user")
271		~~@TransactionAttribute(REQUIRED)~~
272	272	public void lookupRenderingDef(long pixelsId)
273	273	{
…	…
295	295	*/
296	296	@RolesAllowed("user")
297		~~@TransactionAttribute(REQUIRED)~~
298	297	public void load()
299	298	{
…	…
320	319	*/
321	320	@RolesAllowed("user")
322		~~@TransactionAttribute(REQUIRED)~~
323	321	public EventContext getCurrentEventContext()
324	322	{