[jboss-cvs] JBossAS SVN: r72668 - in projects/ejb3/trunk: core/src/main/java/org/jboss/ejb3 and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 24 07:02:06 EDT 2008
Author: wolfc
Date: 2008-04-24 07:02:06 -0400 (Thu, 24 Apr 2008)
New Revision: 72668
Removed:
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/
projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionFieldInjector.java
projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionMethodInjector.java
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java
projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionPropertyInjector.java
projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml
projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-serverlib.txt
projects/ejb3/trunk/plugin/src/main/resources/installer.xml
Log:
EJBTHREE-1299: integrated ejb3-transactions
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/pom.xml 2008-04-24 11:02:06 UTC (rev 72668)
@@ -408,6 +408,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-transactions</artifactId>
+ <version>0.13.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
<version>beta3-SNAPSHOT</version>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContextImpl.java 2008-04-24 11:02:06 UTC (rev 72668)
@@ -30,18 +30,13 @@
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
import javax.ejb.TimerService;
-import javax.ejb.TransactionManagementType;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.jboss.ejb3.annotation.SecurityDomain;
import org.jboss.ejb3.security.helpers.EJBContextHelper;
import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.tx.UserTransactionImpl;
import org.jboss.logging.Logger;
import org.jboss.security.RealmMapping;
@@ -181,10 +176,7 @@
public UserTransaction getUserTransaction() throws IllegalStateException
{
- TransactionManagementType type = TxUtil.getTransactionManagementType(getContainer());
- if (type != TransactionManagementType.BEAN) throw new IllegalStateException("Container " + getContainer().getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
-
- return new UserTransactionImpl();
+ return TxUtil.getUserTransaction(beanContext);
}
public EJBHome getEJBHome()
@@ -204,53 +196,11 @@
public void setRollbackOnly() throws IllegalStateException
{
- // EJB1.1 11.6.1: Must throw IllegalStateException if BMT
- TransactionManagementType type = TxUtil.getTransactionManagementType(getContainer());
- if (type != TransactionManagementType.CONTAINER) throw new IllegalStateException("Container " + getContainer().getEjbName() + ": it is illegal to call setRollbackOnly from BMT: " + type);
-
- try
- {
- TransactionManager tm = TxUtil.getTransactionManager();
-
- // The getRollbackOnly and setRollBackOnly method of the SessionContext interface should be used
- // only in the session bean methods that execute in the context of a transaction.
- if (tm.getTransaction() == null)
- throw new IllegalStateException("setRollbackOnly() not allowed without a transaction.");
-
- tm.setRollbackOnly();
- }
- catch (SystemException e)
- {
- log.warn("failed to set rollback only; ignoring", e);
- }
+ TxUtil.setRollbackOnly();
}
public boolean getRollbackOnly() throws IllegalStateException
{
- // EJB1.1 11.6.1: Must throw IllegalStateException if BMT
- TransactionManagementType type = TxUtil.getTransactionManagementType(getContainer());
- if (type != TransactionManagementType.CONTAINER)
- throw new IllegalStateException("Container " + getContainer().getEjbName() + ": it is illegal to call getRollbackOnly from BMT: " + type);
-
- try
- {
- TransactionManager tm = TxUtil.getTransactionManager();
-
- // The getRollbackOnly and setRollBackOnly method of the SessionContext interface should be used
- // only in the session bean methods that execute in the context of a transaction.
- if (tm.getTransaction() == null)
- throw new IllegalStateException("getRollbackOnly() not allowed without a transaction.");
-
- // EJBTHREE-805, consider an asynchronous rollback due to timeout
- int status = tm.getStatus();
- return status == Status.STATUS_MARKED_ROLLBACK
- || status == Status.STATUS_ROLLING_BACK
- || status == Status.STATUS_ROLLEDBACK;
- }
- catch (SystemException e)
- {
- log.warn("failed to get tx manager status; ignoring", e);
- return true;
- }
+ return TxUtil.getRollbackOnly();
}
}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/inflow/JBossMessageEndpointFactory.java 2008-04-24 11:02:06 UTC (rev 72668)
@@ -23,7 +23,6 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -160,7 +159,7 @@
public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException
{
- TransactionManagementType mtype = TxUtil.getTransactionManagementType(container);
+ TransactionManagementType mtype = TxUtil.getTransactionManagementType(container.getAdvisor());
if (mtype == javax.ejb.TransactionManagementType.BEAN) return false;
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulBeanContext.java 2008-04-24 11:02:06 UTC (rev 72668)
@@ -58,7 +58,7 @@
*
* @version $Revision$
*/
-public class StatefulBeanContext extends SessionSpecBeanContext<StatefulContainer> implements Identifiable, Serializable
+public class StatefulBeanContext extends SessionSpecBeanContext<StatefulContainer> implements Identifiable, Serializable, org.jboss.ejb3.tx.container.StatefulBeanContext<Object>
{
/** The serialVersionUID */
private static final long serialVersionUID = -102470788178912606L;
Deleted: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionFieldInjector.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionFieldInjector.java 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionFieldInjector.java 2008-04-24 11:02:06 UTC (rev 72668)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import java.lang.reflect.Field;
-
-import javax.ejb.TransactionManagementType;
-import javax.transaction.UserTransaction;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.tx.UserTransactionImpl;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use UserTransactionPropertyInjector
- */
-public class UserTransactionFieldInjector implements Injector
-{
- private Field field;
-
- public UserTransactionFieldInjector(Field field, InjectionContainer container)
- {
- if (container instanceof Container)
- {
- TransactionManagementType type = TxUtil.getTransactionManagementType((Container) container);
- if (type != TransactionManagementType.BEAN)
- throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
- }
- this.field = field;
- this.field.setAccessible(true);
- }
-
- public void inject(BeanContext ctx)
- {
- Object instance = ctx.getInstance();
- inject(instance);
- }
-
- public void inject(Object instance)
- {
- UserTransaction ut = new UserTransactionImpl();
- try
- {
- field.set(instance, ut);
- }
- catch (IllegalAccessException e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
- catch (IllegalArgumentException e)
- {
- throw new RuntimeException("Failed in setting EntityManager on setter field: " + field.toString());
- }
- }
-
- public Class getInjectionClass()
- {
- return field.getType();
- }
-}
Deleted: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionMethodInjector.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionMethodInjector.java 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionMethodInjector.java 2008-04-24 11:02:06 UTC (rev 72668)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.injection;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.ejb.TransactionManagementType;
-import javax.transaction.UserTransaction;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.tx.TxUtil;
-import org.jboss.ejb3.tx.UserTransactionImpl;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- * @deprecated use UserTransactionPropertyInjector
- */
-public class UserTransactionMethodInjector implements Injector
-{
- private Method setMethod;
-
- public UserTransactionMethodInjector(Method setMethod, InjectionContainer container)
- {
- if (container instanceof Container)
- {
- TransactionManagementType type = TxUtil.getTransactionManagementType(((Container) container));
- if (type != TransactionManagementType.BEAN)
- throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
- }
- this.setMethod = setMethod;
- setMethod.setAccessible(true);
- }
-
- public void inject(BeanContext ctx)
- {
- Object instance = ctx.getInstance();
- inject(instance);
- }
-
- public void inject(Object instance)
- {
- UserTransaction ut = new UserTransactionImpl();
- Object[] args = {ut};
- try
- {
- setMethod.invoke(instance, args);
- }
- catch (IllegalAccessException e)
- {
- throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
- }
- catch (IllegalArgumentException e)
- {
- throw new RuntimeException("Failed in setting EntityManager on setter method: " + setMethod.toString());
- }
- catch (InvocationTargetException e)
- {
- throw new RuntimeException(e.getCause()); //To change body of catch statement use Options | File Templates.
- }
- }
-
- public Class getInjectionClass()
- {
- return setMethod.getParameterTypes()[0];
- }
-}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionPropertyInjector.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionPropertyInjector.java 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/UserTransactionPropertyInjector.java 2008-04-24 11:02:06 UTC (rev 72668)
@@ -25,6 +25,7 @@
import javax.transaction.UserTransaction;
import org.jboss.ejb3.Container;
+import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.tx.TxUtil;
import org.jboss.ejb3.tx.UserTransactionImpl;
import org.jboss.injection.lang.reflect.BeanProperty;
@@ -42,9 +43,9 @@
{
super(property);
- if (container instanceof Container)
+ if (container instanceof EJBContainer)
{
- TransactionManagementType type = TxUtil.getTransactionManagementType(((Container) container));
+ TransactionManagementType type = TxUtil.getTransactionManagementType(((EJBContainer) container).getAdvisor());
if (type != TransactionManagementType.BEAN)
throw new IllegalStateException("Container " + ((Container) container).getEjbName() + ": it is illegal to inject UserTransaction into a CMT bean");
}
Modified: projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml 2008-04-24 11:02:06 UTC (rev 72668)
@@ -64,6 +64,7 @@
<interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
</stack>
+ <interceptor class="org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.ENCPropagationInterceptor" scope="PER_VM"/>
<interceptor name="Basic Authorization" factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
@@ -77,7 +78,8 @@
<interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
<interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+ <interceptor factory="org.jboss.ejb3.tx.BMTTxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+ <interceptor factory="org.jboss.ejb3.tx.CMTTxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
<!-- interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/ -->
<interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
<interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
@@ -138,6 +140,10 @@
<advice name="fillMethod" aspect="InvocationContextInterceptor"/>
<advice name="aroundInvoke" aspect="InjectInterceptorsFactory"/>
</stack>
+
+ <bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor"/>
+ </bind>
</domain>
@@ -158,9 +164,10 @@
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
@@ -190,9 +197,10 @@
<interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
@@ -225,9 +233,10 @@
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
</bind>
<bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
@@ -295,9 +304,10 @@
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
</bind>
<bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
@@ -358,8 +368,9 @@
</bind>
<!-- TODO: Authorization? -->
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
<!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
@@ -378,8 +389,9 @@
<interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
</bind>
<bind pointcut="execution(public * *->*(..))">
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
@@ -414,7 +426,8 @@
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
@@ -443,7 +456,8 @@
</bind>
<bind pointcut="execution(public * *->*(..))">
<interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
+ <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
<interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
<interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
</bind>
Modified: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-serverlib.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-serverlib.txt 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-serverlib.txt 2008-04-24 11:02:06 UTC (rev 72668)
@@ -1,8 +1,9 @@
jboss-ejb3-cache.jar
-jboss-ejb3-security.jar
jboss-ejb3-core.jar
jboss-ejb3-ext-api.jar
jboss-ejb3-ext-api-impl.jar
jboss-ejb3-interceptors.jar
jboss-ejb3-metadata.jar
+jboss-ejb3-security.jar
+jboss-ejb3-transactions.jar
jboss-ha-client.jar
Modified: projects/ejb3/trunk/plugin/src/main/resources/installer.xml
===================================================================
--- projects/ejb3/trunk/plugin/src/main/resources/installer.xml 2008-04-24 10:31:05 UTC (rev 72667)
+++ projects/ejb3/trunk/plugin/src/main/resources/installer.xml 2008-04-24 11:02:06 UTC (rev 72668)
@@ -24,13 +24,14 @@
<includes>
<include>ant-contrib:ant-contrib</include>
<include>org.jboss.ejb3:jboss-ejb3-cache</include>
- <include>org.jboss.ejb3:jboss-ejb3-security</include>
<include>org.jboss.ejb3:jboss-ejb3-core:jar</include>
<include>org.jboss.ejb3:jboss-ejb3-ext-api</include>
<include>org.jboss.ejb3:jboss-ejb3-ext-api-impl</include>
<include>org.jboss.ejb3:jboss-ejb3-interceptors</include>
<include>org.jboss.ejb3:jboss-ejb3-metadata</include>
<include>org.jboss.ejb3:jboss-ejb3-pool</include>
+ <include>org.jboss.ejb3:jboss-ejb3-security</include>
+ <include>org.jboss.ejb3:jboss-ejb3-transactions</include>
<include>org.jboss.cluster:jboss-ha-client</include>
</includes>
<outputDirectory>lib</outputDirectory>
More information about the jboss-cvs-commits
mailing list