From 59db0c72ece1e6ad24cd64616609faa0a3eb001b Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 17 Dec 2016 10:08:45 +0000
Subject: [PATCH] Merge origin/master
---
web/META-INF/context.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/META-INF/context.xml b/web/META-INF/context.xml
index 452476f..061f6b4 100644
--- a/web/META-INF/context.xml
+++ b/web/META-INF/context.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context antiJARLocking="true" path="/um">
- <Resource name="jdbc/UserDB"
+ <Resource name="jdbc/NewUserDB"
auth="Container"
type="javax.sql.DataSource"
username="dbadmin"
password="changeit"
driverClassName="org.apache.derby.jdbc.ClientDriver"
- url="jdbc:derby://127.0.0.1:1527/udb;create=true"
+ url="jdbc:derby://127.0.0.1:1527/udb_test;create=true"
maxActive="60"
maxIdle="30"
maxWait="5000"
--
Gitblit v1.9.3