You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2008/01/11 21:33:32 UTC
svn commit: r611294 - in /ode/trunk: Rakefile
il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
Author: vanto
Date: Fri Jan 11 12:33:25 2008
New Revision: 611294
URL: http://svn.apache.org/viewvc?rev=611294&view=rev
Log:
issue ODE-224: Upgrade Geronimo libs to 2.0.1
http://issues.apache.org/jira/browse/ODE-224
Modified:
ode/trunk/Rakefile
ode/trunk/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
Modified: ode/trunk/Rakefile
URL: http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=611294&r1=611293&r2=611294&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Fri Jan 11 12:33:25 2008
@@ -54,9 +54,9 @@
DERBY_TOOLS = "org.apache.derby:derbytools:jar:10.1.2.1"
DOM4J = "dom4j:dom4j:jar:1.6.1"
GERONIMO = struct(
- :kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:1.2-beta",
- :transaction =>"org.apache.geronimo.modules:geronimo-transaction:jar:1.2-beta",
- :connector =>"org.apache.geronimo.modules:geronimo-connector:jar:1.2-beta"
+ :kernel =>"org.apache.geronimo.modules:geronimo-kernel:jar:2.0.1",
+ :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1",
+ :connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1"
)
HIBERNATE = [ "org.hibernate:hibernate:jar:3.2.4.sp1", "asm:asm:jar:1.5.3",
"antlr:antlr:jar:2.7.6", "cglib:cglib:jar:2.1_3", "net.sf.ehcache:ehcache:jar:1.2.3" ]
@@ -71,7 +71,7 @@
:persistence =>"javax.persistence:persistence-api:jar:1.0",
:servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0",
:stream =>"stax:stax-api:jar:1.0.1",
- :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.0",
+ :transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1",
:resource =>"org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar:1.0"
)
JAXEN = "jaxen:jaxen:jar:1.1-beta-8"
Modified: ode/trunk/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java
URL: http://svn.apache.org/viewvc/ode/trunk/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java?rev=611294&r1=611293&r2=611294&view=diff
==============================================================================
--- ode/trunk/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java (original)
+++ ode/trunk/il-common/src/main/java/org/apache/ode/il/dbutil/Database.java Fri Jan 11 12:33:25 2008
@@ -34,6 +34,9 @@
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC;
import org.apache.ode.il.config.OdeConfigProperties;
import org.apache.ode.utils.LoggingDataSourceWrapper;
@@ -172,9 +175,13 @@
private void initInternalDb(String url, String driverClass, String username,String password) throws DatabaseConfigException {
__log.debug("Creating connection pool for " + url + " with driver " + driverClass);
-
+ if (!(_txm instanceof RecoverableTransactionManager)) {
+ throw new RuntimeException("TransactionManager is not recoverable.");
+ }
+
TransactionSupport transactionSupport = LocalTransactions.INSTANCE;
-
+ ConnectionTracker connectionTracker = new ConnectionTrackingCoordinator();
+
PoolingSupport poolingSupport = new SinglePool(
_odeConfig.getPoolMaxSize(),
_odeConfig.getPoolMinSize(),
@@ -187,9 +194,9 @@
_connectionManager = new GenericConnectionManager(
transactionSupport,
poolingSupport,
- false, // no container-managed security
- null, // no connection tracker
- _txm,
+ null,
+ connectionTracker,
+ (RecoverableTransactionManager)_txm,
getClass().getName(),
getClass().getClassLoader());