Author: oching
Date: Thu Jun 19 20:49:16 2008
New Revision: 669774
URL: http://svn.apache.org/viewvc?rev=669774&view=rev
Log:
[MRM-751]
-configure jetty to use commons-dbcp for db connection pool
Modified:
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
Modified: archiva/trunk/archiva-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=669774&r1=669773&r2=669774&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Thu Jun 19 20:49:16 2008
@@ -132,6 +132,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: archiva/trunk/archiva-jetty/src/main/conf/jetty.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/src/main/conf/jetty.xml?rev=669774&r1=669773&r2=669774&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/src/main/conf/jetty.xml (original)
+++ archiva/trunk/archiva-jetty/src/main/conf/jetty.xml Thu Jun 19 20:49:16 2008
@@ -296,26 +296,33 @@
</New>
<!-- Archiva database -->
-
<New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/archiva</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName"><SystemProperty name="appserver.base"
default=".."/>/data/databases/archiva</Set>
- <Set name="user">sa</Set>
- <Set name="createDatabase">create</Set>
- </New>
- </Arg>
+ <Arg>jdbc/archiva</Arg>
+ <Arg>
+ <New class="org.apache.commons.dbcp.BasicDataSource">
+ <Set
name="driverClassName">org.apache.derby.jdbc.EmbeddedDataSource</Set>
+ <Set name="url">jdbc:derby:<SystemProperty name="appserver.base"
default=".."/>/data/databases/archiva</Set>
+ <Set name="username">sa</Set>
+ <Call name="addConnectionProperty">
+ <Arg>create</Arg>
+ <Arg>true</Arg>
+ </Call>
+ </New>
+ </Arg>
</New>
<New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>jdbc/archivaShutdown</Arg>
<Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName"><SystemProperty name="appserver.base"
default=".."/>/data/databases/archiva</Set>
- <Set name="user">sa</Set>
- <Set name="shutdownDatabase">shutdown</Set>
- </New>
+ <New class="org.apache.commons.dbcp.BasicDataSource">
+ <Set
name="driverClassName">org.apache.derby.jdbc.EmbeddedDataSource</Set>
+ <Set name="url">jdbc:derby:<SystemProperty name="appserver.base"
default=".."/>/data/databases/archiva</Set>
+ <Set name="username">sa</Set>
+ <Call name="addConnectionProperty">
+ <Arg>shutdown</Arg>
+ <Arg>true</Arg>
+ </Call>
+ </New>
</Arg>
</New>
