From d8660c0437544d2656188934fe724d486651980a Mon Sep 17 00:00:00 2001
From: pgf <pat.g.fox@gmail.com>
Date: Sun, 13 Jul 2014 11:44:04 +0200
Subject: [PATCH 1/4] added username and password to resourceManager-AMQ

---
 routing/src/main/resources/META-INF/spring/routing.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routing/src/main/resources/META-INF/spring/routing.xml b/routing/src/main/resources/META-INF/spring/routing.xml
index d6ed3f9..812b5fd 100644
--- a/routing/src/main/resources/META-INF/spring/routing.xml
+++ b/routing/src/main/resources/META-INF/spring/routing.xml
@@ -88,6 +88,8 @@
     <property name="transactionManager" ref="recoverableTxManager" />
     <!-- CF must be of type ActiveMQConnectionFactory, otherwise no recovery will occur -->
     <property name="connectionFactory" ref="AmqXaCF" />
+    <property name="userName" value="admin" />
+    <property name="password" value="admin" />
     <property name="resourceName" value="activemq.default" />
   </bean>
 

From 1baa3b3effb32111570f7dbbfb28216d16ded3b3 Mon Sep 17 00:00:00 2001
From: pgf <pat.g.fox@gmail.com>
Date: Mon, 14 Jul 2014 15:15:41 +0200
Subject: [PATCH 2/4] changing jdbc datasource from derby to mysql

---
 datasource/README.md                          |  25 ++-
 datasource/pom.xml                            |  52 ++++--
 .../aries/demo/GenericResourceManager.java    |  37 -----
 .../OSGI-INF/blueprint/datasource.xml         | 153 ++++++------------
 features/src/main/resources/features.xml      |  18 +--
 5 files changed, 99 insertions(+), 186 deletions(-)
 delete mode 100644 datasource/src/main/java/org/apache/aries/demo/GenericResourceManager.java

diff --git a/datasource/README.md b/datasource/README.md
index 861ecd2..762ac0f 100644
--- a/datasource/README.md
+++ b/datasource/README.md
@@ -7,21 +7,16 @@ relational database.
 We are using Blueprint to define the data source bean and publish it into the OSGi Service Registry.  Have a look at
 `src/main/resources/OSGI-INF/blueprint/datasource.xml` for more details about how this done.
 
-Due to bug http://fusesource.com/issues/browse/ENTESB-633 it is not possible to
-have the configured JDBC DataSource getting auto-enlisted into Aries.
-Instead a workaround solution is presented in src/main/resources/OSGI-INF/blueprint/datasource.xml
 
 
 ## Checking the OSGi Service Registry
 After the bundle is started, we can use the Fuse ESB Enterprise console to look at the registered objects in the registry.
 
-First, find the bundle id for the bundle called "Fuse By Example :: Transactions :: Datasource" by using the `osgi:list` command.
+First, find the bundle id for the bundle called " ESB :: Demo :: Camel-JMS-JDBC-XA-TX :: DataSource" by using the `osgi:list` command.
 You can use `grep` to filter the list of bundles and quickly find the right one.
 
     FuseESB:karaf@root> osgi:list | grep Transactions
-    [ 268] [Active     ] [Created     ] [       ] [   60] Fuse By Example :: Transactions :: Datasource (1.0.0.SNAPSHOT)
-    [ 269] [Active     ] [            ] [       ] [   60] Fuse By Example :: Transactions :: Database (1.0.0.SNAPSHOT)
-    [ 270] [Active     ] [            ] [Started] [   60] Fuse By Example :: Transactions :: Routing (1.0.0.SNAPSHOT)
+  [ 275] [Active     ] [Created     ] [       ] [   60] Fuse By Example :: Transactions :: Datasource (1.0.0.SNAPSHOT)
 
 In this example, the bundle id is 268.  Using the `osgi:ls` command, we can see that this bundle is publishing 3 services:
 
@@ -33,23 +28,23 @@ This is what the `osgi:ls` output looks like
 
     FuseESB:karaf@root> osgi:ls 268
 
-    Fuse By Example :: Transactions :: Datasource (268) provides:
+    Camel :: Demo :: Camel-JMS-JDBC-XA-TX :: DataSource (268) provides:
     -------------------------------------------------------------
-    datasource.name = Derby
+    datasource.name = MySQL
     objectClass = javax.sql.XADataSource
     osgi.jndi.service.name = jdbc/transactions
-    osgi.service.blueprint.compname = derby-cf
+    osgi.service.blueprint.compname = mysql-cf
     service.id = 414
     ----
     aries.xa.aware = true
-    datasource.name = Derby
+    datasource.name = MySQL
     objectClass = javax.sql.DataSource
     osgi.jndi.service.name = jdbc/transactions
-    osgi.service.blueprint.compname = derby-cf
+    osgi.service.blueprint.compname = mysql-cf
     service.id = 415
     service.ranking = 1000
     ----
     objectClass = org.osgi.service.blueprint.container.BlueprintContainer
-    osgi.blueprint.container.symbolicname = org.fusesource.example.transactions.datasource
-    osgi.blueprint.container.version = 1.0.0.SNAPSHOT
-    service.id = 416
\ No newline at end of file
+    osgi.blueprint.container.symbolicname = org.apache.servicemix.demo.camel-jms-jdbc-xa-tx.datasource
+    osgi.blueprint.container.version = 1.0.0
+    service.id = 416
diff --git a/datasource/pom.xml b/datasource/pom.xml
index 2a81516..2a038f0 100644
--- a/datasource/pom.xml
+++ b/datasource/pom.xml
@@ -18,36 +18,54 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <parent>
-    <artifactId>transactions</artifactId>
-    <groupId>org.fusesource.example</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.fusesource.example.transactions</groupId>
-  <artifactId>datasource</artifactId>
-  <packaging>bundle</packaging>
-  <name>Fuse By Example :: Transactions :: Datasource</name>
+    <parent>
+        <artifactId>transactions</artifactId>
+        <groupId>org.fusesource.example</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.fusesource.example.transactions</groupId>
+    <artifactId>datasource</artifactId>
+    <packaging>bundle</packaging>
+    <name>Fuse By Example :: Transactions :: Datasource</name>
 
-  <dependencies>
 
 
-   <dependency>
+    <dependencies>
+    <dependency>
       <groupId>org.apache.geronimo.components</groupId>
       <artifactId>geronimo-connector</artifactId>
-      <version>3.1.1</version>
-   </dependency>
+      <version>3.0</version>
+    </dependency>
 
-   <dependency>
+    <!--  needed for overriding tranql-connector-mysql XAMCF class
+    <dependency>
+      <groupId>org.tranql</groupId>
+      <artifactId>tranql-connector</artifactId>
+      <version>1.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.tranql</groupId>
+      <artifactId>tranql-connector-mysql-common</artifactId>
+      <version>1.6</version>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.17</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>1.6.6</version>
-   </dependency>
-
+    </dependency>
+    -->
+    <!-- end -->
   </dependencies>
 
+
   <build>
     <plugins>
       <plugin>
diff --git a/datasource/src/main/java/org/apache/aries/demo/GenericResourceManager.java b/datasource/src/main/java/org/apache/aries/demo/GenericResourceManager.java
deleted file mode 100644
index 87334f6..0000000
--- a/datasource/src/main/java/org/apache/aries/demo/GenericResourceManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.aries.demo;
-
-import javax.resource.spi.ManagedConnectionFactory;
-import org.apache.geronimo.connector.outbound.ConnectionManagerContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Generic resource manager wrapper.
- * Only needed for working around
- * http://fusesource.com/issues/browse/ENTESB-633.
- * Simply delegates the call to doRecovery() to the configured
- * Geronimo ConnectionManagerContainer.
- */
-public class GenericResourceManager {
-   
-    Logger logger = LoggerFactory.getLogger(GenericResourceManager.class.getName());
- 
-    private ConnectionManagerContainer connectionManagerContainer;
-    private ManagedConnectionFactory managedConnectionFactory;
-
-    public synchronized void setConnectionManagerContainer(
-	    ConnectionManagerContainer connectionManagerContainer) {
-	this.connectionManagerContainer = connectionManagerContainer;
-    }
-
-    public synchronized void setManagedConnectionFactory(
-	    ManagedConnectionFactory managedConnectionFactory) {
-	this.managedConnectionFactory = managedConnectionFactory;
-    }
-
-
-    public void doRecovery() {
-	logger.info("Recovering XA resource " + managedConnectionFactory);
-	connectionManagerContainer.doRecovery();
-    }
-}
diff --git a/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml b/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
index 8718206..8e3ffeb 100644
--- a/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
+++ b/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
@@ -1,99 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) Red Hat, Inc.
-
-  Red Hat licenses this file to you under the Apache License, version
-  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.
+~ Copyright 2011 FuseSource
+~
+~ Licensed under the Apache License, Version 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">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
 
-  <!-- ********************************************************************* -->
-  <!-- Workaround for bug http://fusesource.com/issues/browse/ENTESB-633
-       This configuration will also enlist a JDBC XA DataSource into Aries tx
-       manager. Once ENTESB-633 is fixed this config should not be needed 
-       anymore. Instead part 2 of the configuration would apply.
-  -->
-  <reference id="transactionManager" interface="org.apache.geronimo.transaction.manager.RecoverableTransactionManager" />
-
-  <!-- Sets up a Geronimo JCA connection manager which also supports pooling --> 
-  <bean id="connectionManager" class="org.apache.geronimo.connector.outbound.GenericConnectionManager">
-    <argument index="0">
-      <bean class="org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions">
-	<argument value="true" />
-	<argument value="false" />
-      </bean>
-    </argument>
-    <argument index="1">
-      <!-- http://geronimo.apache.org/maven/server/modules/geronimo-connector/apidocs/org/apache/geronimo/connector/outbound/connectionmanagerconfig/PartitionedPool.html -->
-      <bean class="org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool">
-	<argument value="10" />
-	<argument value="0" />
-	<argument value="5000" />
-	<argument value="15" />
-	<argument value="true" />
-	<argument value="false" />
-	<argument value="false" />
-	<argument value="true" />
-	<argument value="false" />
-      </bean>
-    </argument>
-    <argument index="2"><null /></argument>
-    <argument index="3"><null /></argument>
-    <argument index="4" ref="transactionManager" />
-    <argument index="5" ref="jdbcManagedConnectionFactory" />
-    <argument index="6" value="Derby-DS" />
-    <argument index="7" ref="classLoader" />
-  </bean>
-  
-  <bean id="classLoader" class="org.apache.aries.util.AriesFrameworkUtil" factory-method="getClassLoader">
-    <argument ref="blueprintBundle" />
-  </bean>
-  <service ref="classLoader" auto-export="all-classes" />
+  <reference id="platformTxManager" interface="org.springframework.transaction.PlatformTransactionManager" availability="mandatory"/>
+  <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
+  <reference id="recoverableTxManager" interface="org.apache.geronimo.transaction.manager.RecoverableTransactionManager" availability="mandatory" />
 
-  <!-- Tranql provides the ManagedConnectionFactory but delegates all the work to the JDBC drivers.
-       There are factories for every major JDBC provider at 
-       http://search.maven.org/#search|ga|1|tranql-connector
-       You would need to configure your JDBC provider here.
+  <!-- NOTE: If you are running JBoss Fuse 6.0, please switch to the demo Camel-JMS-JDBC-XA-TX-JBossFuse6.0.
+       This version of the demo will not work due to bug http://fusesource.com/issues/browse/ENTESB-633.
+       The demo Camel-JMS-JDBC-XA-TX-JBossFuse6.0 presents a workaround solution for ENTESB-633
+       that can be used in JBoss Fuse 6.0.
   -->
-  <bean id="jdbcManagedConnectionFactory" class="org.tranql.connector.derby.ClientXAMCF">
-    <property name="databaseName" value="transactions"/>    
-    <property name="serverName" value="localhost" />  
-  </bean>
-
-  <!-- Creates the JDBC ConnectionFactory -->
-  <bean id="derby-cf" factory-ref="jdbcManagedConnectionFactory" factory-method="createConnectionFactory">
-    <argument ref="connectionManager" />
-  </bean> 
 
-  <!-- Exports the JDBC ConnectionFactory -->
-  <service ref="derby-cf" interface="javax.sql.DataSource">
-    <service-properties>      
-      <entry key="osgi.jndi.service.name" value="jdbc/transactions"/>      
-      <entry key="datasource.name" value="Derby"/>    
-    </service-properties>  
-  </service>
-
-  <!-- recoverable ResourceManager for JDBC DataSource, uses a wrapper class -->
-  <bean id="transactionRecovery" class="org.apache.aries.demo.GenericResourceManager" init-method="doRecovery">
-    <property name="connectionManagerContainer" ref="connectionManager"/>
-    <property name="managedConnectionFactory" ref="jdbcManagedConnectionFactory"/>
-  </bean>
-  
-
-  <!-- ********************************************************************* -->
-  <!-- Part 2: 
-       If bug ENTESB-633 did not exist we could auto-enlist the JDBC driver into 
-       Aries.
-  -->
   <!--
     This defines the actual data source bean. It will instantiate a new 
     ClientXADataSource instance and will use the corresponding settings to set 
@@ -101,26 +33,35 @@
     on the same machine so the server name is `localhost`. A database called 
     `transactions` has been created up-front as well (see README.md).
   -->
-  <!--
-  <bean id="transactionsDataSource" class="org.apache.derby.jdbc.ClientXADataSource">
-    <property name="databaseName" value="transactions"/>
-    <property name="serverName" value="localhost" />
+  <bean id="mysql-ds" class="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource">
+    <property name="databaseName" value="test"/>
+    <property name="url" value="jdbc:mysql://localhost/test?relaxAutoCommit=true" />
+    <property name="user" value="root"/>
+    <property name="password" value=""/>
+  </bean> 
+  
+
+  <!-- No pooling classes needed, pooling is provided by Aries wrapper
+  <bean id="tomcat-jdbc" class="org.apache.tomcat.jdbc.pool.XADataSource">
+    <property name="dataSource" ref="mysql-ds"/>
+    <property name="initialSize" value="1"/>
+    <property name="maxActive" value="5"/>
+    <property name="jmxEnabled" value="true"/>
   </bean>
   -->
-  <!--
-    We're publishing our data source into the OSGi Service Registry as a 
-    `XADataSource`. This will allow Aries JTA to automatically enlist this 
-    resource as an XA-aware resource. We also assign the 
-    `osgi.jndi.service.name` property to give us an easy-to-use JNDI name to 
-    lookup this data source from our JPA persistence.xml in the `database` 
-    module afterwards.
-  -->
-  <!--
-  <service ref="transactionsDataSource" interface="javax.sql.XADataSource">
+
+  <service interface="javax.sql.XADataSource" ref="mysql-ds">
     <service-properties>
       <entry key="osgi.jndi.service.name" value="jdbc/transactions"/>
-      <entry key="datasource.name" value="Derby"/>
+      <entry key="datasource.name" value="MySQL"/>
+
+      <!-- additional supported properties 
+           https://github.com/apache/aries/blob/trunk/transaction/transaction-jdbc/src/main/java/org/apache/aries/transaction/jdbc/internal/ManagedDataSourceFactory.java#L94
+      -->
+      <entry key="aries.xa.pooling" value="true" />
+      <entry key="aries.xa.poolMinSize" value="0" />
+      <entry key="aries.xa.poolMaxSize" value="5" />
+      
     </service-properties>
   </service>
-  -->
 </blueprint>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index e93d6e0..c7b18b8 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -26,17 +26,13 @@
     <feature>camel-jpa</feature>
     <feature>camel-jms</feature>
 
-    <!-- The workaround for http://fusesource.com/issues/browse/ENTESB-633 also requires the 
-         following bundles to be installed. 
-         See Notes in datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
-    -->
-    <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
-    <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle>
-    <bundle>wrap:mvn:org.tranql/tranql-connector/1.7</bundle>
-    <bundle>wrap:mvn:org.tranql/tranql-connector-derby-common/1.4</bundle>
-    <!-- end of bundles needed for workaround -->
-
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.derby/10.9.1.0_1</bundle>
+
+      <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.jdbc/1.0.1.redhat-610379</bundle>
+      <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
+
+      <!-- JDBC driver classes -->
+      <bundle>wrap:mvn:mysql/mysql-connector-java/5.1.26</bundle>
+
     <bundle>mvn:org.fusesource.example.transactions/datasource/${project.version}</bundle>
     <bundle>mvn:org.fusesource.example.transactions/database/${project.version}</bundle>
     <bundle>mvn:org.fusesource.example.transactions/routing/${project.version}</bundle>

From d55ca5c9bdf79c38866d68cb6f3a32e3cf4f1de9 Mon Sep 17 00:00:00 2001
From: pgf <pat.g.fox@gmail.com>
Date: Thu, 31 Jul 2014 20:53:08 +0200
Subject: [PATCH 3/4] needed these changes to deploy using fabric

---
 .../resources/OSGI-INF/blueprint/datasource.xml   |  4 ++--
 features/src/main/resources/features.xml          | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml b/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
index 8e3ffeb..f19554c 100644
--- a/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
+++ b/datasource/src/main/resources/OSGI-INF/blueprint/datasource.xml
@@ -16,9 +16,9 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
     xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
 
-  <reference id="platformTxManager" interface="org.springframework.transaction.PlatformTransactionManager" availability="mandatory"/>
+  <reference id="platformTxManager" interface="org.springframework.transaction.PlatformTransactionManager" availability="optional"/>
   <reference id="transactionManager" interface="javax.transaction.TransactionManager" />
-  <reference id="recoverableTxManager" interface="org.apache.geronimo.transaction.manager.RecoverableTransactionManager" availability="mandatory" />
+  <reference id="recoverableTxManager" interface="org.apache.geronimo.transaction.manager.RecoverableTransactionManager" availability="optional" />
 
   <!-- NOTE: If you are running JBoss Fuse 6.0, please switch to the demo Camel-JMS-JDBC-XA-TX-JBossFuse6.0.
        This version of the demo will not work due to bug http://fusesource.com/issues/browse/ENTESB-633.
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index c7b18b8..cbfdb73 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -16,19 +16,28 @@
 -->
 <features name="transactions-example-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
 
-  <!--
-    This features defines the list of everything we need to run our little transactions demo
-  -->
+    <repository>mvn:org.apache.karaf.assemblies.features/enterprise/2.3.0.redhat-610379/xml/features</repository>
+    <repository>mvn:org.apache.camel.karaf/apache-camel/2.12.0.redhat-610379/xml/features</repository>
+    <repository>mvn:io.fabric8/fabric8-karaf/1.0.0.redhat-379/xml/features</repository>
+
+
+    <!--
+      This features defines the list of everything we need to run our little transactions demo
+    -->
   <feature name="transactions-openjpa-demo">
     <feature>jpa</feature>
     <feature>jndi</feature>
+    <feature>transaction</feature>
     <feature>camel-blueprint</feature>
     <feature>camel-jpa</feature>
+    <feature>mq-fabric-camel</feature>
     <feature>camel-jms</feature>
 
 
       <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.jdbc/1.0.1.redhat-610379</bundle>
       <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
+      <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
+
 
       <!-- JDBC driver classes -->
       <bundle>wrap:mvn:mysql/mysql-connector-java/5.1.26</bundle>

From a4b6925d5d64d1b823c5db48d6279589dc3d35b1 Mon Sep 17 00:00:00 2001
From: pgf <pat.g.fox@gmail.com>
Date: Fri, 8 Aug 2014 09:52:30 +0200
Subject: [PATCH 4/4] to influcence order of bundle startup in fabric - added
 explicit export and import of OSGi services in database and routing bundle.

---
 .../database/DatabaseBundleMarker.java        |  7 +++++
 .../database/DatabaseBundleMarkerImpl.java    |  7 +++++
 .../OSGI-INF/blueprint/datasource.xml         | 28 +++++++++++++++++++
 .../resources/META-INF/spring/routing.xml     |  3 ++
 4 files changed, 45 insertions(+)
 create mode 100644 database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarker.java
 create mode 100644 database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarkerImpl.java
 create mode 100644 database/src/main/resources/OSGI-INF/blueprint/datasource.xml

diff --git a/database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarker.java b/database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarker.java
new file mode 100644
index 0000000..dc9143a
--- /dev/null
+++ b/database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarker.java
@@ -0,0 +1,7 @@
+package org.fusesource.example.transactions.database;
+
+/**
+ * Created by pfox on 06/08/14.
+ */
+public interface DatabaseBundleMarker {
+}
diff --git a/database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarkerImpl.java b/database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarkerImpl.java
new file mode 100644
index 0000000..2db28d9
--- /dev/null
+++ b/database/src/main/java/org/fusesource/example/transactions/database/DatabaseBundleMarkerImpl.java
@@ -0,0 +1,7 @@
+package org.fusesource.example.transactions.database;
+
+/**
+ * Created by pfox on 06/08/14.
+ */
+public class DatabaseBundleMarkerImpl implements DatabaseBundleMarker {
+}
diff --git a/database/src/main/resources/OSGI-INF/blueprint/datasource.xml b/database/src/main/resources/OSGI-INF/blueprint/datasource.xml
new file mode 100644
index 0000000..ad2a5da
--- /dev/null
+++ b/database/src/main/resources/OSGI-INF/blueprint/datasource.xml
@@ -0,0 +1,28 @@
+<!--
+~ Copyright 2011 FuseSource
+~
+~ Licensed under the Apache License, Version 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"
+    xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+
+  <reference id="datasource" interface="javax.sql.XADataSource" availability="mandatory" filter="(datasource.name=MySQL)"/>
+
+  <!--
+    Define a Marker service to influcence order of deployment
+  -->
+  <bean id="databaseBundleMarker" class="org.fusesource.example.transactions.database.DatabaseBundleMarkerImpl">
+  </bean> 
+  <service interface="org.fusesource.example.transactions.database.DatabaseBundleMarker" ref="databaseBundleMarker"/>
+
+</blueprint>
diff --git a/routing/src/main/resources/META-INF/spring/routing.xml b/routing/src/main/resources/META-INF/spring/routing.xml
index 812b5fd..f0942cb 100644
--- a/routing/src/main/resources/META-INF/spring/routing.xml
+++ b/routing/src/main/resources/META-INF/spring/routing.xml
@@ -110,4 +110,7 @@
     <property name="transactionManager" ref="platformTxManager" />
   </bean>
 
+  <!-- ensure database bundle is started already-->
+  <osgi:reference id="databasebundle" interface="org.fusesource.example.transactions.database.DatabaseBundleMarker" />
+
 </beans>
\ No newline at end of file