Merge pull request #781 from zanata/prevent-connection-leaks

Prevent connection leaks
zanata · Apr 23, 2015 · 8741253 · 8741253
2 parents d23eb53 + 0d0b865
commit 8741253
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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-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
@@ -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">

diff --git 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
@@ -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">