From 54a9e3e843d09efc45108966bf400d705e4f4238 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 24 Sep 2012 16:12:14 +0000
Subject: [PATCH] no more need of commons-* in embeded dist and add
 testOnBorrow validation

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1389467 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-jetty-js/pom.xml                 | 10 ----------
 archiva-jetty-js/src/main/conf/jetty.xml |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml
index ebd9d24c3..5388bb769 100644
--- a/archiva-jetty-js/pom.xml
+++ b/archiva-jetty-js/pom.xml
@@ -85,16 +85,6 @@
       <artifactId>tomcat-jdbc</artifactId>
       <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>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-jetty-js/src/main/conf/jetty.xml b/archiva-jetty-js/src/main/conf/jetty.xml
index 28d59fa0a..4592f3718 100644
--- a/archiva-jetty-js/src/main/conf/jetty.xml
+++ b/archiva-jetty-js/src/main/conf/jetty.xml
@@ -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>