From: Olivier Lamy <olamy@apache.org>
Date: Tue, 22 May 2012 13:01:41 +0000 (+0000)
Subject: use a database connection pooling from commons-dbcp for users database connection... 
X-Git-Tag: archiva-1.4-M3~694
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=506c3c7ae0ea0dbdd50c470e7ad3ac8c9ff43766;p=archiva.git

use a database connection pooling from commons-dbcp for users database connection for archiva-jetty too.

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

diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index 91d2c091e..37989c422 100644
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -289,7 +289,7 @@
 
   <!-- Users / Security Database -->
   
-  <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
+  <!--New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
     <Arg>jdbc/users</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
@@ -309,5 +309,32 @@
         <Set name="shutdownDatabase">shutdown</Set>
       </New>
     </Arg>
+  </New-->
+
+  <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
+    <Arg>jdbc/users</Arg>
+    <Arg>
+      <New class="org.apache.commons.dbcp.BasicDataSource">
+        <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>
+        <Set name="maxActive">20</Set>
+        <Set name="RemoveAbandoned">true</Set>
+        <Set name="LogAbandoned">true</Set>
+        <Set name="InitialSize">5</Set>
+      </New>
+    </Arg>
   </New>
+
+  <New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
+    <Arg>jdbc/usersShutdown</Arg>
+    <Arg>
+      <New class="org.apache.commons.dbcp.BasicDataSource">
+        <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>
+      </New>
+    </Arg>
+  </New>
+
 </Configure>