Author: gnodet
Date: Tue Apr 15 07:32:26 2008
New Revision: 648262
URL: http://svn.apache.org/viewvc?rev=648262&view=rev
Log:
Backport ODE-224, switch to 1.1.2-SNAPSHOT, and make sure the JBI component can
be deployed ont o ServiceMix 3.2.1 and ServiceMix 4
Modified:
ode/branches/APACHE_ODE_1.1/Rakefile
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
Modified: ode/branches/APACHE_ODE_1.1/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/Rakefile?rev=648262&r1=648261&r2=648262&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.1/Rakefile Tue Apr 15 07:32:26 2008
@@ -24,8 +24,8 @@
require "buildr/hibernate"
# Keep this structure to allow the build system to update version numbers.
-VERSION_NUMBER = "1.1.1-SNAPSHOT"
-NEXT_VERSION = "1.1.2"
+VERSION_NUMBER = "1.1.2-SNAPSHOT"
+NEXT_VERSION = "1.1.3"
ANNONGEN = "annogen:annogen:jar:0.1.0"
ANT = "ant:ant:jar:1.6.5"
@@ -53,9 +53,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.5.ga",
"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" ]
@@ -70,7 +70,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"
@@ -418,12 +418,12 @@
"scheduler-simple", "bpel-schemas", "bpel-store", "dao-hibernate",
"dao-jpa",
"jacob", "jacob-ap", "utils"),
ANT, AXIOM, BACKPORT, COMMONS.codec, COMMONS.collections,
COMMONS.dbcp, COMMONS.lang, COMMONS.pool,
- COMMONS.primitives, JAXEN, JAVAX.connector, JAVAX.ejb, JAVAX.jms,
- JAVAX.persistence, JAVAX.stream, JAVAX.transaction, LOG4J, OPENJPA,
SAXON, TRANQL,
- XALAN, XMLBEANS, XSTREAM, WSDL4J)
+ COMMONS.primitives, DERBY, GERONIMO.connector, GERONIMO.transaction,
JAXEN, JAVAX.connector,
+ JAVAX.ejb, JAVAX.jms, JAVAX.persistence, JAVAX.stream,
JAVAX.transaction, LOG4J, OPENJPA,
+ SAXON, TRANQL, XALAN, XERCES, XMLBEANS, XSTREAM, WSDL4J)
jbi.component :type=>:service_engine, :name=>"OdeBpelEngine",
:description=>self.comment
- jbi.component :class_name=>"org.apache.ode.jbi.OdeComponent",
:delegation=>:self, :libs=>libs
+ jbi.component :class_name=>"org.apache.ode.jbi.OdeComponent", :libs=>libs
jbi.bootstrap :class_name=>"org.apache.ode.jbi.OdeBootstrap", :libs=>libs
jbi.merge project("dao-hibernate-db").package(:zip)
jbi.merge project("dao-jpa-ojpa-derby").package(:zip)
Modified:
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java?rev=648262&r1=648261&r2=648262&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
(original)
+++
ode/branches/APACHE_ODE_1.1/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
Tue Apr 15 07:32:26 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,8 +175,12 @@
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(),
@@ -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());
