You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/11/30 20:45:40 UTC
svn commit: r599928 - in /ode/branches/APACHE_ODE_1.1: Rakefile
dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
Author: mriou
Date: Fri Nov 30 11:45:38 2007
New Revision: 599928
URL: http://svn.apache.org/viewvc?rev=599928&view=rev
Log:
OpenJPA upgrade to 1.0.1.
Modified:
ode/branches/APACHE_ODE_1.1/Rakefile
ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
Modified: ode/branches/APACHE_ODE_1.1/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/Rakefile?rev=599928&r1=599927&r2=599928&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.1/Rakefile Fri Nov 30 11:45:38 2007
@@ -76,8 +76,8 @@
JENCKS = "org.jencks:jencks:jar:all:1.3"
JIBX = "jibx:jibx-run:jar:1.1-beta3"
LOG4J = "log4j:log4j:jar:1.2.13"
-OPENJPA = ["org.apache.openjpa:openjpa-all:jar:#{Buildr::OpenJPA::VERSION}",
- "net.sourceforge.serp:serp:jar:1.12.0"]
+OPENJPA = ["org.apache.openjpa:openjpa:jar:1.0.1",
+ "net.sourceforge.serp:serp:jar:1.13.1"]
SAXON = group("saxon", "saxon-xpath", "saxon-dom", :under=>"net.sf.saxon", :version=>"8.7")
SERVICEMIX = group("servicemix-core", "servicemix-shared", "servicemix-services",
:under=>"org.apache.servicemix", :version=>"3.1-incubating")
Modified: ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java?rev=599928&r1=599927&r2=599928&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java (original)
+++ ode/branches/APACHE_ODE_1.1/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java Fri Nov 30 11:45:38 2007
@@ -137,7 +137,6 @@
private class TxMgrProvider implements ManagedRuntime {
public TxMgrProvider() {
}
-
public TransactionManager getTransactionManager() throws Exception {
return _tm;
}
@@ -149,88 +148,9 @@
// there is no generic support for setting the rollback cause
return null;
}
- }
-
- private class DebugTxMgr implements TransactionManager {
- private TransactionManager _tm;
-
- public DebugTxMgr(TransactionManager tm) {
- _tm = tm;
- }
-
- public void begin() throws NotSupportedException, SystemException {
- _tm.begin();
- }
-
- public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException {
- _tm.commit();
- }
-
- public int getStatus() throws SystemException {
- return _tm.getStatus();
- }
-
- public Transaction getTransaction() throws SystemException {
- Transaction tx = _tm.getTransaction();
- __log.debug("JPA get transaction" + tx);
- return new DebugTx(tx);
- }
-
- public void resume(Transaction transaction) throws IllegalStateException, InvalidTransactionException, SystemException {
- _tm.resume(transaction);
- }
-
- public void rollback() throws IllegalStateException, SecurityException, SystemException {
- _tm.rollback();
- }
-
- public void setRollbackOnly() throws IllegalStateException, SystemException {
- _tm.setRollbackOnly();
- }
-
- public void setTransactionTimeout(int i) throws SystemException {
- _tm.setTransactionTimeout(i);
- }
-
- public Transaction suspend() throws SystemException {
- return _tm.suspend();
+ public Object getTransactionKey() throws Exception, SystemException {
+ return _tm.getTransaction();
}
}
- private class DebugTx implements Transaction {
- private Transaction _tx;
-
- public DebugTx(Transaction tx) {
- _tx = tx;
- }
-
- public void commit() throws HeuristicMixedException, HeuristicRollbackException, RollbackException, SecurityException, SystemException {
- _tx.commit();
- }
-
- public boolean delistResource(XAResource xaResource, int i) throws IllegalStateException, SystemException {
- return _tx.delistResource(xaResource, i);
- }
-
- public boolean enlistResource(XAResource xaResource) throws IllegalStateException, RollbackException, SystemException {
- return _tx.enlistResource(xaResource);
- }
-
- public int getStatus() throws SystemException {
- return _tx.getStatus();
- }
-
- public void registerSynchronization(Synchronization synchronization) throws IllegalStateException, RollbackException, SystemException {
- __log.debug("Synchronization registration on " + synchronization.getClass().getName());
- _tx.registerSynchronization(synchronization);
- }
-
- public void rollback() throws IllegalStateException, SystemException {
- _tx.rollback();
- }
-
- public void setRollbackOnly() throws IllegalStateException, SystemException {
- _tx.setRollbackOnly();
- }
- }
}