use tomcat jdbc for jdbc connection pooling

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

diff --git a/archiva-jetty-js/pom.xml b/archiva-jetty-js/pom.xml
index d319b8fd34be3d5bba2ac51108bd2e6d9cc6d879..ebd9d24c38db5f46aa8c8607f44ae0e23027b8d2 100644 (file)
--- a/archiva-jetty-js/pom.xml
+++ b/archiva-jetty-js/pom.xml
@@ -80,6 +80,11 @@
       <artifactId>ant</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jdbc</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>

diff --git a/archiva-jetty-js/src/main/conf/jetty.xml b/archiva-jetty-js/src/main/conf/jetty.xml
index 34ac21a6f228cfac1f88b313e11655a428a6fe70..28d59fa0ade522ca804eda4c5c808821647e0db1 100644 (file)
--- a/archiva-jetty-js/src/main/conf/jetty.xml
+++ b/archiva-jetty-js/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>
@@ -329,7 +329,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>

diff --git a/pom.xml b/pom.xml
index 38e17e915cc331b378ff0edb318d2a61d31fe65a..0a323d50618956051c9bbcb37972eddb8a066518 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -633,6 +633,11 @@
         <version>1.6</version>
         <scope>runtime</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>tomcat-jdbc</artifactId>
+        <version>${tomcat7Version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>