xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1538 Reworked registry database connection strategy" into development

Browse source 
Former-commit-id: e79bc34c91 [formerly b6541dfb40] [formerly 58d4da8db6] [formerly e79bc34c91 [formerly b6541dfb40] [formerly 58d4da8db6] [formerly ffb7a6e6ae [formerly 58d4da8db6 [formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]]]]
Former-commit-id: ffb7a6e6ae
Former-commit-id: 337cf9ab3b [formerly a8f9146990] [formerly 632e36362375d729c2d4dffa12a4dedf09c7fd15 [formerly 1b74f629f7]]
Former-commit-id: 78de7cec4822c93ffe9d07583254759d5cf1c515 [formerly f7c66ea100]
Former-commit-id: 8ebc9c6523
This commit is contained in:
Richard Peter 2013-10-23 16:33:29 -05:00 • committed by Gerrit Code Review
commit 60a36defe1
6 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/build.edex/esb/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
View file

@ -61,7 +61,7 @@
<!-- c3p0 Connection Pool Properties --> <!-- c3p0 Connection Pool Properties -->
<!-- Additional properties may be added to c3p0.properties --> <!-- Additional properties may be added to c3p0.properties -->
<property name="hibernate.c3p0.idle_test_period">60</property> <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.max_statements">10</property>
<property name="hibernate.c3p0.acquire_increment">5</property> <property name="hibernate.c3p0.acquire_increment">5</property>
<property name="hibernate.c3p0.min_size">${db.metadata.pool.min}</property> <property name="hibernate.c3p0.min_size">${db.metadata.pool.min}</property>

1
edexOsgi/build.edex/esb/conf/wrapper.conf
View file

@ -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.6=-Dih.db.name=${IH_DB_NAME}
wrapper.java.additional.db.7=-Ddb.metadata.pool.min=${METADATA_POOL_MIN} 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.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 # site ID of EDEX for localization and site aware services
wrapper.java.additional.site.1=-Daw.site.identifier=${AW_SITE_IDENTIFIER} wrapper.java.additional.site.1=-Daw.site.identifier=${AW_SITE_IDENTIFIER}

5
edexOsgi/build.edex/esb/etc/centralRegistry.sh
View file

@ -21,8 +21,11 @@
export MAX_MEM=1536 # in Meg export MAX_MEM=1536 # in Meg
export MAX_PERM_SIZE=192m export MAX_PERM_SIZE=192m
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5011 export EDEX_DEBUG_PORT=5011
export EDEX_JMX_PORT=1622 export EDEX_JMX_PORT=1622
export LOG_CONF=logback-registry.xml export LOG_CONF=logback-registry.xml
export MGMT_PORT=9607 export MGMT_PORT=9607
export METADATA_POOL_MIN=10
export METADATA_POOL_MAX=25
export METADATA_POOL_TIMEOUT=60

1
edexOsgi/build.edex/esb/etc/default.sh
View file

@ -27,6 +27,7 @@ export JMS_POOL_MIN=64
export JMS_POOL_MAX=128 export JMS_POOL_MAX=128
export METADATA_POOL_MIN=5 export METADATA_POOL_MIN=5
export METADATA_POOL_MAX=50 export METADATA_POOL_MAX=50
export METADATA_POOL_TIMEOUT=300
export DEBUG_PARAM_1="" export DEBUG_PARAM_1=""
export DEBUG_PARAM_2="" export DEBUG_PARAM_2=""
export DEBUG_PARAM_3="" export DEBUG_PARAM_3=""

5
edexOsgi/build.edex/esb/etc/registry.sh
View file

@ -21,8 +21,11 @@
export MAX_MEM=1536 # in Meg export MAX_MEM=1536 # in Meg
export MAX_PERM_SIZE=192m export MAX_PERM_SIZE=192m
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5012 export EDEX_DEBUG_PORT=5012
export EDEX_JMX_PORT=1620 export EDEX_JMX_PORT=1620
export LOG_CONF=logback-registry.xml export LOG_CONF=logback-registry.xml
export MGMT_PORT=9605 export MGMT_PORT=9605
export METADATA_POOL_MIN=5
export METADATA_POOL_MAX=20
export METADATA_POOL_TIMEOUT=60

4
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webserver.xml
View file

@ -7,8 +7,8 @@
<property name="threadPool"> <property name="threadPool">
<bean id="ThreadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"> <bean id="ThreadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<property name="minThreads" value="5" /> <property name="minThreads" value="2" />
<property name="maxThreads" value="20" /> <property name="maxThreads" value="5" />
</bean> </bean>
</property> </property>