From fa1e0a02b0820ca77779de43fa1f1f8d321e4db5 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Wed, 10 Apr 2013 10:37:32 -0500
Subject: [PATCH] Issue #1874 - created external properties files for
 specifying the number of grib decode threads

- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers

Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff

Former-commit-id: 4ef22f8e93155b1fc96b8f07e803e8b87986e670 [formerly eb04d2b85f527f8ef5b0141c3db96c5cf84f423d] [formerly b5994702dc9876539b877c0215ac10069eb79259 [formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]
Former-commit-id: b5994702dc9876539b877c0215ac10069eb79259
Former-commit-id: a60f14f5d627e92e795daa32bde02903fdb2bed4
---
 edexOsgi/com.raytheon.edex.plugin.grib/.classpath      |  1 +
 .../res/spring/grib-decode.xml                         | 10 +++++++---
 .../resources/com.raytheon.edex.plugin.grib.properties |  2 ++
 ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/.classpath   |  1 +
 .../res/spring/ncgrib-ingest.xml                       | 10 +++++++---
 .../gov.noaa.nws.ncep.edex.plugin.ncgrib.properties    |  2 ++
 6 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
 create mode 100644 ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/resources/gov.noaa.nws.ncep.edex.plugin.ncgrib.properties

diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/.classpath b/edexOsgi/com.raytheon.edex.plugin.grib/.classpath
index 751c8f2e50..a55ffc7b0a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/.classpath
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
index 34c2867963..a4065fc62b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
@@ -15,10 +15,14 @@
 		factory-bean="jmsConfig" factory-method="copy">
 	</bean>
 	
+  	<bean id="gribDecodeThreads" class="java.lang.Integer">
+		<constructor-arg value="${grib-decode.count.threads}" />
+  	</bean>
+	
 	<bean id="gribThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
-		<property name="corePoolSize" value="4" />
-		<property name="maxPoolSize" value="4" />
+		<property name="corePoolSize" ref="gribDecodeThreads" />
+		<property name="maxPoolSize" ref="gribDecodeThreads" />
 	</bean>
 
 	<bean id="largeFileChecker" class="com.raytheon.edex.plugin.grib.GribLargeFileChecker" />
@@ -71,7 +75,7 @@
 	
 		<!-- Begin Grib Decode Route -->
 		<route id="gribIngestRoute">
-			<from uri="ingest-grib:queue:Ingest.Grib?concurrentConsumers=4&amp;destinationResolver=#qpidDurableResolver" />
+			<from uri="ingest-grib:queue:Ingest.Grib?concurrentConsumers=#gribDecodeThreads&amp;destinationResolver=#qpidDurableResolver" />
 			<setHeader headerName="pluginName">
 				<constant>grid</constant>
 			</setHeader>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties b/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
new file mode 100644
index 0000000000..d1237fd3db
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/resources/com.raytheon.edex.plugin.grib.properties
@@ -0,0 +1,2 @@
+# the number of grib decode threads.
+grib-decode.count.threads=4
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/.classpath b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/.classpath
index 16d067f284..3b3d59e447 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/.classpath
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
index fe5b78b0eb..4321a4b32d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
@@ -13,6 +13,10 @@
   	
   	<bean id="ncgridAssembler" class="gov.noaa.nws.ncep.edex.plugin.ncgrib.NcgridAssembler"/>
   	
+  	<bean id="ncgribDecodeThreads" class="java.lang.Integer">
+		<constructor-arg value="${ncgrib-decode.count.threads}" />
+  	</bean>
+  	
   	<bean id="ingest-ncgrib" class="org.apache.camel.component.jms.JmsComponent">
         <constructor-arg ref="jmsIngestNcgribConfig" />
 		<property name="taskExecutor" ref="ncgribThreadPool" />		
@@ -22,8 +26,8 @@
         </bean>
 	<bean id="ncgribThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
-		<property name="corePoolSize" value="4" />
-		<property name="maxPoolSize" value="4" />
+		<property name="corePoolSize" ref="ncgribDecodeThreads" />
+		<property name="maxPoolSize" ref="ncgribDecodeThreads" />
 	</bean>
 
         <bean id="ncgribLargeFileChecker" class="gov.noaa.nws.ncep.edex.plugin.ncgrib.NcgribLargeFileChecker" />
@@ -68,7 +72,7 @@
 
 
 		<route id="ncgribIngestRoute">
-			<from uri="ingest-ncgrib:queue:Ingest.Ncgrib?concurrentConsumers=4&amp;destinationResolver=#qpidDurableResolver" />
+			<from uri="ingest-ncgrib:queue:Ingest.Ncgrib?concurrentConsumers=#ncgribDecodeThreads&amp;destinationResolver=#qpidDurableResolver" />
 			<setHeader headerName="pluginName">
 				<constant>ncgrib</constant>
 			</setHeader>
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/resources/gov.noaa.nws.ncep.edex.plugin.ncgrib.properties b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/resources/gov.noaa.nws.ncep.edex.plugin.ncgrib.properties
new file mode 100644
index 0000000000..cb82c81237
--- /dev/null
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/resources/gov.noaa.nws.ncep.edex.plugin.ncgrib.properties
@@ -0,0 +1,2 @@
+# the number of ncgrib decode threads.
+ncgrib-decode.count.threads=4
\ No newline at end of file