Issue #2257 - updated edex_com to use the qpid 0.18 messaging api

- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function

Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3

Former-commit-id: 21893102bb [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]
Former-commit-id: fc8c3f540d

nativeLib/build.native/build-notification.sh

@@ -197,12 +197,5 @@ if [ $? -ne 0 ]; then
    echo "ERROR: Failed to copy the org.apache.thrift lib to its destination."
    exit 1
 fi
-# org.apache.qpid lib -> notification/lib
-cp -vPf ${BUILD_ROOT}/workspace_/org.apache.qpid/${FOSS_LIB_DIR}/* \
-   ${BUILD_ROOT}/awips2/notification/${FOSS_LIB_DIR}
-if [ $? -ne 0 ]; then
-   echo "ERROR: Failed to copy the org.apache.qpid lib to its destination."
-   exit 1
-fi
 
 exit 0

nativeLib/edex_com/.gitignore

@@ -1 +1,2 @@
 /Build x86
+/Build x86_64

nativeLib/edex_com/src/EdexNotification.cpp

@@ -28,6 +28,7 @@
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 11/2/09       3375       brockwoo    Initial Creation
+ * 08/13/13      2257       bkowal      Update for qpid 0.18.
  *
  * </pre>
  *
@@ -35,14 +36,18 @@
  * @version 1
  */
 
-#include <qpid/client/QueueOptions.h>
+#include <iostream>
-#include <qpid/client/Connection.h>
+#include <sstream>
+#include <uuid/uuid.h>
+#include <qpid/messaging/Connection.h>
+#include <qpid/messaging/Duration.h>
 #include <qpid/Url.h>
 #include "EdexNotification.h"
 
 using qpid::Url;
 
-EdexNotification::EdexNotification(const string & brokerURI) {
+EdexNotification::EdexNotification(const string & brokerURI) :
+	duration(Duration(1000 * 120)) {
 	this->sessionTransacted = false;
 	this->brokerURI = brokerURI;
 	this->isConnected = false;
@@ -50,8 +55,6 @@ EdexNotification::EdexNotification(const string & brokerURI) {
 	this->mess = new com_raytheon_uf_common_dataplugin_message_DataURINotificationMessage();
 	this->timeout = false;
 	this->timeoutLength = 999999;
-	this->subman = NULL;
-	this->localQueue = NULL;
 }
 
 EdexNotification::~EdexNotification() {
@@ -92,24 +95,14 @@ void EdexNotification::listen() {
 		Message message;
 		bool result;
 		try {
-			result = localQueue->get(message, 120 * qpid::sys::TIME_SEC);
+			result = this->receiver.fetch(message, this->duration);
 		} catch(...) {
 			cleanup();
 			throw;
 		}
 		if (result) {
-			std::string output = message.getData();
+			this->session.acknowledge(message);
-			/* Message * message;
+			std::string output = message.getContent();
-			 if(timeout) {
-			 message = this->consumer->receive();
-			 }
-			 else {
-			 message = this->consumer->receive(timeoutLength);
-			 }
-			 if (message == NULL) {
-			 listSize = 0;
-			 } else {
-			 */
 			uint8_t * data = (uint8_t *) output.c_str();
 			TMemoryBuffer * buffer = new TMemoryBuffer(data,
 					output.length(),
@@ -136,16 +129,52 @@ void EdexNotification::listen() {
 
 void EdexNotification::cleanup() {
 	// Destroy resources.
-	try {
+
-		delete subman;
+	// attempt to close the receiver
-		subman = NULL;
+	if (this->receiver != 0)
-		delete localQueue;
+	{
-		localQueue = NULL;
+		try
-		session.close();
+		{
-		connection.close();
+			this->receiver.close();
-	} catch (const std::exception& error) {
+			this->receiver = 0;
-		this->isConnected = false;
+		}
+		catch (const std::exception& error)
+		{
+			std::cout << "WARNING: Failed to close the receiver -"
+				<< error.what() << std::endl;
+		}
 	}
+
+	// attempt to close the session
+	if (this->session != 0)
+	{
+		try
+		{
+			this->session.close();
+			this->session = 0;
+		}
+		catch (const std::exception& error)
+		{
+			std::cout << "WARNING: Failed to close the session -"
+				<< error.what() << std::endl;
+		}
+	}
+
+	// attempt to close the connection
+	if (this->connection != 0)
+	{
+		try
+		{
+			this->connection.close();
+			this->connection = 0;
+		}
+		catch (const std::exception& error)
+		{
+			std::cout << "WARNING: Failed to close the connection -"
+				<< error.what() << std::endl;
+		}
+	}
+
 	this->isConnected = false;
 }
 
@@ -154,23 +183,38 @@ bool EdexNotification::connect() {
 		return this->isConnected;
 	}
 	try {
-		this->connection.open(Url(brokerURI));
+		// initialize
-		this->session = this->connection.newSession();
+		this->connection = 0;
+		this->session = 0;
+		this->receiver = 0;
+
+		char uuidBuff[37];
+		uuid_t uuidGenerated;
+		uuid_generate_random(uuidGenerated);
+		uuid_unparse(uuidGenerated, uuidBuff);
+
+		std::string connectionOptions = "{sasl-mechanism:PLAIN,"
+			"username:guest,password:guest}";
+
+		this->connection = Connection(this->brokerURI, connectionOptions);
+		this->connection.open();
 		queue = "_edex.alert-edex_com@amq.topic_";
-		queue += session.getId().getName();
+		queue += std::string(uuidBuff);
-		QueueOptions qo;
+
-		qo.setSizePolicy(RING, 100 * 1024 * 1024, 5000);
+		std::stringstream addressBuilder;
-		session.queueDeclare(arg::queue = queue, arg::exclusive = true,
+		addressBuilder << queue;
-				arg::autoDelete = true, arg::arguments=qo);
+		addressBuilder << "; {create:always,delete:always,node:{type:queue,";
-		session.exchangeBind(arg::exchange = "amq.topic", arg::queue = queue,
+		addressBuilder << "x-bindings:[{exchange:amq.topic,queue:";
-				arg::bindingKey = "edex.alerts");
+		addressBuilder << queue;
-		subman = new SubscriptionManager(session);
+		addressBuilder << ",key:edex.alerts}]}}";
-		localQueue = new LocalQueue();
+		const std::string address = addressBuilder.str();
-		subman->subscribe(*localQueue, queue);
+
+		this->session = this->connection.createSession();
+		this->receiver = this->session.createReceiver(address);
+
 		this->isConnected = true;
 	} catch (const std::exception& error) {
-		this->isConnected = false;
+		this->cleanup();
-		cleanup();
 		throw;
 	}
 	return this->isConnected;

nativeLib/edex_com/src/EdexNotification.h

@@ -29,6 +29,7 @@
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 11/2/09       3375       brockwoo    Initial Creation
+ * 08/13/13      2257       bkowal      Update for qpid 0.18.
  *
  * </pre>
  *
@@ -43,18 +44,18 @@ typedef void CEdexNotification;
 
 #ifdef __cplusplus
 
-#include <qpid/client/Connection.h>
+#include <qpid/messaging/Connection.h>
-#include <qpid/client/Session.h>
+#include <qpid/messaging/Session.h>
-#include <qpid/client/Message.h>
+#include <qpid/messaging/Message.h>
-#include <qpid/client/MessageListener.h>
+#include <qpid/messaging/Duration.h>
-#include <qpid/client/SubscriptionManager.h>
+#include <qpid/messaging/Receiver.h>
 #include <qpid/sys/Time.h>
 #include <transport/TBufferTransports.h>
 #include <sys/timeb.h>
 #include "Notification_types.h"
 #include "NotificationProtocol.h"
 
-using namespace qpid::client;
+using namespace qpid::messaging;
 using namespace qpid::framing;
 using namespace std;
 using apache::thrift::transport::TMemoryBuffer;
@@ -65,16 +66,16 @@ private:
 
 	Connection connection;
 	Session session;
+	Receiver receiver;
+	const Duration duration;
 	bool useTopic;
 	bool sessionTransacted;
 	bool isConnected;
 	int listSize;
 	com_raytheon_uf_common_dataplugin_message_DataURINotificationMessage * mess;
-	SubscriptionManager * subman;
 	vector<string>::iterator myStringIterator;
 	std::string brokerURI;
 	std::string queue;
-	LocalQueue * localQueue;
 	bool timeout;
 	int timeoutLength;
 

nativeLib/edex_notify/.cproject

@@ -45,14 +45,14 @@
 								<option id="gnu.c.compiler.exe.release.option.debugging.level.590465920" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.default" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.misc.other.1772453324" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-m32 -c -fmessage-length=0" valueType="string"/>
 								<option id="gnu.c.compiler.option.include.paths.1577302699" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.qpid/include}&quot;"/>
+									<listOptionValue builtIn="false" value="/awips2/qpid/include"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/edex_com/src}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.563649508" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.621939508" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
 								<option id="gnu.c.link.option.paths.945694272" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.qpid/lib}&quot;"/>
+									<listOptionValue builtIn="false" value="/awips2/qpid/lib"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.thrift/lib}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/edex_com/Build x86}&quot;"/>
 								</option>
@@ -82,255 +82,6 @@
 					</sourceEntries>
 				</configuration>
 			</storageModule>
-			<storageModule moduleId="scannerConfiguration">
-				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="makefileGenerator">
-						<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1309755902;cdt.managedbuild.config.gnu.exe.release.1309755902.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.91404518;cdt.managedbuild.tool.gnu.c.compiler.input.1483689751">
-					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.944270981;cdt.managedbuild.config.gnu.exe.debug.944270981.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.503280132;cdt.managedbuild.tool.gnu.c.compiler.input.2111842514">
-					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-				</scannerConfigBuildInfo>
-			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
@@ -378,24 +129,24 @@
 								<option id="gnu.c.compiler.exe.release.option.debugging.level.832113686" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.misc.other.1624933412" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-m64 -c -fmessage-length=0" valueType="string"/>
 								<option id="gnu.c.compiler.option.include.paths.1093941043" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.qpid/include}&quot;"/>
+									<listOptionValue builtIn="false" value="/awips2/qpid/include"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/edex_com/src}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.754027704" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1572066433" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
 								<option id="gnu.c.link.option.paths.1184519300" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.qpid/lib64}&quot;"/>
+									<listOptionValue builtIn="false" value="/awips2/qpid/lib"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.thrift/lib64}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/edex_com/Build x86_64}&quot;"/>
 								</option>
 								<option id="gnu.c.link.option.ldflags.1878548950" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="-m64" valueType="string"/>
 								<option id="gnu.c.link.option.libs.961367030" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="edex_com"/>
+									<listOptionValue builtIn="false" value="qpidclient"/>
 									<listOptionValue builtIn="false" value="thrift"/>
 									<listOptionValue builtIn="false" value="qpidmessaging"/>
 									<listOptionValue builtIn="false" value="qpidtypes"/>
-									<listOptionValue builtIn="false" value="qpidclient"/>
 									<listOptionValue builtIn="false" value="qpidcommon"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1341350933" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
@@ -415,255 +166,6 @@
 					</sourceEntries>
 				</configuration>
 			</storageModule>
-			<storageModule moduleId="scannerConfiguration">
-				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="makefileGenerator">
-						<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-					<buildOutputProvider>
-						<openAction enabled="true" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1309755902;cdt.managedbuild.config.gnu.exe.release.1309755902.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.91404518;cdt.managedbuild.tool.gnu.c.compiler.input.1483689751">
-					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-				</scannerConfigBuildInfo>
-				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.944270981;cdt.managedbuild.config.gnu.exe.debug.944270981.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.503280132;cdt.managedbuild.tool.gnu.c.compiler.input.2111842514">
-					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="makefileGenerator">
-							<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-						<buildOutputProvider>
-							<openAction enabled="true" filePath=""/>
-							<parser enabled="true"/>
-						</buildOutputProvider>
-						<scannerInfoProvider id="specsFile">
-							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-							<parser enabled="true"/>
-						</scannerInfoProvider>
-					</profile>
-				</scannerConfigBuildInfo>
-			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
 			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
@@ -673,4 +175,254 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="edex_notify.cdt.managedbuild.target.gnu.exe.1393028794" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="makefileGenerator">
+				<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+			<buildOutputProvider>
+				<openAction enabled="true" filePath=""/>
+				<parser enabled="true"/>
+			</buildOutputProvider>
+			<scannerInfoProvider id="specsFile">
+				<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+				<parser enabled="true"/>
+			</scannerInfoProvider>
+		</profile>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1309755902;cdt.managedbuild.config.gnu.exe.release.1309755902.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.91404518;cdt.managedbuild.tool.gnu.c.compiler.input.1483689751">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="makefileGenerator">
+					<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.944270981;cdt.managedbuild.config.gnu.exe.debug.944270981.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.503280132;cdt.managedbuild.tool.gnu.c.compiler.input.2111842514">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="makefileGenerator">
+					<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+			<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="specsFile">
+					<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+		</scannerConfigBuildInfo>
+	</storageModule>
 </cproject>

nativeLib/edex_notify/.gitignore

@@ -1 +1,2 @@
 /Build x86
+/Build x86_64

rpms/awips2.core/Installer.ldm/component.spec

@@ -9,7 +9,7 @@
 Name: awips2-ldm
 Summary: AWIPS II LDM Distribution
 Version: %{_ldm_version}
-Release: 6
+Release: 7
 Group: AWIPSII
 BuildRoot: /tmp
 BuildArch: noarch
@@ -20,7 +20,6 @@ Vendor: Raytheon
 Packager: Bryan Kowal
 
 AutoReq: no
-Requires: awips2-notification
 Requires: qpid-cpp-client-devel
 Requires: zlib-devel
 provides: awips2-ldm
@@ -77,7 +76,7 @@ fi
 _ldm_destination=%{_build_root}/usr/local/ldm
 _ldm_destination_source=${_ldm_destination}/SOURCES
 
-_NATIVELIB_PROJECTS=( 'edexBridge' 'decrypt_file' )
+_NATIVELIB_PROJECTS=( 'edexBridge' 'decrypt_file' 'org.apache.qpid' )
 _RPM_directory=%{_baseline_workspace}/rpms
 _Installer_ldm=${_RPM_directory}/awips2.core/Installer.ldm
 
@@ -272,9 +271,28 @@ if [ ${_myHost} != "cpsbn1" -a ${_myHost} != "cpsbn2" -a ${_myHost} != "dx1" -a
 fi
 popd > /dev/null 2>&1
 
-# build decrypt_file & edexBridge
+# extract qpid libraries; build decrypt_file & edexBridge
 pushd . > /dev/null 2>&1
 cd ${_ldm_dir}/SOURCES
+
+# determine which lib directory to use
+_arch=`uname -i`
+_qpid_lib_dir="lib"
+if [ "${_arch}" = "x86_64" ]; then
+   _qpid_lib_dir="lib64"
+fi
+
+/bin/tar -xvf org.apache.qpid.tar org.apache.qpid/${_qpid_lib_dir}/*
+if [ $? -ne 0 ]; then
+   echo "FATAL: failed to extract the qpid libraries!"
+   exit 1
+fi
+cp -Pf org.apache.qpid/${_qpid_lib_dir}/* ${_ldm_root_dir}/lib
+if [ $? -ne 0 ]; then
+   echo "FATAL: failed to copy the qpid libraries to the ldm lib directory."
+   exit 1
+fi
+
 /bin/tar -xf decrypt_file.tar
 if [ $? -ne 0 ]; then
    echo "FATAL: failed to untar decrypt_file.tar!"

rpms/awips2.core/Installer.notification/component.spec

@@ -28,6 +28,7 @@ Packager: Bryan Kowal
 
 AutoReq: no
 requires: boost >= 1.33.1
+requires: awips2-qpid-lib
 provides: awips2-notification
 
 %description

rpms/awips2.core/Installer.notification/scripts/profile.d/awips2Notification.csh

@@ -2,11 +2,12 @@
 
 # Determine where notification has been installed.
 set NOTIFICATION_INSTALL="/awips2/notification"
+set QPID_LIB_DIR="/awips2/qpid/lib"
 
 if $?LD_LIBRARY_PATH then
-   setenv LD_LIBRARY_PATH ${NOTIFICATION_INSTALL}/lib:$LD_LIBRARY_PATH
+   setenv LD_LIBRARY_PATH ${NOTIFICATION_INSTALL}/lib:${QPID_LIB_DIR}:$LD_LIBRARY_PATH
 else
-   setenv LD_LIBRARY_PATH ${NOTIFICATION_INSTALL}/lib
+   setenv LD_LIBRARY_PATH ${NOTIFICATION_INSTALL}/lib:${QPID_LIB_DIR}
 endif
 
 if $?PATH then

rpms/awips2.core/Installer.notification/scripts/profile.d/awips2Notification.sh

@@ -2,23 +2,30 @@
 
 # Is awips2-notification Installed?
 rpm -q awips2-notification > /dev/null 2>&1
-RC=$?
+if [ $? -ne 0 ]; then
-if [ ${RC} -ne 0 ]; then
    return
 fi
 
 # Determine Where awips2-notification Has Been Installed.
 NOTIFICATION_INSTALL="/awips2/notification"
-if [ "${NOTIFICATION_INSTALL}" = "" ]; then
+QPID_LIB_DIR="/awips2/qpid/lib"
-   return
-fi
 
 # Update The Environment.
 # Determine if awips2-notification is Already On LD_LIBRARY_PATH
 CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${NOTIFICATION_INSTALL}`
 if [ "${CHECK_PATH}" = "" ]; then
    # awips2-notification Is Not On LD_LIBRARY_PATH; Add It.
-   export LD_LIBRARY_PATH=${NOTIFICATION_INSTALL}/lib:${LD_LIBRARY_PATH}
+   _lib_dir=${NOTIFICATION_INSTALL}/lib
+   if [ -d ${NOTIFICATION_INSTALL}/lib64 ]; then
+      _lib_dir=${NOTIFICATION_INSTALL}/lib64
+   fi
+   export LD_LIBRARY_PATH=${_lib_dir}:${LD_LIBRARY_PATH}
+fi
+
+# Determine if the qpid lib directory is already on LD_LIBRARY_PATH
+CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${QPID_LIB_DIR}`
+if [ "${CHECK_PATH}" = "" ]; then
+   export LD_LIBRARY_PATH=${QPID_LIB_DIR}:$LD_LIBRARY_PATH
 fi
 
 # Determine if awips2-notification Is Already Part Of The Path.

rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

@@ -0,0 +1,122 @@
+%define _build_arch %(uname -i)
+%define _qpid_version 0.18
+%define _qpid_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global qpid_src_dir qpid-%{version}
+#
+# AWIPS II QPID native Spec File
+#
+
+Name: awips2-qpid-lib
+Summary: AWIPS II QPID Native Library Distribution
+Version: %{_qpid_version}
+Release: 1.el6
+Group: AWIPSII
+BuildRoot: %{_build_root}
+BuildArch: %{_build_arch}
+URL: N/A
+License: N/A
+Distribution: N/A
+Vendor: Raytheon
+Packager: Bryan Kowal
+
+Source0: %{qpid_src_dir}.tar.gz
+
+AutoReq: no
+BuildRequires: awips2-python
+provides: awips2-qpid-lib
+
+%description
+AWIPS II QPID Lib Distribution - Contains the qpid shared libraries and
+header files for qpid %{_qpid_version}.
+
+%prep
+# Ensure that a "buildroot" has been specified.
+if [ "%{_build_root}" = "" ]; then
+   echo "ERROR: A BuildRoot has not been specified."
+   echo "FATAL: Unable to Continue ... Terminating."
+   exit 1
+fi
+
+if [ -d %{_build_root} ]; then
+   rm -rf %{_build_root}
+fi
+if [ -d %{_qpid_build_loc} ]; then
+   rm -rf %{_qpid_build_loc}
+fi
+mkdir -p %{_qpid_build_loc}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+cp -v %SOURCE0 %{_qpid_build_loc}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}
+tar -xvf %SOURCE0
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null 2>&1
+
+%build
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}/%{qpid_src_dir}/cpp
+./bootstrap
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+./configure --prefix=%{_qpid_build_loc}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+make
+if [ $? -ne 0 ]; then
+   exit 1
+fi 
+popd > /dev/null 2>&1
+
+%install
+/bin/mkdir -p %{_qpid_build_loc}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}/%{qpid_src_dir}/cpp
+make install
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null 2>&1
+
+/bin/mkdir -p %{_build_root}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+# copy qpid lib and include directories.
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/lib \
+   %{_build_root}/awips2/qpid
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/include \
+   %{_build_root}/awips2/qpid
+   
+%pre
+%post
+%preun
+%postun
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{_qpid_build_loc}
+
+%files
+%defattr(644,awips,fxalpha,755)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+/awips2/qpid/lib/*
+%dir /awips2/qpid/include
+/awips2/qpid/include/*

rpms/awips2.qpid/0.18/deploy.builder/build.sh

@@ -54,6 +54,15 @@ rpmbuild -ba \
 if [ $? -ne 0 ]; then
    exit 1
 fi
+rpmbuild -ba \
+   --define "_topdir ${TOPDIR}" \
+   --define "_baseline_workspace ${WORKSPACE}" \
+   --define "_build_root ${AWIPSII_BUILD_ROOT}" \
+   --buildroot ${AWIPSII_BUILD_ROOT} \
+   SPECS/qpid-lib.spec
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 popd > /dev/null
 
 exit 0

rpms/build/common/rpms.sh

@@ -57,6 +57,22 @@ function buildQPID()
    if [ $? -ne 0 ]; then
       return 1
    fi
+   cd ../x86_64
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build Qpid v0.18 lib."
+      return 1
+   fi
+   if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/x86_64 ]; then
+      mkdir -p ${AWIPSII_TOP_DIR}/RPMS/x86_64
+      if [ $? -ne 0 ]; then
+         exit 1
+      fi
+   fi
+   /bin/cp -v *.rpm ${AWIPSII_TOP_DIR}/RPMS/x86_64
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build Qpid v0.18 lib."
+      return 1
+   fi
    popd > /dev/null 2>&1
 
    pushd . > /dev/null 2>&1