[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment MdbBuilder.java SessionBuilder.java TransactionPolicyHelper.java

[dain]

dain        2005/02/15 19:09:24

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        MdbBuilder.java SessionBuilder.java
                        TransactionPolicyHelper.java
  Log:

  Fixed problem with CMT transactions throwing RolledbackException when an 
instance calls setRollbackOnly()
  Cleaned up handling of UnspecifiedTransactionContext
  Fixed inconsistencies in ContainerPolicy
  Removed the redundant stateful BMT policy
  
  Revision  Changes    Path
  1.11      +1 -1      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java
  
  Index: MdbBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/MdbBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MdbBuilder.java   26 Jan 2005 23:28:01 -0000      1.10
  +++ MdbBuilder.java   16 Feb 2005 00:09:23 -0000      1.11
  @@ -184,7 +184,7 @@
           if 
("Bean".equals(messageDrivenBean.getTransactionType().getStringValue())) {
               userTransaction = new UserTransactionImpl();
               builder.setUserTransaction(userTransaction);
  -            
builder.setTransactionPolicySource(TransactionPolicyHelper.StatelessBMTPolicySource);
  +            
builder.setTransactionPolicySource(TransactionPolicyHelper.BMTPolicySource);
           } else {
               userTransaction = null;
               TransactionPolicySource transactionPolicySource = 
transactionPolicyHelper.getTransactionPolicySource(ejbName);
  
  
  
  1.13      +2 -2      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java
  
  Index: SessionBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/SessionBuilder.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- SessionBuilder.java       26 Jan 2005 23:28:01 -0000      1.12
  +++ SessionBuilder.java       16 Feb 2005 00:09:23 -0000      1.13
  @@ -205,9 +205,9 @@
               userTransaction = new UserTransactionImpl();
               builder.setUserTransaction(userTransaction);
               if (isStateless) {
  -                
builder.setTransactionPolicySource(TransactionPolicyHelper.StatelessBMTPolicySource);
  +                
builder.setTransactionPolicySource(TransactionPolicyHelper.BMTPolicySource);
               } else {
  -                builder.setTransactionPolicySource(new 
StatefulTransactionPolicySource(TransactionPolicyHelper.StatefulBMTPolicySource));
  +                builder.setTransactionPolicySource(new 
StatefulTransactionPolicySource(TransactionPolicyHelper.BMTPolicySource));
               }
           } else {
               userTransaction = null;
  
  
  
  1.3       +5 -11     
openejb/modules/openejb-builder/src/java/org/openejb/deployment/TransactionPolicyHelper.java
  
  Index: TransactionPolicyHelper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/TransactionPolicyHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TransactionPolicyHelper.java      6 Dec 2004 06:32:33 -0000       1.2
  +++ TransactionPolicyHelper.java      16 Feb 2005 00:09:23 -0000      1.3
  @@ -71,15 +71,9 @@
    */
   public class TransactionPolicyHelper {
   
  -    public final static TransactionPolicySource StatefulBMTPolicySource = 
new TransactionPolicySource() {
  +    public final static TransactionPolicySource BMTPolicySource = new 
TransactionPolicySource() {
           public TransactionPolicy getTransactionPolicy(String methodIntf, 
InterfaceMethodSignature signature) {
  -            return BeanPolicy.Stateful;
  -        }
  -    };
  -
  -    public final static TransactionPolicySource StatelessBMTPolicySource = 
new TransactionPolicySource() {
  -        public TransactionPolicy getTransactionPolicy(String methodIntf, 
InterfaceMethodSignature signature) {
  -            return BeanPolicy.Stateless;
  +            return BeanPolicy.INSTANCE;
           }
       };
   
  @@ -156,8 +150,8 @@
               transactionPolicyMap.put("RequiresNew", 
ContainerPolicy.RequiresNew);
               transactionPolicyMap.put("Mandatory", ContainerPolicy.Mandatory);
               transactionPolicyMap.put("Never", ContainerPolicy.Never);
  -            transactionPolicyMap.put("Stateless", BeanPolicy.Stateless);
  -            transactionPolicyMap.put("Stateful", BeanPolicy.Stateful);
  +            transactionPolicyMap.put("Stateless", BeanPolicy.INSTANCE);
  +            transactionPolicyMap.put("Stateful", BeanPolicy.INSTANCE);
           }
   
           private final TransactionPolicy transactionPolicy;