You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/01/10 19:46:49 UTC
svn commit: r494924 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/Assembler.java core/CoreUserTransaction.java
core/TransactionManagerWrapper.java core/mdb/ActiveMQContainer.java
Author: dain
Date: Wed Jan 10 10:46:47 2007
New Revision: 494924
URL: http://svn.apache.org/viewvc?view=rev&rev=494924
Log:
Removed unused TransactionManagerWrapper
Removed:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/TransactionManagerWrapper.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ActiveMQContainer.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?view=diff&rev=494924&r1=494923&r2=494924
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Wed Jan 10 10:46:47 2007
@@ -25,7 +25,6 @@
import org.apache.openejb.core.ConnectorReference;
import org.apache.openejb.core.CoreDeploymentInfo;
import org.apache.openejb.core.TemporaryClassLoader;
-import org.apache.openejb.core.TransactionManagerWrapper;
import org.apache.openejb.javaagent.Agent;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.persistence.GlobalJndiDataSourceResolver;
@@ -437,11 +436,6 @@
Class interfce = serviceInterfaces.get(serviceInfo.serviceType);
checkImplementation(interfce, service.getClass(), serviceInfo.serviceType, serviceInfo.id);
-
- TransactionManager unwrappedTransactionManager = (TransactionManager) service;
- ObjectRecipe txManagerWrapperRecipe = new ObjectRecipe(TransactionManagerWrapper.class, new String[]{"transactionManager"}, new Class[]{TransactionManager.class});
- txManagerWrapperRecipe.setProperty("transactionManager", new StaticRecipe(unwrappedTransactionManager));
- service = txManagerWrapperRecipe.create();
this.containerSystem.getJNDIContext().bind("java:openejb/" + serviceInfo.serviceType, service);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java?view=diff&rev=494924&r1=494923&r2=494924
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreUserTransaction.java Wed Jan 10 10:46:47 2007
@@ -22,19 +22,21 @@
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
+import javax.transaction.Status;
+
+import org.apache.openejb.util.Logger;
/**
* @org.apache.xbean.XBean element="userTransaction"
*/
public class CoreUserTransaction implements javax.transaction.UserTransaction, java.io.Serializable {
+ private static final long serialVersionUID = 9203248912222645965L;
+ private static final Logger transactionLogger = Logger.getInstance("Transaction", "org.apache.openejb.util.resources");
private transient TransactionManager transactionManager;
- private transient final org.apache.log4j.Category transactionLogger;
-
public CoreUserTransaction(TransactionManager transactionManager) {
this.transactionManager = transactionManager;
- transactionLogger = org.apache.log4j.Category.getInstance("Transaction");
}
private TransactionManager transactionManager() {
@@ -71,7 +73,7 @@
public int getStatus() throws SystemException {
int status = transactionManager().getStatus();
if (transactionLogger.isInfoEnabled()) {
- transactionLogger.info("User transaction " + transactionManager().getTransaction() + " has status " + org.apache.openejb.core.TransactionManagerWrapper.getStatus(status));
+ transactionLogger.info("User transaction " + transactionManager().getTransaction() + " has status " + getStatus(status));
}
return status;
}
@@ -87,4 +89,51 @@
transactionManager().setTransactionTimeout(seconds);
}
+ private static String getStatus(int status) {
+ StringBuffer buffer;
+
+ buffer = new StringBuffer(100);
+ switch (status) {
+ case Status.STATUS_ACTIVE:
+ buffer.append("STATUS_ACTIVE: ");
+ buffer.append("A transaction is associated with the target object and it is in the active state.");
+ break;
+ case Status.STATUS_COMMITTED:
+ buffer.append("STATUS_COMMITTED: ");
+ buffer.append("A transaction is associated with the target object and it has been committed.");
+ break;
+ case Status.STATUS_COMMITTING:
+ buffer.append("STATUS_COMMITTING: ");
+ buffer.append("A transaction is associated with the target object and it is in the process of committing.");
+ break;
+ case Status.STATUS_MARKED_ROLLBACK:
+ buffer.append("STATUS_MARKED_ROLLBACK: ");
+ buffer.append("A transaction is associated with the target object and it has been marked for rollback, perhaps as a result of a setRollbackOnly operation.");
+ break;
+ case Status.STATUS_NO_TRANSACTION:
+ buffer.append("STATUS_NO_TRANSACTION: ");
+ buffer.append("No transaction is currently associated with the target object.");
+ break;
+ case Status.STATUS_PREPARED:
+ buffer.append("STATUS_PREPARED: ");
+ buffer.append("A transaction is associated with the target object and it has been prepared, i.e.");
+ break;
+ case Status.STATUS_PREPARING:
+ buffer.append("STATUS_PREPARING: ");
+ buffer.append("A transaction is associated with the target object and it is in the process of preparing.");
+ break;
+ case Status.STATUS_ROLLEDBACK:
+ buffer.append("STATUS_ROLLEDBACK: ");
+ buffer.append("A transaction is associated with the target object and the outcome has been determined as rollback.");
+ break;
+ case Status.STATUS_ROLLING_BACK:
+ buffer.append("STATUS_ROLLING_BACK: ");
+ buffer.append("A transaction is associated with the target object and it is in the process of rolling back.");
+ break;
+ default:
+ buffer.append("Unknown status ").append(status);
+ break;
+ }
+ return buffer.toString();
+ }
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ActiveMQContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ActiveMQContainer.java?view=diff&rev=494924&r1=494923&r2=494924
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ActiveMQContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/ActiveMQContainer.java Wed Jan 10 10:46:47 2007
@@ -21,7 +21,6 @@
import org.apache.activemq.ra.ActiveMQResourceAdapter;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.core.TransactionManagerWrapper;
import org.apache.openejb.spi.SecurityService;
import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
import org.apache.geronimo.connector.work.GeronimoWorkManager;
@@ -37,7 +36,7 @@
public class ActiveMQContainer extends MdbContainer {
public ActiveMQContainer(Object containerID,
- TransactionManagerWrapper transactionManager,
+ GeronimoTransactionManager transactionManager,
SecurityService securityService,
Map<String, DeploymentInfo> deploymentRegistry,
String serverUrl,
@@ -47,7 +46,7 @@
super(containerID,
transactionManager,
securityService,
- createActiveMQResourceAdapter((GeronimoTransactionManager) transactionManager.getTxManager(), serverUrl, threadPoolSize),
+ createActiveMQResourceAdapter(transactionManager, serverUrl, threadPoolSize),
ActiveMQActivationSpec.class,
instanceLimit);