From bbd690038f8e173dba313bc1ad32e0557cb53b7a Mon Sep 17 00:00:00 2001
From: Benjamin Phillippe <Benjamin_D_Phillippe@raytheon.com>
Date: Wed, 23 Oct 2013 10:48:40 -0500
Subject: [PATCH] Issue #1538 Reworked registry database connection strategy

Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: b192fd81c4deb8c3c320e562854dfb95a0dedadf [formerly b192fd81c4deb8c3c320e562854dfb95a0dedadf [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]
Former-commit-id: ef0d0e239343c4e430afdfb48029e3943e62be4d
Former-commit-id: 5aa04a9a43a5741a851a558c72ee6c5e665dcd83
---
 .../esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml   | 2 +-
 edexOsgi/build.edex/esb/conf/wrapper.conf                    | 1 +
 edexOsgi/build.edex/esb/etc/centralRegistry.sh               | 5 ++++-
 edexOsgi/build.edex/esb/etc/default.sh                       | 1 +
 edexOsgi/build.edex/esb/etc/registry.sh                      | 5 ++++-
 .../res/spring/ebxml-webserver.xml                           | 4 ++--
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml b/edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
index a558d866c3..655aba8686 100644
--- a/edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
+++ b/edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
@@ -61,7 +61,7 @@
 		<!-- c3p0 Connection Pool Properties -->
 		<!-- Additional properties may be added to c3p0.properties -->
 		<property name="hibernate.c3p0.idle_test_period">60</property>
-		<property name="hibernate.c3p0.timeout">1800</property>
+		<property name="hibernate.c3p0.timeout">${db.metadata.pool.timeout}</property>
 		<property name="hibernate.c3p0.max_statements">10</property>
 		<property name="hibernate.c3p0.acquire_increment">5</property>
 		<property name="hibernate.c3p0.min_size">${db.metadata.pool.min}</property>
diff --git a/edexOsgi/build.edex/esb/conf/wrapper.conf b/edexOsgi/build.edex/esb/conf/wrapper.conf
index 6bcec4486b..a98c8ef75d 100644
--- a/edexOsgi/build.edex/esb/conf/wrapper.conf
+++ b/edexOsgi/build.edex/esb/conf/wrapper.conf
@@ -109,6 +109,7 @@ wrapper.java.additional.db.5=-Dhm.db.name=${HM_DB_NAME}
 wrapper.java.additional.db.6=-Dih.db.name=${IH_DB_NAME}
 wrapper.java.additional.db.7=-Ddb.metadata.pool.min=${METADATA_POOL_MIN}
 wrapper.java.additional.db.8=-Ddb.metadata.pool.max=${METADATA_POOL_MAX}
+wrapper.java.additional.db.9=-Ddb.metadata.pool.timeout=${METADATA_POOL_TIMEOUT}
 
 # site ID of EDEX for localization and site aware services
 wrapper.java.additional.site.1=-Daw.site.identifier=${AW_SITE_IDENTIFIER}
diff --git a/edexOsgi/build.edex/esb/etc/centralRegistry.sh b/edexOsgi/build.edex/esb/etc/centralRegistry.sh
index 2d82dafb04..c19e36399e 100644
--- a/edexOsgi/build.edex/esb/etc/centralRegistry.sh
+++ b/edexOsgi/build.edex/esb/etc/centralRegistry.sh
@@ -21,8 +21,11 @@
 
 export MAX_MEM=1536 # in Meg
 export MAX_PERM_SIZE=192m
-export METADATA_POOL_MIN=10
 export EDEX_DEBUG_PORT=5011
 export EDEX_JMX_PORT=1622
 export LOG_CONF=logback-registry.xml
 export MGMT_PORT=9607
+
+export METADATA_POOL_MIN=10
+export METADATA_POOL_MAX=25
+export METADATA_POOL_TIMEOUT=60
\ No newline at end of file
diff --git a/edexOsgi/build.edex/esb/etc/default.sh b/edexOsgi/build.edex/esb/etc/default.sh
index 343b85d79e..7d2a181151 100644
--- a/edexOsgi/build.edex/esb/etc/default.sh
+++ b/edexOsgi/build.edex/esb/etc/default.sh
@@ -27,6 +27,7 @@ export JMS_POOL_MIN=64
 export JMS_POOL_MAX=128
 export METADATA_POOL_MIN=5
 export METADATA_POOL_MAX=50
+export METADATA_POOL_TIMEOUT=300
 export DEBUG_PARAM_1=""
 export DEBUG_PARAM_2=""
 export DEBUG_PARAM_3=""
diff --git a/edexOsgi/build.edex/esb/etc/registry.sh b/edexOsgi/build.edex/esb/etc/registry.sh
index 8fdc7f5541..9797f22d08 100644
--- a/edexOsgi/build.edex/esb/etc/registry.sh
+++ b/edexOsgi/build.edex/esb/etc/registry.sh
@@ -21,8 +21,11 @@
 
 export MAX_MEM=1536 # in Meg
 export MAX_PERM_SIZE=192m
-export METADATA_POOL_MIN=10
 export EDEX_DEBUG_PORT=5012
 export EDEX_JMX_PORT=1620
 export LOG_CONF=logback-registry.xml
 export MGMT_PORT=9605
+
+export METADATA_POOL_MIN=5
+export METADATA_POOL_MAX=20
+export METADATA_POOL_TIMEOUT=60
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
index b6ca571112..4ec9278941 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
@@ -7,8 +7,8 @@
 
 		<property name="threadPool">
 			<bean id="ThreadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-				<property name="minThreads" value="5" />				
-				<property name="maxThreads" value="20" />
+				<property name="minThreads" value="2" />				
+				<property name="maxThreads" value="5" />
 			</bean>
 		</property>