From 89d1309974d57be959467fe0e1bf184cba22a563 Mon Sep 17 00:00:00 2001
From: "Shawn.Hooper" <Shawn.Hooper@noaa.gov>
Date: Thu, 12 Feb 2015 17:32:05 -0500
Subject: [PATCH] ASM #15083 - Updates to allow nwps to be released in the
 gfesuite-server rpm

Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 0d9e4dd69ebf0794d01692f53ad8438144d0724d [formerly 060a169904bb7f23132c80fffca6ce8af50ed8fb] [formerly 9c637bda0bb0cebe366f067550a336be6a2286b0 [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]
Former-commit-id: 9c637bda0bb0cebe366f067550a336be6a2286b0
Former-commit-id: 5ff97ae1887be0c84d6dd99a9eab450bc3a00776
---
 edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml  | 13 +++++++++++++
 .../Installer.gfesuite-server/component.spec        |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml b/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
index b2facf28c0..6a2f6ea9e6 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
@@ -54,6 +54,7 @@
 	<property name="gfe.suite.home" value="${install.dir}" />
 	<property name="gfe.suite.bin" value="${install.dir}/bin" />
 	<property name="gfe.suite.hti" value="${install.dir}/hti" />
+	<property name="gfe.suite.nwps" value="${install.dir}/nwps" />
 
 	<!-- Create the copy filter -->	
 	<!-- filter set -->
@@ -68,8 +69,10 @@
 		<echo message="deploy.client=${deploy.client}" />
 		<mkdir dir="${gfe.suite.bin}"/>
 		<mkdir dir="${gfe.suite.hti}"/>
+		<mkdir dir="${gfe.suite.nwps}"/>
 		<antcall target="-deploy.cli.common"/>
 		<antcall target="-deploy.hti"/>
+		<antcall target="-deploy.nwps"/>
 		<antcall target="-deploy.svcBackup"/>
 		<!-- <antcall target="-deploy.cli.client"/> -->
 		<antcall target="-set.permissions"/>
@@ -101,6 +104,16 @@
 		</copy>
 	</target>
 		
+	<target name="-deploy.nwps" 
+		description="Deploys NWPS software to a specific directory">
+		<!-- copy the CLI tools to the deploy directory -->
+		<echo message="Copying in NWPS files" />
+		<copy todir="${gfe.suite.nwps}" overwrite="true">
+			<fileset dir="${basedir}/nwps"/>
+			<filterset refid="installer.filter.set"/>
+		</copy>
+	</target>
+		
 	<target name="-deploy.svcBackup" if="deploy.svcBackup"
 		description="Deploys service backup scripts to a specific directory">
 		<echo message="Copying in service backup scripts" />
diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec
index 5d322ca3fb..bec10fc43a 100644
--- a/rpms/awips2.core/Installer.gfesuite-server/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec
@@ -101,9 +101,13 @@ rm -rf ${RPM_BUILD_ROOT}
 /awips2/GFESuite/bin/*
 %dir /awips2/GFESuite/hti/bin
 /awips2/GFESuite/hti/bin/*
+%dir /awips2/GFESuite/nwps/bin
+/awips2/GFESuite/nwps/bin/*
 %defattr(755,awips,fxalpha,777)
 %dir /awips2/GFESuite/hti/etc
 /awips2/GFESuite/hti/etc/*
+%dir /awips2/GFESuite/nwps/domains
+/awips2/GFESuite/nwps/domains/*
 %defattr(644,awips,fxalpha,755)
 %dir /awips2/GFESuite/bin/src
 /awips2/GFESuite/bin/src/*