From a9cd6cf0df2d8e7079afaba43389dd1666631d35 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Wed, 22 Apr 2015 10:29:27 +1000
Subject: [PATCH 1/2] Enable errors for connection leaks during tests

---
 functional-test/src/test/resources/conf/standalone.xml          | 2 +-
 functional-test/src/test/resources/conf/standalone_wildfly.xml  | 2 +-
 .../test/resources/arquillian/standalone-arquillian-wildfly.xml | 2 +-
 .../src/test/resources/arquillian/standalone-arquillian.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/functional-test/src/test/resources/conf/standalone.xml b/functional-test/src/test/resources/conf/standalone.xml
index b5d4f0307b..11f03e7eae 100644
--- a/functional-test/src/test/resources/conf/standalone.xml
+++ b/functional-test/src/test/resources/conf/standalone.xml
@@ -219,7 +219,7 @@
           <keepalive-time time="10" unit="seconds" />
         </long-running-threads>
       </default-workmanager>
-      <cached-connection-manager debug="true"/>
+      <cached-connection-manager debug="true" error="true"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jdr:1.0" />
     <subsystem xmlns="urn:jboss:domain:jmx:1.2">
diff --git a/functional-test/src/test/resources/conf/standalone_wildfly.xml b/functional-test/src/test/resources/conf/standalone_wildfly.xml
index 990c51d03c..a57b9bcd28 100644
--- a/functional-test/src/test/resources/conf/standalone_wildfly.xml
+++ b/functional-test/src/test/resources/conf/standalone_wildfly.xml
@@ -269,7 +269,7 @@
           <keepalive-time time="10" unit="seconds"/>
         </long-running-threads>
       </default-workmanager>
-      <cached-connection-manager debug="true"/>
+      <cached-connection-manager debug="true" error="true"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
     <subsystem xmlns="urn:jboss:domain:jmx:1.3">
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
index 20e80f1089..2edbab258e 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -282,7 +282,7 @@
           <keepalive-time time="10" unit="seconds"/>
         </long-running-threads>
       </default-workmanager>
-      <cached-connection-manager debug="true"/>
+      <cached-connection-manager debug="true" error="true"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
     <subsystem xmlns="urn:jboss:domain:jmx:1.3">
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
index 602617e2b2..505a86db44 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
@@ -217,7 +217,7 @@
           <keepalive-time time="10" unit="seconds" />
         </long-running-threads>
       </default-workmanager>
-      <cached-connection-manager debug="true"/>
+      <cached-connection-manager debug="true" error="true"/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jdr:1.0" />
     <subsystem xmlns="urn:jboss:domain:jmx:1.1">

From 0d0b865ad57dc171f80537274b4f8a120099a2ea Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Wed, 22 Apr 2015 10:31:14 +1000
Subject: [PATCH 2/2] Enable connection leak detection and prevention

---
 .../eap-6/standalone/configuration/standalone-zanata.xml      | 4 ++--
 .../standalone/configuration/standalone-zanata.xml            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
index de54ef511d..80f742f8d0 100644
--- a/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
+++ b/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
@@ -144,7 +144,7 @@
                     </security>
                 </datasource>
                 <datasource jndi-name="java:jboss/datasources/zanataDatasource"
-                  pool-name="zanataDatasource" enabled="true" use-ccm="false">
+                  pool-name="zanataDatasource" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/zanata?characterEncoding=UTF-8</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
                     <driver>mysql-connector-java.jar</driver>
@@ -254,7 +254,7 @@
                     <keepalive-time time="10" unit="seconds"/>
                 </long-running-threads>
             </default-workmanager>
-            <cached-connection-manager/>
+            <cached-connection-manager debug="true" error="false"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jmx:1.3">
diff --git a/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
index e81340b76b..bab5551c22 100644
--- a/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
+++ b/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
@@ -153,7 +153,7 @@
                         <password>sa</password>
                     </security>
                 </datasource>
-                <datasource jndi-name="java:jboss/datasources/zanataDatasource" pool-name="zanataDatasource" enabled="true" use-ccm="false">
+                <datasource jndi-name="java:jboss/datasources/zanataDatasource" pool-name="zanataDatasource" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/zanata?characterEncoding=UTF-8</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
                     <driver>mysql-connector-java.jar</driver>
@@ -291,7 +291,7 @@
                     <keepalive-time time="10" unit="seconds"/>
                 </long-running-threads>
             </default-workmanager>
-            <cached-connection-manager debug="true"/>
+            <cached-connection-manager debug="true" error="false"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jmx:1.3">