From 5e51f64bb3fde467e567fe1648b2597cc442cf86 Mon Sep 17 00:00:00 2001
From: Henryk Konsek <hekonsek@gmail.com>
Date: Fri, 14 Mar 2014 17:14:50 +0100
Subject: [PATCH] Added Tomcat JDBC pool.

---
 .../fuse-pocs-blueprint-openjpa-bundle/pom.xml    |  1 +
 .../resources/OSGI-INF/blueprint/blueprint.xml    | 15 +++++++++++++--
 .../fuse-pocs-blueprint-openjpa-itest/pom.xml     |  5 +++++
 .../poc/blueprint/openjpa/PersonServiceTest.java  |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/pom.xml b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/pom.xml
index b379c15..8c17050 100644
--- a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/pom.xml
+++ b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/pom.xml
@@ -28,6 +28,7 @@
                     <instructions>
                         <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
                         <JPA-PersistenceUnits>PERSON</JPA-PersistenceUnits>
+                        <!--<Dynamic-ImportPackage>*</Dynamic-ImportPackage>-->
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 94e6dd5..af72431 100644
--- a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -4,10 +4,21 @@
            xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.1.0"
            xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0">
 
-    <bean id="dataSource" class="org.hsqldb.jdbc.JDBCDataSource">
+    <bean id="dataSource" class="org.apache.tomcat.jdbc.pool.DataSource"
+          destroy-method="close">
+        <property name="dataSource">
+            <bean class="org.hsqldb.jdbc.JDBCDataSource">
+                <property name="url" value="jdbc:hsqldb:mem:testDB"/>
+                <property name="user" value="sa"/>
+                <property name="password" value=""/>
+            </bean>
+        </property>
         <property name="url" value="jdbc:hsqldb:mem:testDB"/>
-        <property name="user" value="sa"/>
+        <property name="username" value="sa"/>
         <property name="password" value=""/>
+        <property name="initialSize" value="5"/>
+        <property name="maxActive" value="10"/>
+        <property name="defaultAutoCommit" value="false"/>
     </bean>
 
     <service ref="dataSource" interface="javax.sql.DataSource">
diff --git a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/pom.xml b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/pom.xml
index ca4adf0..b0e2575 100644
--- a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/pom.xml
+++ b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/pom.xml
@@ -77,6 +77,11 @@
             <artifactId>hsqldb</artifactId>
             <version>2.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>7.0.47</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/src/test/java/fuse/poc/blueprint/openjpa/PersonServiceTest.java b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/src/test/java/fuse/poc/blueprint/openjpa/PersonServiceTest.java
index c103b90..00792fa 100644
--- a/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/src/test/java/fuse/poc/blueprint/openjpa/PersonServiceTest.java
+++ b/fuse-pocs-blueprint-openjpa/fuse-pocs-blueprint-openjpa-itest/src/test/java/fuse/poc/blueprint/openjpa/PersonServiceTest.java
@@ -52,6 +52,7 @@ public Option[] commonOptions() {
                         maven().groupId("org.apache.karaf.assemblies.features").artifactId("enterprise").type("xml")
                                 .classifier("features").version("2.3.3"), "transaction", "jndi", "jpa"),
 
+                mavenBundle().groupId("org.apache.tomcat").artifactId("tomcat-jdbc").versionAsInProject(),
                 mavenBundle().groupId("org.hsqldb").artifactId("hsqldb").versionAsInProject(),
 
                 bundle("mvn:org.apache.commons/commons-lang3/3.1"),