From 54355035ecc6430875a003fbd6c3b299c0d7d089 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 24 Sep 2012 16:12:25 +0000
Subject: [PATCH] [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
---
 archiva-jetty/pom.xml                 | 9 ++-------
 archiva-jetty/src/main/conf/jetty.xml | 7 +++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 6cf732a6b..b5c29d77d 100644
--- 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 c97a3a4a6..4a5572554 100644
--- 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>
-- 
2.39.5