You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/15 03:26:06 UTC

svn commit: r496209 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/ core/ core/mdb/ core/stateful/ core/stateless/ core/transaction/

Author: dblevins
Date: Sun Jan 14 18:26:05 2007
New Revision: 496209

URL: http://svn.apache.org/viewvc?view=rev&rev=496209
Log:
Removed int constants for tx attributes (now uses enum) and cleaned up constructors

Removed:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceTypeConstants.java
Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java Sun Jan 14 18:26:05 2007
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.ArrayList;
 
-public class ServiceInfo extends InfoObject implements ServiceTypeConstants {
+public class ServiceInfo extends InfoObject {
 
     public String serviceType;
     public String description;

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java Sun Jan 14 18:26:05 2007
@@ -288,24 +288,11 @@
             methodTransactionPolicies.put(method, policy);
         }
         if (policy == null) {
-            policy = new NoTransactionPolicy();
+            policy = new TxSupports((TransactionContainer) container);
         }
         return policy ;
     }
 
-    private static class NoTransactionPolicy extends TransactionPolicy {
-        public void afterInvoke(Object bean, TransactionContext context) throws ApplicationException, SystemException {
-        }
-
-        public void beforeInvoke(Object bean, TransactionContext context) throws SystemException, ApplicationException {
-        }
-
-        public void handleApplicationException(Throwable appException, TransactionContext context) throws ApplicationException {
-        }
-
-        public void handleSystemException(Throwable sysException, Object instance, TransactionContext context) throws ApplicationException, SystemException {
-        }
-    }
     public Collection<String> getAuthorizedRoles(Method method) {
         Collection<String> roleSet = methodPermissions.get(method);
         if (roleSet == null) {
@@ -528,9 +515,9 @@
            context(REQUIRES_NEW, SUPPORTS) and no client to handle exceptions (MANDATORY, NEVER).
          */
         if (componentType.isMessageDriven() && !isBeanManagedTransaction && container instanceof TransactionContainer) {
-            if (policy.policyType != TransactionPolicy.NotSupported && policy.policyType != TransactionPolicy.Required) {
+            if (policy.getPolicyType() != TransactionPolicy.Type.NotSupported && policy.getPolicyType() != TransactionPolicy.Type.Required) {
 
-                if (method.equals(this.ejbTimeout) && policy.policyType == TransactionPolicy.RequiresNew) {
+                if (method.equals(this.ejbTimeout) && policy.getPolicyType() == TransactionPolicy.Type.RequiresNew) {
                     // do nothing. This is allowed as the timer callback method for a message driven bean
                     // can also have a transaction policy of RequiresNew Sec 5.4.12 of Ejb 3.0 Core Spec
                 } else {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MessageDrivenBeanManagedTxPolicy.java Sun Jan 14 18:26:05 2007
@@ -30,20 +30,10 @@
 public class MessageDrivenBeanManagedTxPolicy extends TransactionPolicy {
 
     public MessageDrivenBeanManagedTxPolicy(TransactionContainer container) {
-        this();
+        super(Type.BeanManaged, container);
         if (container.getContainerType() != ContainerType.MESSAGE_DRIVEN) {
             throw new IllegalArgumentException();
         }
-
-        this.container = container;
-    }
-
-    public MessageDrivenBeanManagedTxPolicy() {
-        policyType = BeanManaged;
-    }
-
-    public String policyToString() {
-        return "TX_BeanManaged: ";
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws SystemException, ApplicationException {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SessionSynchronizationTxPolicy.java Sun Jan 14 18:26:05 2007
@@ -29,12 +29,11 @@
     protected TransactionPolicy policy;
 
     public SessionSynchronizationTxPolicy(TransactionPolicy policy) {
+        super(policy.getPolicyType(), policy.getContainer());
         this.policy = policy;
-        this.container = policy.getContainer();
-        this.policyType = policy.policyType;
         if (container.getContainerType() != ContainerType.STATEFUL ||
-                policyType == TransactionPolicy.Never ||
-                policyType == TransactionPolicy.NotSupported) {
+                getPolicyType() == TransactionPolicy.Type.Never ||
+                getPolicyType() == TransactionPolicy.Type.NotSupported) {
             throw new IllegalArgumentException();
         }
 

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulBeanManagedTxPolicy.java Sun Jan 14 18:26:05 2007
@@ -20,7 +20,6 @@
 import javax.transaction.Transaction;
 
 import org.apache.openejb.ApplicationException;
-import org.apache.openejb.Container;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.SystemException;
 import org.apache.openejb.ContainerType;
@@ -30,18 +29,10 @@
 
 public class StatefulBeanManagedTxPolicy extends TransactionPolicy {
     public StatefulBeanManagedTxPolicy(TransactionContainer container) {
+        super(Type.BeanManaged, container);
         if (container.getContainerType() != ContainerType.STATEFUL) {
             throw new IllegalArgumentException("Container is not an StatefulContainer");
         }
-        this.container = container;
-    }
-
-    public StatefulBeanManagedTxPolicy() {
-        policyType = BeanManaged;
-    }
-
-    public String policyToString() {
-        return "TX_BeanManaged: ";
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws SystemException, ApplicationException {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerManagedTxPolicy.java Sun Jan 14 18:26:05 2007
@@ -27,9 +27,8 @@
     protected TransactionPolicy policy;
 
     public StatefulContainerManagedTxPolicy(TransactionPolicy policy) {
+        super(policy.getPolicyType(), policy.getContainer());
         this.policy = policy;
-        this.container = policy.getContainer();
-        this.policyType = policy.policyType;
         if (container.getContainerType() != ContainerType.STATEFUL) {
             throw new IllegalArgumentException();
         }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessBeanManagedTxPolicy.java Sun Jan 14 18:26:05 2007
@@ -28,16 +28,10 @@
 public class StatelessBeanManagedTxPolicy extends TransactionPolicy {
 
     public StatelessBeanManagedTxPolicy(TransactionContainer container) {
-        this();
+        super(Type.BeanManaged, container);
         if (container.getContainerType() != ContainerType.STATELESS) {
             throw new IllegalArgumentException();
         }
-
-        this.container = container;
-    }
-
-    public StatelessBeanManagedTxPolicy() {
-        policyType = BeanManaged;
     }
 
     public String policyToString() {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java Sun Jan 14 18:26:05 2007
@@ -16,40 +16,50 @@
  */
 package org.apache.openejb.core.transaction;
 
-import java.rmi.RemoteException;
-
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
 import org.apache.openejb.ApplicationException;
 import org.apache.openejb.InvalidateReferenceException;
 import org.apache.openejb.SystemException;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.util.Logger;
 
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import java.rmi.RemoteException;
+
 public abstract class TransactionPolicy {
+    public Type getPolicyType() {
+        return policyType;
+    }
 
-    public static final int Mandatory = 0;
-    public static final int Never = 1;
-    public static final int NotSupported = 2;
-    public static final int Required = 3;
-    public static final int RequiresNew = 4;
-    public static final int Supports = 5;
-    public static final int BeanManaged = 6;
+    public static enum Type {
+        Mandatory,
+        Never,
+        NotSupported,
+        Required,
+        RequiresNew,
+        Supports,
+        BeanManaged;
+    }
 
-    public int policyType;
+
+    private final Type policyType;
+    protected final TransactionContainer container;
     private TransactionManager manager;
-    protected TransactionContainer container;
 
     protected final static Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.util.resources");
     protected final static Logger txLogger = Logger.getInstance("Transaction", "org.apache.openejb.util.resources");
 
+    public TransactionPolicy(Type policyType, TransactionContainer container) {
+        this.policyType = policyType;
+        this.container = container;
+    }
+
     public TransactionContainer getContainer() {
         return container;
     }
 
     public String policyToString() {
-        return "Internal Error: no such policy";
+        return policyType.toString();
     }
 
     public abstract void handleApplicationException(Throwable appException, TransactionContext context) throws org.apache.openejb.ApplicationException;
@@ -65,7 +75,7 @@
             if (tx != null) {
                 tx.setRollbackOnly();
                 if (txLogger.isInfoEnabled()) {
-                    txLogger.info(policyToString() + "setRollbackOnly() on transaction " + tx);
+                    txLogger.info("TX " + policyToString() + ": setRollbackOnly() on transaction " + tx);
                 }
             }
         } catch (javax.transaction.SystemException se) {
@@ -78,7 +88,7 @@
         try {
             Transaction tx = context.getTransactionManager().suspend();
             if (txLogger.isInfoEnabled()) {
-                txLogger.info(policyToString() + "Suspended transaction " + tx);
+                txLogger.info("TX " + policyToString() + ": Suspended transaction " + tx);
             }
             return tx;
         } catch (javax.transaction.SystemException se) {
@@ -91,11 +101,11 @@
         try {
             if (tx == null) {
                 if (txLogger.isInfoEnabled()) {
-                    txLogger.info(policyToString() + "No transaction to resume");
+                    txLogger.info("TX " + policyToString() + ": No transaction to resume");
                 }
             } else {
                 if (txLogger.isInfoEnabled()) {
-                    txLogger.info(policyToString() + "Resuming transaction " + tx);
+                    txLogger.info("TX " + policyToString() + ": Resuming transaction " + tx);
                 }
                 context.getTransactionManager().resume(tx);
             }
@@ -117,7 +127,7 @@
     protected void commitTransaction(TransactionContext context, Transaction tx) throws SystemException {
         try {
             if (txLogger.isInfoEnabled()) {
-                txLogger.info(policyToString() + "Committing transaction " + tx);
+                txLogger.info("TX " + policyToString() + ": Committing transaction " + tx);
             }
             if (tx.equals(context.getTransactionManager().getTransaction())) {
 
@@ -157,7 +167,7 @@
     protected void rollbackTransaction(TransactionContext context, Transaction tx) throws SystemException {
         try {
             if (txLogger.isInfoEnabled()) {
-                txLogger.info(policyToString() + "Rolling back transaction " + tx);
+                txLogger.info("TX " + policyToString() + ": Rolling back transaction " + tx);
             }
             if (tx.equals(context.getTransactionManager().getTransaction())) {
 
@@ -212,7 +222,7 @@
         try {
             context.getTransactionManager().begin();
             if (txLogger.isInfoEnabled()) {
-                txLogger.info(policyToString() + "Started transaction " + context.getTransactionManager().getTransaction());
+                txLogger.info("TX " + policyToString() + ": Started transaction " + context.getTransactionManager().getTransaction());
             }
         } catch (javax.transaction.NotSupportedException nse) {
             logger.error("", nse);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxManditory.java Sun Jan 14 18:26:05 2007
@@ -21,16 +21,7 @@
 public class TxManditory extends TransactionPolicy {
 
     public TxManditory(TransactionContainer container) {
-        this();
-        this.container = container;
-    }
-
-    public TxManditory() {
-        policyType = Mandatory;
-    }
-
-    public String policyToString() {
-        return "TX_Mandatory: ";
+        super(Type.Mandatory, container);
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java Sun Jan 14 18:26:05 2007
@@ -21,16 +21,7 @@
 public class TxNever extends TransactionPolicy {
 
     public TxNever(TransactionContainer container) {
-        this();
-        this.container = container;
-    }
-
-    public TxNever() {
-        policyType = Never;
-    }
-
-    public String policyToString() {
-        return "TX_Never: ";
+        super(Type.Never, container);
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java Sun Jan 14 18:26:05 2007
@@ -21,16 +21,7 @@
 public class TxNotSupported extends TransactionPolicy {
 
     public TxNotSupported(TransactionContainer container) {
-        this();
-        this.container = container;
-    }
-
-    public TxNotSupported() {
-        policyType = NotSupported;
-    }
-
-    public String policyToString() {
-        return "TX_NotSupported: ";
+        super(Type.NotSupported, container);
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java Sun Jan 14 18:26:05 2007
@@ -23,16 +23,7 @@
 public class TxRequired extends TransactionPolicy {
 
     public TxRequired(TransactionContainer container) {
-        this();
-        this.container = container;
-    }
-
-    public TxRequired() {
-        policyType = Required;
-    }
-
-    public String policyToString() {
-        return "TX_Required: ";
+        super(Type.Required, container);
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java Sun Jan 14 18:26:05 2007
@@ -16,23 +16,14 @@
  */
 package org.apache.openejb.core.transaction;
 
-import javax.transaction.Status;
-
 import org.apache.openejb.ApplicationException;
 
+import javax.transaction.Status;
+
 public class TxRequiresNew extends TransactionPolicy {
 
     public TxRequiresNew(TransactionContainer container) {
-        this();
-        this.container = container;
-    }
-
-    public TxRequiresNew() {
-        policyType = RequiresNew;
-    }
-
-    public String policyToString() {
-        return "TX_RequiresNew: ";
+        super(Type.RequiresNew, container);
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {
@@ -65,7 +56,7 @@
             if (context.clientTx != null) {
                 resumeTransaction(context, context.clientTx);
             } else if (txLogger.isInfoEnabled()) {
-                txLogger.info(policyToString() + "No transaction to resume");
+                txLogger.info("TX " + policyToString() + ": No transaction to resume");
             }
         }
     }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java?view=diff&rev=496209&r1=496208&r2=496209
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java Sun Jan 14 18:26:05 2007
@@ -21,16 +21,7 @@
 public class TxSupports extends TransactionPolicy {
 
     public TxSupports(TransactionContainer container) {
-        this();
-        this.container = container;
-    }
-
-    public TxSupports() {
-        policyType = Supports;
-    }
-
-    public String policyToString() {
-        return "TX_Supports: ";
+        super(Type.Supports, container);
     }
 
     public void beforeInvoke(Object instance, TransactionContext context) throws org.apache.openejb.SystemException, org.apache.openejb.ApplicationException {