[jbpm-commits] JBoss JBPM SVN: r5977 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: tx and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Dec 17 06:06:20 EST 2009


Author: tom.baeyens at jboss.com
Date: 2009-12-17 06:06:19 -0500 (Thu, 17 Dec 2009)
New Revision: 5977

Added:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaRetryInterceptor.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaStatusHelper.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java
Removed:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/FlushDeserializedObject.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/
Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JtaTransactionInterceptorBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
Log:
JBPM-2631 spring transactions.  clean up

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -38,8 +38,8 @@
 import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl;
 import org.jbpm.pvm.internal.query.TaskQueryImpl;
 import org.jbpm.pvm.internal.task.TaskImpl;
+import org.jbpm.pvm.internal.tx.JtaTransaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
-import org.jbpm.pvm.internal.tx.jta.JtaTransaction;
 import org.jbpm.pvm.internal.type.Variable;
 
 

Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/FlushDeserializedObject.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/FlushDeserializedObject.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/FlushDeserializedObject.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.tx;
-
-import java.io.Serializable;
-import java.util.Arrays;
-
-import javax.transaction.Synchronization;
-
-import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
-import org.jbpm.pvm.internal.type.Variable;
-import org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter;
-import org.jbpm.pvm.internal.type.variable.BlobVariable;
-
-
-/**
- * @author Tom Baeyens
- */
-public class FlushDeserializedObject implements Serializable, Synchronization {
-
-  private static final long serialVersionUID = 1L;
-  
-  private static final SerializableToBytesConverter serializableToBytesConverter = new SerializableToBytesConverter();
-
-  protected Object[] deserializedObjectData;
-
-  public FlushDeserializedObject(Object object, ScopeInstanceImpl scopeInstance, Variable variable) {
-    deserializedObjectData = new Object[] { object, scopeInstance, variable };
-  }
-
-  public void beforeCompletion() {
-    flushDeserializedObject();
-  }
-
-  public void afterCompletion(int arg0) {
-  }
-
-  public void flushDeserializedObject() {
-    Object deserializedObject = deserializedObjectData[0];
-    ScopeInstanceImpl scopeInstance = (ScopeInstanceImpl) deserializedObjectData[1];
-    BlobVariable blobVariable = (BlobVariable) deserializedObjectData[2];
-    
-    String variableName = blobVariable.getKey();
-    Object currentValue = scopeInstance.getVariable(variableName);
-
-    // first check if the deserialized object still is the value for that variable.
-    // a different, new object (of any type) might have been set in the meantime in that key-value-pair 
-    if ( (currentValue!=null)
-         && (currentValue==deserializedObject)
-       ) {
-      // next, we check if the serialized object was actually changed or not
-      byte[] newBytes = (byte[]) serializableToBytesConverter.convert(currentValue, null, null);
-      byte[] persistedBytes = blobVariable.getLob().extractBytes();
-      // if it is changed
-      if (!Arrays.equals(persistedBytes, newBytes)) {
-        // then do an automatic update
-        blobVariable.setValue(deserializedObject, scopeInstance);
-      }
-    }
-  }
-}

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaRetryInterceptor.java (from rev 5974, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaRetryInterceptor.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaRetryInterceptor.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaRetryInterceptor.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.tx;
+
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import org.jbpm.api.cmd.Command;
+import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.svc.RetryInterceptor;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class JtaRetryInterceptor extends RetryInterceptor {
+  
+  private static Log log = Log.getLog(JtaRetryInterceptor.class.getName());
+
+  public <T> T execute(Command<T> command) {
+    JtaTransaction jtaTransaction = EnvironmentImpl.getFromCurrent(JtaTransaction.class);
+    UserTransaction userTransaction = jtaTransaction.lookupJeeUserTransaction();
+    int status = JtaTransaction.getUserTransactionStatus(userTransaction);
+    if (status == Status.STATUS_NO_TRANSACTION) {
+      return executeWithRetry(command);
+    }
+    log.trace("transaction in progress.  skipping retry interceptor");
+    return executeWithoutRetry(command);
+  }
+  
+  public <T> T executeWithRetry(Command<T> command) {
+    return super.execute(command);
+  }
+
+  public <T> T executeWithoutRetry(Command<T> command) {
+    return next.execute(command);
+  }
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaRetryInterceptor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaStatusHelper.java (from rev 5974, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaStatusHelper.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaStatusHelper.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaStatusHelper.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.tx;
+
+import javax.transaction.Status;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public abstract class JtaStatusHelper {
+
+  public static String toString(int txStatus) {
+    if (txStatus==Status.STATUS_ACTIVE) {
+      return "STATUS_ACTIVE";
+    } else if (txStatus==Status.STATUS_COMMITTED) {
+      return "STATUS_COMMITTED";
+    } else if (txStatus==Status.STATUS_COMMITTING) {
+      return "STATUS_COMMITTING";
+    } else if (txStatus==Status.STATUS_MARKED_ROLLBACK) {
+      return "STATUS_MARKED_ROLLBACK";
+    } else if (txStatus==Status.STATUS_NO_TRANSACTION) {
+      return "STATUS_NO_TRANSACTION";
+    } else if (txStatus==Status.STATUS_PREPARED) {
+      return "STATUS_PREPARED";
+    } else if (txStatus==Status.STATUS_PREPARING) {
+      return "STATUS_PREPARING";
+    } else if (txStatus==Status.STATUS_ROLLEDBACK) {
+      return "STATUS_ROLLEDBACK";
+    } else if (txStatus==Status.STATUS_ROLLING_BACK) {
+      return "STATUS_ROLLING_BACK";
+    } else if (txStatus==Status.STATUS_UNKNOWN) {
+      return "STATUS_UNKNOWN";
+    } else {
+      return "unknown";
+    }
+  }
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaStatusHelper.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java (from rev 5974, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransaction.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -0,0 +1,152 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.tx;
+
+import javax.naming.InitialContext;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+
+import org.jbpm.api.JbpmException;
+import org.jbpm.internal.log.Log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class JtaTransaction extends AbstractTransaction implements Transaction {
+  
+  private static Log log = Log.getLog(JtaTransaction.class.getName());
+  
+  public static final String JNDINAME_USERTRANSACTION_JBOSS_GLOBAL = "UserTransaction";
+  public static final String JNDINAME_TRANSACTIONMANAGER_JBOSS_GLOBAL = "java:/TransactionManager";
+
+  protected String userTransactionJndiName = JNDINAME_USERTRANSACTION_JBOSS_GLOBAL;
+  protected String transactionManagerJndiName = JNDINAME_TRANSACTIONMANAGER_JBOSS_GLOBAL;
+
+  public boolean isRollbackOnly() {
+    try {
+      return lookupJeeUserTransaction().getStatus()==Status.STATUS_MARKED_ROLLBACK;
+    } catch (SystemException e) {
+      throw new JbpmException("couldn't get status of user transaction: "+e.getMessage(), e);
+    }
+  }
+
+  public void setRollbackOnly() {
+    try {
+      lookupJeeUserTransaction().setRollbackOnly();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't set user transaction to rollback only: "+e.getMessage(), e);
+    }
+  }
+
+  public void registerSynchronization(Synchronization synchronization) {
+    try {
+      lookupJeeTransaction().registerSynchronization(synchronization);
+    } catch (Exception e) {
+      throw new JbpmException("couldn't register synchronization: "+e.getMessage(), e);
+    }
+  }
+  
+  public void begin() {
+    try {
+      lookupJeeUserTransaction().begin();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't begin transaction: "+e.getMessage(), e);
+    }
+  }
+  
+  public void rollback() {
+    try {
+      lookupJeeUserTransaction().rollback();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't rollback: "+e.getMessage(), e);
+    }
+  }
+  
+  public void commit() {
+    try {
+      flushDeserializedObjects();
+
+      lookupJeeUserTransaction().commit();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't commit: "+e.getMessage(), e);
+    }
+  }
+  
+  public javax.transaction.Transaction suspend() {
+    try {
+      return lookupJeeTransactionManager().suspend();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't suspend: "+e.getMessage(), e);
+    }
+  }
+  
+  public void resume(javax.transaction.Transaction transaction) {
+    try {
+      lookupJeeTransactionManager().resume(transaction);
+    } catch (Exception e) {
+      throw new JbpmException("couldn't resume: "+e.getMessage(), e);
+    }
+  }
+  
+  // lookups //////////////////////////////////////////////////////////////////
+  
+  public UserTransaction lookupJeeUserTransaction() {
+    return (UserTransaction) lookupFromJndi(userTransactionJndiName);
+  }
+
+  public javax.transaction.Transaction lookupJeeTransaction() {
+    try {
+      TransactionManager transactionManager = lookupJeeTransactionManager();
+      return transactionManager.getTransaction();
+    } catch (Exception e) {
+      throw new JbpmException("couldn't get transaction from transaction manager "+transactionManagerJndiName+": "+e.getMessage(), e);
+    }
+  }
+
+  public TransactionManager lookupJeeTransactionManager() {
+    return (TransactionManager) lookupFromJndi(transactionManagerJndiName);
+  }
+  
+  public static Object lookupFromJndi(String jndiName) {
+    try {
+      InitialContext initialContext = new InitialContext();
+      return initialContext.lookup(jndiName);
+    } catch (Exception e) {
+      throw new JbpmException("couldn't lookup '"+jndiName+"' from jndi: "+e.getMessage()+": "+e.getMessage(), e);
+    }
+  }
+  
+  public static int getUserTransactionStatus(UserTransaction userTransaction) {
+    int status = -1;
+    try {
+      status = userTransaction.getStatus();
+    } catch (SystemException e) {
+      throw new JbpmException("couldn't get transaction status: "+e.getMessage(), e);
+    }
+    log.trace("jta transaction status: "+JtaStatusHelper.toString(status));
+    return status;
+  }
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java (from rev 5974, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/jta/JtaTransactionInterceptor.java)
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -0,0 +1,108 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.tx;
+
+import javax.transaction.Status;
+import javax.transaction.Transaction;
+import javax.transaction.UserTransaction;
+
+import org.jbpm.api.JbpmException;
+import org.jbpm.api.cmd.Command;
+import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.svc.Interceptor;
+import org.jbpm.pvm.internal.svc.Policy;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class JtaTransactionInterceptor extends Interceptor {
+  
+  private static Log log = Log.getLog(JtaTransactionInterceptor.class.getName());
+  
+  protected Policy policy = Policy.REQUIRES;
+
+  public <T> T execute(Command<T> command) {
+    JtaTransaction jtaTransaction = EnvironmentImpl.getFromCurrent(JtaTransaction.class);
+    
+    UserTransaction userTransaction = jtaTransaction.lookupJeeUserTransaction();
+
+    int status = JtaTransaction.getUserTransactionStatus(userTransaction);
+    
+    if ( (status == Status.STATUS_ACTIVE)
+         && (! (policy==Policy.REQUIRES_NEW))
+       ) {
+      return executeInExistingTx(command);
+    }
+    
+    if ( (status != Status.STATUS_NO_TRANSACTION) 
+         && (status != Status.STATUS_COMMITTED) 
+         && (status != Status.STATUS_ROLLEDBACK)
+         && (policy != Policy.REQUIRES_NEW)
+       ) {
+      throw new JbpmException("invalid transaction state: "+JtaStatusHelper.toString(status));
+    }
+
+    return executeInNewTx(command, jtaTransaction, status);
+  }
+
+  protected <T> T executeInExistingTx(Command<T> command) {
+    return next.execute(command);
+  }
+
+  protected <T> T executeInNewTx(Command<T> command, JtaTransaction jtaTransaction, int status) {
+    Transaction suspendedTransaction = null;
+    if ( (status == Status.STATUS_ACTIVE)
+         || (status == Status.STATUS_COMMITTED) 
+         || (status == Status.STATUS_ROLLEDBACK)
+       ) {
+      suspendedTransaction = jtaTransaction.suspend();
+    }
+    
+    T returnValue = null;
+    
+    try {
+      jtaTransaction.begin();
+      
+      returnValue = next.execute(command);
+
+      jtaTransaction.commit();
+
+    } catch (RuntimeException e) {
+      jtaTransaction.rollback();
+      throw e;
+      
+    } finally {
+      
+      if (suspendedTransaction!=null) {
+        jtaTransaction.resume(suspendedTransaction);
+      }
+    }
+    
+    return returnValue;
+  }
+
+  public void setPolicy(Policy policy) {
+    this.policy = policy;
+  }
+}


Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/converter/SerializableToBytesConverter.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -32,7 +32,6 @@
 import org.jbpm.pvm.internal.env.EnvironmentImpl;
 import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
 import org.jbpm.pvm.internal.tx.DeserializedObject;
-import org.jbpm.pvm.internal.tx.FlushDeserializedObject;
 import org.jbpm.pvm.internal.tx.Transaction;
 import org.jbpm.pvm.internal.type.Converter;
 import org.jbpm.pvm.internal.type.Variable;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JtaTransactionInterceptorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JtaTransactionInterceptorBinding.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JtaTransactionInterceptorBinding.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.wire.binding;
 
 import org.jbpm.pvm.internal.svc.Policy;
-import org.jbpm.pvm.internal.tx.jta.JtaTransactionInterceptor;
+import org.jbpm.pvm.internal.tx.JtaTransactionInterceptor;
 import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/RetryInterceptorBinding.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -22,7 +22,7 @@
 package org.jbpm.pvm.internal.wire.binding;
 
 import org.jbpm.pvm.internal.svc.RetryInterceptor;
-import org.jbpm.pvm.internal.tx.jta.JtaRetryInterceptor;
+import org.jbpm.pvm.internal.tx.JtaRetryInterceptor;
 import org.jbpm.pvm.internal.util.XmlUtil;
 import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/TransactionBinding.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -21,10 +21,10 @@
  */
 package org.jbpm.pvm.internal.wire.binding;
 
+import org.jbpm.pvm.internal.tx.JtaTransaction;
 import org.jbpm.pvm.internal.tx.SpringTransaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
 import org.jbpm.pvm.internal.tx.Transaction;
-import org.jbpm.pvm.internal.tx.jta.JtaTransaction;
 import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.internal.xml.Parse;
 import org.jbpm.pvm.internal.xml.Parser;

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java	2009-12-17 10:44:53 UTC (rev 5976)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java	2009-12-17 11:06:19 UTC (rev 5977)
@@ -28,8 +28,8 @@
 import org.jbpm.pvm.internal.env.EnvironmentImpl;
 import org.jbpm.pvm.internal.identity.impl.IdentitySessionResource;
 import org.jbpm.pvm.internal.identity.impl.JBossIdmIdentitySessionImpl;
+import org.jbpm.pvm.internal.tx.JtaTransaction;
 import org.jbpm.pvm.internal.tx.StandardTransaction;
-import org.jbpm.pvm.internal.tx.jta.JtaTransaction;
 import org.jbpm.pvm.internal.wire.WireContext;
 import org.jbpm.pvm.internal.wire.WireDefinition;
 



More information about the jbpm-commits mailing list