Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client

Former-commit-id: 70f1516d0cc4dcd62214453974f1e65dd57d1ddd

nativeLib/edex_com/.cproject

@@ -67,6 +67,7 @@
 								</option>
 								<option id="gnu.cpp.link.option.paths.1136584520" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="/usr/local/lib"/>
+									<listOptionValue builtIn="false" value="/awips2/notification/lib"/>
 									<listOptionValue builtIn="false" value="/usr/kerberos/lib"/>
 									<listOptionValue builtIn="false" value="/awips2/qpid/lib"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/org.apache.thrift/lib}&quot;"/>

nativeLib/edex_com/src/EdexNotification.cpp

@@ -47,7 +47,7 @@ EdexNotification::EdexNotification(const string & brokerURI) {
 	this->brokerURI = brokerURI;
 	this->isConnected = false;
 	this->listSize = 0;
-	this->mess = new DataURINotificationMessage();
+	this->mess = new com_raytheon_edex_msg_DataURINotificationMessage();
 	this->timeout = false;
 	this->timeoutLength = 999999;
 	this->subman = NULL;

nativeLib/edex_com/src/EdexNotification.h

@@ -69,7 +69,7 @@ private:
 	bool sessionTransacted;
 	bool isConnected;
 	int listSize;
-	DataURINotificationMessage * mess;
+	com_raytheon_edex_msg_DataURINotificationMessage * mess;
 	SubscriptionManager * subman;
 	vector<string>::iterator myStringIterator;
 	std::string brokerURI;

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

@@ -39,8 +39,9 @@ fi
 mkdir -p ${RPM_BUILD_ROOT}/awips2/notification
 mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
 
-PROFILE_D_DIR="Installer.rpm/awips2.core/Installer.notification/scripts/profile.d"
-cp ${WORKSPACE_DIR}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
+RPM_CORE_PROJECT_DIR="${WORKSPACE_DIR}/Installer.rpm/awips2.core"
+PROFILE_D_DIR="${RPM_CORE_PROJECT_DIR}/Installer.notification/scripts/profile.d"
+cp ${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
 
 %build
 #---------------------------------------------------------------------------#
@@ -76,13 +77,21 @@ function copyLegal()
       
    rm -f ${WORKSPACE_DIR}/Installer.rpm/legal/FOSS_licenses.tar    
 }
-NOTIFICATION_TAR_FILE_DIR="packages/notification"
+RPM_CORE_PROJECT_DIR="${WORKSPACE_DIR}/Installer.rpm/awips2.core"
+NOTIFICATION_TAR_FILE_DIR="${RPM_CORE_PROJECT_DIR}/Installer.notification/src"
 NOTIFICATION_TAR_FILE="${NOTIFICATION_TAR_FILE_DIR}/edex_com.tar.bz2"
 
 cd ${RPM_BUILD_ROOT}/awips2
-/bin/gtar -xpf ${AWIPSCM_SHARE}/${NOTIFICATION_TAR_FILE}
+/bin/gtar -xpf ${NOTIFICATION_TAR_FILE}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 
-cp -r ${RPM_BUILD_ROOT}/awips2/edex_com/* ${RPM_BUILD_ROOT}/awips2/notification/
+cp -r ${RPM_BUILD_ROOT}/awips2/edex_com/* \
+   ${RPM_BUILD_ROOT}/awips2/notification/
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 # Remove the boost rpms directory
 rm -rf ${RPM_BUILD_ROOT}/awips2/notification/rpms
 rm -rf ${RPM_BUILD_ROOT}/awips2/edex_com