diff --git a/assemblies/features/enterprise/src/main/resources/features.xml b/assemblies/features/enterprise/src/main/resources/features.xml
index b014bd2..035cb66 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -21,6 +21,7 @@
 <features name="karaf-enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
 
     <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
+    <repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features</repository>
 
     <feature name="transaction" description="OSGi Transaction Manager" version="1.0.0" resolver="(obr)">
         <details>JTA implementation provided by Apache Aries Transaction 1.0.0</details>
@@ -222,9 +223,10 @@
 
     <feature name="jdbc" description="JDBC service and commands" version="${project.version}" resolver="(obr)">
         <details>JDBC support providing service, commands, and MBean</details>
-        <feature>transaction</feature>
-        <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
-        <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+        <feature>connector</feature>
+        <feature>pax-jdbc</feature>
+        <bundle>mvn:org.apache.xbean/xbean-blueprint/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.jdbc/${aries.transaction.jdbc.version}</bundle>
         <bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.core/${project.version}</bundle>
         <bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.command/${project.version}</bundle>
     </feature>
@@ -233,6 +235,9 @@
         <details>JMS support provinding service, commands, and MBean.</details>
         <feature>transaction</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+        <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-blueprint/${xbean.version}</bundle>
+        <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.jms/${aries.transaction.jms.version}</bundle>
         <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.core/${project.version}</bundle>
         <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.command/${project.version}</bundle>
     </feature>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml
index 6ae8ea8..5ce9e71 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-db2.xml
@@ -15,7 +15,9 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="com.ibm.db2.jcc.DB2DataSource">
         <property name="url" value="${url}"/>
@@ -23,10 +25,12 @@
         <property name="password" value="${password}"/>
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
 
-</blueprint>
\ No newline at end of file
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml
index 13e3e7f..75f5d2f 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-derby.xml
@@ -16,23 +16,19 @@
         License.
     -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           default-activation="eager">
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="org.apache.derby.jdbc.EmbeddedXADataSource">
         <property name="databaseName" value="${name}"/>
-        <property name="createDatabase" value="create" />
+        <property name="createDatabase" value="create"/>
     </bean>
 
-    <service ref="dataSource" interface="javax.sql.DataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
-        </service-properties>
-    </service>
-
-    <service ref="dataSource" interface="javax.sql.XADataSource">
-        <service-properties>
-            <entry key="osgi.jndi.service.name" value="jdbc/${name}xa"/>
         </service-properties>
     </service>
 
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
index 286d82c..07e475c 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml
@@ -8,129 +8,30 @@
         2.0 (the "License"); you may not use this file except in compliance
         with the License. You may obtain a copy of the License at
 
-        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-        applicable law or agreed to in writing, software distributed under the
-        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-        CONDITIONS OF ANY KIND, either express or implied. See the License for
-        the specific language governing permissions and limitations under the
-        License.
-    -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, either express or implied. See the License for
+    the specific language governing permissions and limitations under the
+    License.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
-    <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource">
-        <property name="driverClassName" value="${driver}"/>
-        <property name="url" value="${url}"/>
-        <property name="user" value="${user}"/>
-        <property name="password" value="${password}"/>
-        <property name="maxIdle" value="1"/>
+    <reference id="dataSourceFactory" interface="org.osgi.service.jdbc.DataSourceFactory" filter="(osgi.jdbc.driver.class=${driver})"/>
+
+    <bean id="dataSource" factory-ref="dataSourceFactory" factory-method="createDataSource">
+        <argument>
+            <props>
+                <prop key="url" value="${url}"/>
+                <prop key="username" value="${user}"/>
+                <prop key="password" value="${password}"/>
+            </props>
+        </argument>
     </bean>
 
-    <bean id="connectionFactory" class="org.apache.commons.dbcp.DataSourceConnectionFactory">
-        <argument ref="dataSource" />
-    </bean>
-
-    <bean id="connectionPool" class="org.apache.commons.pool.impl.GenericObjectPool" >
-        <!-- No default factory -->
-        <argument><null/></argument> <!-- factory -->
-        <!--
-            controls the maximum number of objects that can be allocated by the pool (checked out to clients, or
-            idle awaiting checkout) at a given time. When non-positive, there is no limit to the number of objects that can
-            be managed by the pool at one time. When maxActive is reached, the pool is said to be exhausted.
-            The default setting for this parameter is 8.
-         -->
-        <argument value="8" /> <!-- maxActive -->
-        <!--
-            specifies the behavior of the borrowObject() method when the pool is exhausted:
-
-            When whenExhaustedAction is WHEN_EXHAUSTED_FAIL, borrowObject() will throw a NoSuchElementException
-            When whenExhaustedAction is WHEN_EXHAUSTED_GROW, borrowObject() will create a new object and return it
-            (essentially making maxActive meaningless.)
-            When whenExhaustedAction is WHEN_EXHAUSTED_BLOCK, borrowObject() will block (invoke Object.wait()) until
-            a new or idle object is available. If a positive maxWait value is supplied, then borrowObject() will block for at most that many milliseconds, after which a NoSuchElementException will be thrown. If maxWait is non-positive, the borrowObject() method will block indefinitely.
-
-            The default whenExhaustedAction setting is WHEN_EXHAUSTED_BLOCK and the default maxWait setting is -1.
-            By default, therefore, borrowObject will block indefinitely until an idle instance becomes available.
-        -->
-        <argument value="WHEN_EXHAUSTED_BLOCK" /> <!-- whenExhaustedAction -->
-        <!--
-            the maximum amount of time to wait for an idle object when the pool is exhausted and whenExhaustedAction
-            is WHEN_EXHAUSTED_BLOCK (otherwise ignored)
-        -->
-        <argument value="-1" /> <!-- maxWait -->
-        <!--
-            controls the maximum number of objects that can sit idle in the pool at any time.
-            When negative, there is no limit to the number of objects that may be idle at one time.
-            The default setting for this parameter is 8.
-        -->
-        <argument value="8" /> <!-- maxIdle -->
-        <!--
-           sets the minimum number of objects allowed in the pool before the evictor thread (if active) spawns
-           new objects.
-        -->
-        <argument value="0" /> <!-- minIdle -->
-        <!--
-            when true, objects will be validated before being returned by the borrowObject() method.
-        -->
-        <argument value="false" /> <!-- testOnBorrow -->
-        <!--
-            when true, objects will be validated before being returned to the pool within the returnObject(T).
-        -->
-        <argument value="false" /> <!-- testOnReturn -->
-        <!--
-            sets the number of milliseconds to sleep between runs of the idle object evictor thread.
-        -->
-        <argument value="-1" /> <!-- timeBetweenEvictionRunsMillis -->
-        <!--
-            the number of idle objects to examine per run within the idle object eviction thread (if any)
-        -->
-        <argument value="3" /> <!-- numTestsPerEvictionRun -->
-        <!--
-            sets the minimum amount of time an object may sit idle in the pool before it is eligible for eviction by
-            the idle object evictor (if any). When non-positive, no objects will be evicted from the pool due to idle
-            time alone.
-        -->
-        <argument value="1800000" /> <!-- minEvictableIdleTimeMillis -->
-        <!--
-            when true, objects will be validated by the idle object evictor (if any). If an object fails to validate,
-            it will be dropped from the pool.
-        -->
-        <argument value="false" /> <!-- testWhileIdle -->
-        <!--
-            softMinEvictableIdleTimeMillis specifies the minimum amount of time an object may sit idle in the pool before
-            it is eligible for eviction by the idle object evictor (if any), with the extra condition that at least "minIdle"
-            object instances remain in the pool. When non-positive, no objects will be evicted from the pool due to idle time alone.
-            This setting has no effect unless timeBetweenEvictionRunsMillis > 0. and it is superceded by
-            minEvictableIdleTimeMillis (that is, if minEvictableIdleTimeMillis is positive, then
-            softMinEvictableIdleTimeMillis is ignored). The default setting for this parameter is -1 (disabled).
-        -->
-        <argument value="-1" /> <!-- softMinEvictableIdleTimeMillis -->
-        <!--
-            lifo determines whether or not the pool returns idle objects in last-in-first-out order. The default setting for this parameter is true.
-        -->
-        <argument value="true" /> <!-- lifo -->
-    </bean>
-
-    <bean id="pooledConnectionFactory" class="org.apache.commons.dbcp.PoolableConnectionFactory" >
-        <argument ref="connectionFactory" />
-        <argument ref="connectionPool" />
-        <argument><null/></argument>
-        <!--
-            a query to use to validate Connections. Should return at least one row. Using null turns off validation.
-        -->
-        <argument><null/></argument> <!-- validationQuery -->
-        <!--
-            the default "read only" setting for borrowed connections
-        -->
-        <argument value="false" /> <!-- defaultReadOnly -->
-        <!--
-            the default "auto commit" setting for returned connections
-        -->
-        <argument value="true" /> <!-- defaultAutoCommit -->
-    </bean>
-
-    <bean id="pooledDataSource" class="org.apache.commons.dbcp.PoolingDataSource" depends-on="pooledConnectionFactory">
-        <argument ref="connectionPool" />
-    </bean>
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
 
     <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
@@ -138,4 +39,4 @@
         </service-properties>
     </service>
 
-</blueprint>
\ No newline at end of file
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml
index ff93e32..0c5444e 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-h2.xml
@@ -15,7 +15,9 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="org.h2.jdbcx.JdbcDataSource">
         <property name="URL" value="${url}"/>
@@ -23,9 +25,12 @@
         <property name="password" value="${password}"/>
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
index e869eb7..cf2811e 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
@@ -15,7 +15,9 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="org.hsqldb.jdbc.JDBCDataSource">
         <property name="url" value="${url}"/>
@@ -23,9 +25,12 @@
         <property name="password" value="${password}"/>
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mssql.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mssql.xml
index c62285d..eebb315 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mssql.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mssql.xml
@@ -15,7 +15,9 @@
     the specific language governing permissions and limitations under the
     License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="net.sourceforge.jtds.jdbcx.JtdsDataSource">
         <property name="serverName" value="${url}"/>
@@ -24,9 +26,12 @@
         <property name="password" value="${password}"/>
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
index 75fed3a..caa04d9 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
@@ -15,7 +15,9 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
         <property name="url" value="${url}"/>
@@ -23,9 +25,12 @@
         <property name="password" value="${password}"/>
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml
index d9e8853..7bf48c5 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-oracle.xml
@@ -15,7 +15,9 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
     <bean id="dataSource" class="oracle.jdbc.pool.OracleDataSource">
         <property name="URL" value="${url}"/>
@@ -23,9 +25,12 @@
         <property name="password" value="${password}"/>
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+
+</blueprint>
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml
index c9d2bcb..147cb9d 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-postgres.xml
@@ -15,20 +15,23 @@
         the specific language governing permissions and limitations under the
         License.
     -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:jdbc="http://aries.apache.org/xmlns/transaction-jdbc/2.1">
 
-    <bean id="dataSource" class="org.postgresql.ds.PGPoolingDataSource" destroy-method="close">
+    <bean id="dataSource" class="org.postgresql.ds.PGSimpleDataSource" destroy-method="close">
         <property name="serverName" value="${url}"/>
         <property name="user" value="${user}"/>
         <property name="password" value="${password}"/>
         <property name="dataSourceName" value="${name}"/>
-        <property name="initialConnections" value="2"/>
-        <property name="maxConnections" value="4" />
     </bean>
 
-    <service interface="javax.sql.DataSource" ref="dataSource">
+    <jdbc:recoverableDataSource bp:id="pooledDataSource" dataSource="#dataSource" username="${user}" password="${password}"/>
+
+    <service ref="pooledDataSource" interface="javax.sql.DataSource">
         <service-properties>
             <entry key="osgi.jndi.service.name" value="jdbc/${name}"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+
+</blueprint>
diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
index 53d73cc..beed5e7 100644
--- a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
+++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-activemq.xml
@@ -21,18 +21,10 @@
         <property name="brokerURL" value="${url}" />
     </bean>
 
-    <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
+    <bean id="pooledConnectionFactory" class="org.apache.aries.transaction.jms.PooledConnectionFactory" init-method="start" destroy-method="stop">
         <property name="maxConnections" value="8" />
         <property name="connectionFactory" ref="activemqConnectionFactory" />
     </bean>
-
-    <bean id="resourceManager" class="org.apache.activemq.pool.ActiveMQResourceManager" init-method="recoverResource">
-        <property name="transactionManager" ref="transactionManager" />
-        <property name="connectionFactory" ref="activemqConnectionFactory" />
-        <property name="resourceName" value="activemq.localhost" />
-    </bean>
-
-    <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
 
     <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
         <service-properties>
diff --git a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml
index 347a7c6..7571cc9 100644
--- a/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml
+++ b/jms/core/src/main/resources/org/apache/karaf/jms/internal/connectionfactory-webspheremq.xml
@@ -23,10 +23,15 @@
         <property name="port" value="${port}" />
         <property name="queueManager" value="${queuemanager}" />
         <property name="channel" value="${channel}" />
-        <property name="useConnectionPooling" value="true" />
+        <property name="useConnectionPooling" value="false" />
     </bean>
 
-    <service ref="wmqConnectionFactory" interface="javax.jms.ConnectionFactory">
+    <bean id="pooledConnectionFactory" class="org.apache.aries.transaction.jms.PooledConnectionFactory" init-method="start" destroy-method="stop">
+        <property name="maxConnections" value="8" />
+        <property name="connectionFactory" ref="wmqConnectionFactory" />
+    </bean>
+
+    <service ref="pooledConnectionFactory" interface="javax.jms.ConnectionFactory">
         <service-properties>
             <entry key="name" value="${name}"/>
             <entry key="osgi.jndi.service.name" value="jms/${name}"/>
diff --git a/pom.xml b/pom.xml
index 35f50ac..0d03159 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,8 @@
         <aries.proxy.version>1.0.2</aries.proxy.version>
         <aries.proxy.api.version>1.0.0</aries.proxy.api.version>
         <aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version>
-        <aries.transaction.jdbc.version>1.0.0</aries.transaction.jdbc.version>
+        <aries.transaction.jdbc.version>2.1.0</aries.transaction.jdbc.version>
+        <aries.transaction.jms.version>2.0.0</aries.transaction.jms.version>
         <aries.util.version>1.1.0</aries.util.version>
         <jansi.version>1.11</jansi.version>
         <jline.version>2.12</jline.version>
@@ -199,6 +200,7 @@
         <pax.base.version>1.4.0</pax.base.version>
         <pax.cdi.version>0.8.0</pax.cdi.version>
         <pax.exam.version>2.6.0</pax.exam.version>
+        <pax.jdbc.version>0.4.0-SNAPSHOT</pax.jdbc.version>
         <pax.logging.version>1.7.4</pax.logging.version>
         <pax.runner.version>1.7.6</pax.runner.version>
         <pax.url.version>1.3.7</pax.url.version>
@@ -234,6 +236,17 @@
     </properties>
 
     <repositories>
+        <repository>
+            <id>spring</id>
+            <name>Spring Repository</name>
+            <url>http://repository.springsource.com/maven/bundles/release</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
         <!-- ServiceMix repo -->
         <repository>
             <id>servicemix</id>