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

use a database connection pooling from commons-dbcp for users database connection

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

diff --git a/archiva-jetty-js/src/main/conf/jetty.xml b/archiva-jetty-js/src/main/conf/jetty.xml
index 91d2c091e..407dfd4cd 100644
--- a/archiva-jetty-js/src/main/conf/jetty.xml
+++ b/archiva-jetty-js/src/main/conf/jetty.xml
@@ -288,7 +288,7 @@
   </New>
 
   <!-- Users / Security Database -->
-  
+  <!--
   <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
     <Arg>jdbc/users</Arg>
     <Arg>
@@ -310,4 +310,30 @@
       </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>