From 46f0b61339c90f43b1216a73489cd1880fe51c99 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 1 Oct 2014 13:38:59 +0000
Subject: [PATCH] cleanup
---
src/java/DmWebPortal/setup/glassfish-resources.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/java/DmWebPortal/setup/glassfish-resources.xml b/src/java/DmWebPortal/setup/glassfish-resources.xml
index df5d0641..fb4700de 100644
--- a/src/java/DmWebPortal/setup/glassfish-resources.xml
+++ b/src/java/DmWebPortal/setup/glassfish-resources.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE resources PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Resource Definitions//EN" "http://glassfish.org/dtds/glassfish-resources_1_5.dtd">
<resources>
- <jdbc-connection-pool allow-non-component-callers="false" associate-with-thread="false" connection-creation-retry-attempts="0" connection-creation-retry-interval-in-seconds="10" connection-leak-reclaim="false" connection-leak-timeout-in-seconds="0" connection-validation-method="auto-commit" datasource-classname="org.postgresql.ds.PGSimpleDataSource" fail-all-connections="false" idle-timeout-in-seconds="300" is-connection-validation-required="false" is-isolation-level-guaranteed="true" lazy-connection-association="false" lazy-connection-enlistment="false" match-connections="false" max-connection-usage-count="0" max-pool-size="32" max-wait-time-in-millis="60000" name="post-gre-sql_dm_dmPool" non-transactional-connections="false" pool-resize-quantity="2" res-type="javax.sql.DataSource" statement-timeout-in-seconds="-1" steady-pool-size="8" validate-atmost-once-period-in-seconds="0" wrap-jdbc-objects="false">
+ <jdbc-connection-pool allow-non-component-callers="false" associate-with-thread="false" connection-creation-retry-attempts="0" connection-creation-retry-interval-in-seconds="10" connection-leak-reclaim="false" connection-leak-timeout-in-seconds="0" connection-validation-method="auto-commit" datasource-classname="org.postgresql.ds.PGSimpleDataSource" fail-all-connections="false" idle-timeout-in-seconds="300" is-connection-validation-required="false" is-isolation-level-guaranteed="true" lazy-connection-association="false" lazy-connection-enlistment="false" match-connections="false" max-connection-usage-count="0" max-pool-size="32" max-wait-time-in-millis="60000" name="postgresql_dm_DbPool" non-transactional-connections="false" pool-resize-quantity="2" res-type="javax.sql.DataSource" statement-timeout-in-seconds="-1" steady-pool-size="8" validate-atmost-once-period-in-seconds="0" wrap-jdbc-objects="false">
<property name="serverName" value="localhost"/>
<property name="portNumber" value="11136"/>
<property name="databaseName" value="dm"/>
@@ -10,5 +10,5 @@
<property name="URL" value="jdbc:postgresql://localhost:11136/dm"/>
<property name="driverClass" value="org.postgresql.Driver"/>
</jdbc-connection-pool>
- <jdbc-resource enabled="true" jndi-name="DmDataSource" object-type="user" pool-name="post-gre-sql_dm_dmPool"/>
+ <jdbc-resource enabled="true" jndi-name="dm_DataSource" object-type="user" pool-name="postgresql_dm_DbPool"/>
</resources>
--
GitLab