[MRM-1676] use tomcat-jdbc for connection pooling in embeded distrib.

for legacy webapp too.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389468 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 6cf732a6b8d21ad0f1120fd4a8e87418db0bb32c..b5c29d77da905246a98da5bf92ee243fc2038e50 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -102,13 +102,8 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jdbc</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index c97a3a4a6089a7252adbb12f806627772813a5f8..4a5572554181fe40ab9fe89e2ae4d7895e7183c1 100644 (file)
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -314,7 +314,7 @@
   <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
     <Arg>jdbc/users</Arg>
     <Arg>
-      <New class="org.apache.commons.dbcp.BasicDataSource">
+      <New class="org.apache.tomcat.jdbc.pool.DataSource">
         <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
         <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users;create=true</Set>
         <Set name="username">sa</Set>
@@ -322,6 +322,9 @@
         <Set name="removeAbandoned">true</Set>
         <Set name="logAbandoned">true</Set>
         <Set name="initialSize">5</Set>
+        <Set name="testOnBorrow">true</Set>
+        <!-- very rigourous sql query validation -->
+        <Set name="validationQuery">select 1</Set>
       </New>
     </Arg>
   </New>
@@ -329,7 +332,7 @@
   <New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
     <Arg>jdbc/usersShutdown</Arg>
     <Arg>
-      <New class="org.apache.commons.dbcp.BasicDataSource">
+      <New class="org.apache.tomcat.jdbc.pool.DataSource">
         <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
         <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
         <Set name="username">sa</Set>