aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-jetty-js
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-24 16:12:14 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-24 16:12:14 +0000
commit54a9e3e843d09efc45108966bf400d705e4f4238 (patch)
tree29e8e8c568c98babe68001a0d06f8ec818c463a4 /archiva-jetty-js
parent59d320506d1d1b18be762f423152f5c7da0942d9 (diff)
downloadarchiva-54a9e3e843d09efc45108966bf400d705e4f4238.tar.gz
archiva-54a9e3e843d09efc45108966bf400d705e4f4238.zip
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
Diffstat (limited to 'archiva-jetty-js')
-rw-r--r--archiva-jetty-js/pom.xml10
-rw-r--r--archiva-jetty-js/src/main/conf/jetty.xml3
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>