From 74f87b2d95fc8745f3d0ba81c1f3a54ab29f87b0 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Wed, 20 Sep 2017 16:32:43 -0600
Subject: [PATCH] bump edexBridge max msgs 1000 to 2000; re-enable build in rpm
 spec

---
 nativeLib/edexBridge/edexBridge.cpp          |  4 +-
 rpms/awips2.upc/Installer.ldm/component.spec | 52 ++++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/nativeLib/edexBridge/edexBridge.cpp b/nativeLib/edexBridge/edexBridge.cpp
index 4cd0a9d875..8f79fb667d 100644
--- a/nativeLib/edexBridge/edexBridge.cpp
+++ b/nativeLib/edexBridge/edexBridge.cpp
@@ -58,7 +58,7 @@ public:
                     const std::string& username = "guest",
                     const std::string& password = "guest",
                     bool useTopic = false, bool sessionTransacted = false,
-                    int maxMessagesPerSend = 1000) 
+                    int maxMessagesPerSend = 2000) 
         {
 		this->useTopic = useTopic;
 		this->sessionTransacted = sessionTransacted;
@@ -363,7 +363,7 @@ int main(int argc, char* argv[]) {
 	// createQueue to be used in both consumer an producer.
 	//============================================================
 	bool useTopics = false;
-    int maxMessagesPerSend = 1000;
+    int maxMessagesPerSend = 2000;
     bool sessionTransacted = false;
 
 	int shmid;
diff --git a/rpms/awips2.upc/Installer.ldm/component.spec b/rpms/awips2.upc/Installer.ldm/component.spec
index 792610c8f7..2d749c7980 100644
--- a/rpms/awips2.upc/Installer.ldm/component.spec
+++ b/rpms/awips2.upc/Installer.ldm/component.spec
@@ -70,7 +70,7 @@ fi
 
 _ldm_destination=%{_build_root}/awips2/ldm
 _ldm_destination_source=${_ldm_destination}/SOURCES
-_NATIVELIB_PROJECTS=( 'decrypt_file' )
+_NATIVELIB_PROJECTS=( 'decrypt_file' 'edexBridge')
 _RPM_directory=%{_baseline_workspace}/rpms
 _Installer_ldm=${_RPM_directory}/awips2.upc/Installer.ldm
 
@@ -216,11 +216,11 @@ if [ $? -ne 0 ]; then
    echo "FATAL: failed to untar decrypt_file.tar!"
    exit 1
 fi
-#/bin/tar -xf edexBridge.tar
-#if [ $? -ne 0 ]; then
-#   echo "FATAL: failed to untar edexBridge.tar!"
-#   exit 1
-#fi
+/bin/tar -xf edexBridge.tar
+if [ $? -ne 0 ]; then
+   echo "FATAL: failed to untar edexBridge.tar!"
+   exit 1
+fi
 /bin/rm -f *.tar
 if [ $? -ne 0 ]; then
    echo "FATAL: failed to remove decrypt_file.tar!"
@@ -240,26 +240,26 @@ if [ $? -ne 0 ]; then
    echo "FATAL: failed to move built decrypt_file to ldm decoders directory!"
    exit 1
 fi
-#cd ../edexBridge
-#if [ $? -ne 0 ]; then
-#   exit 1
-#fi
-#g++ edexBridge.cpp -I${_ldm_root_dir}/src/pqact \
-#   -I${_ldm_root_dir}/include \
-#   -I${_ldm_root_dir}/src \
-#   -I/awips2/qpid/include \
-#   -L${_ldm_root_dir}/lib \
-#   -L/awips2/qpid/lib \
-#   -l ldm -l xml2 -l qpidclient -l qpidmessaging -l qpidcommon -l qpidtypes -o edexBridge
-#if [ $? -ne 0 ]; then
-#   echo "FATAL: failed to build edexBridge!"
-#   exit 1
-#fi
-#/bin/mv edexBridge ${_ldm_dir}/bin/edexBridge
-#if [ $? -ne 0 ]; then
-#   echo "FATAL: failed to move edexBridge to ldm bin directory!"
-#   exit 1
-#fi
+cd ../edexBridge
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+g++ edexBridge.cpp -I${_ldm_root_dir}/src/pqact \
+   -I${_ldm_root_dir}/include \
+   -I${_ldm_root_dir}/src \
+   -I/awips2/qpid/include \
+   -L${_ldm_root_dir}/lib \
+   -L/awips2/qpid/lib \
+   -l ldm -l xml2 -l qpidclient -l qpidmessaging -l qpidcommon -l qpidtypes -o edexBridge
+if [ $? -ne 0 ]; then
+   echo "FATAL: failed to build edexBridge!"
+   exit 1
+fi
+/bin/mv edexBridge ${_ldm_dir}/bin/edexBridge
+if [ $? -ne 0 ]; then
+   echo "FATAL: failed to move edexBridge to ldm bin directory!"
+   exit 1
+fi
 cd ..
 
 /sbin/ldconfig