Enable connection validation (except Arq)

zanata · Aug 12, 2016 · 2338bc0 · 2338bc0
1 parent 6350864
commit 2338bc0
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/docker/conf/standalone.xml b/docker/conf/standalone.xml
@@ -213,6 +213,12 @@
                     <statement>
                         <track-statements>NOWARN</track-statements>
                     </statement>
+                    <validation>
+                        <validate-on-match>true</validate-on-match>
+                        <background-validation>false</background-validation>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
+                    </validation>
                 </datasource>
                 <datasource jndi-name="java:jboss/datasources/ExampleDS"
                   pool-name="ExampleDS" enabled="true" use-java-context="true">

diff --git a/functional-test/src/test/resources/datasource/zanata-ds.xml b/functional-test/src/test/resources/datasource/zanata-ds.xml
@@ -18,5 +18,11 @@ See http://jaitechwriteups.blogspot.com/2012/02/jboss-as-710final-thunder-releas
       <user-name>${ds.username}</user-name>
       <password>${ds.password}</password>
     </security>
+    <validation>
+      <validate-on-match>true</validate-on-match>
+      <background-validation>false</background-validation>
+      <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+      <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
+    </validation>
   </datasource>
 </datasources>
diff --git a/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
@@ -177,6 +177,12 @@
                     <statement>
                         <track-statements>NOWARN</track-statements>
                     </statement>
+                    <validation>
+                        <validate-on-match>true</validate-on-match>
+                        <background-validation>false</background-validation>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
+                    </validation>
                 </datasource>
                 <drivers>
                     <driver name="h2" module="com.h2database.h2">

diff --git a/zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
@@ -208,6 +208,12 @@
                     <statement>
                         <track-statements>NOWARN</track-statements>
                     </statement>
+                    <validation>
+                        <validate-on-match>true</validate-on-match>
+                        <background-validation>false</background-validation>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"></valid-connection-checker>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"></exception-sorter>
+                    </validation>
                 </datasource>
                 <datasource jndi-name="java:jboss/datasources/ExampleDS"
                   pool-name="ExampleDS" enabled="true" use-java-context="true">

diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -194,6 +194,12 @@
           <security>
             <user-name>root</user-name>
           </security>
+          <validation>
+            <validate-on-match>false</validate-on-match>
+            <background-validation>false</background-validation>
+            <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.novendor.JDBC4ValidConnectionChecker"></valid-connection-checker>
+            <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.novendor.NullExceptionSorter"></exception-sorter>
+          </validation>
         </datasource>
         <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
           <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>

diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
@@ -152,6 +152,12 @@
             <user-name>sa</user-name>
             <password>sa</password>
           </security>
+          <validation>
+            <validate-on-match>false</validate-on-match>
+            <background-validation>false</background-validation>
+            <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.novendor.JDBC4ValidConnectionChecker"></valid-connection-checker>
+            <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.novendor.NullExceptionSorter"></exception-sorter>
+          </validation>
         </datasource>
         <datasource jndi-name="java:jboss/datasources/ExampleDS"
           pool-name="ExampleDS" enabled="true" use-java-context="true">