Author: olamy
Date: Mon Sep 24 16:12:03 2012
New Revision: 1389466
URL: http://svn.apache.org/viewvc?rev=1389466&view=rev
Log:
use tomcat jdbc for jdbc connection pooling
Modified:
archiva/trunk/archiva-jetty-js/pom.xml
archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-jetty-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty-js/pom.xml?rev=1389466&r1=1389465&r2=1389466&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty-js/pom.xml (original)
+++ archiva/trunk/archiva-jetty-js/pom.xml Mon Sep 24 16:12:03 2012
@@ -81,6 +81,11 @@
<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>
<scope>runtime</scope>
Modified: archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml?rev=1389466&r1=1389465&r2=1389466&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml (original)
+++ archiva/trunk/archiva-jetty-js/src/main/conf/jetty.xml Mon Sep 24 16:12:03
2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1389466&r1=1389465&r2=1389466&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Mon Sep 24 16:12:03 2012
@@ -634,6 +634,11 @@
<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>
<version>1.4</version>
