From 2f954d65bea97671f39b6f427baf334b87850bc6 Mon Sep 17 00:00:00 2001
From: Shawn Hooper <Shawn.Hooper@noaa.gov>
Date: Thu, 20 Nov 2014 13:07:30 -0500
Subject: [PATCH] VLab Issue #5395 - Build fixes and gfeConfig.py update

Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334cdf7700c5b64640216c21e3ffc97caf [formerly b7369c5eef086a90cbcdce9c10694cf765c17cfb] [formerly cf72b5753da9d752a5830e4741f39a93dc1abc81 [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: cf72b5753da9d752a5830e4741f39a93dc1abc81
Former-commit-id: 330eae9f9ed0dc530c53bb20ecfde2c57aa7c758
---
 .../gfe/userPython/gfeConfig/gfeConfig.py         |  2 +-
 .../META-INF/MANIFEST.MF                          |  1 +
 .../com.raytheon.uf.tools.gfesuite/deploy.xml     | 15 ++++++++++++++-
 .../Installer.gfesuite-server/component.spec      |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
index aa2dadfdf0..742b42c188 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
@@ -395,7 +395,7 @@ TemporalEditorWEMode = "VISIBLE"
 #ProductOutputDialog_bgColor = "#d0d0d0"
 #ProductOutputDialog_wrapMode = 1  #default, if not listed in wrapPils, nonWrap
 ProductOutputDialog_wrapPils = []
-ProductOutputDialog_nonWrapPils = ['AFM','PFM','FWF','SFT','WCN','FWS']
+ProductOutputDialog_nonWrapPils = ['AFM','PFM','FWF','SFT','WCN','FWS','TCV','HLS']
 #ProductOutputDialog_wrapSize = 66
 #ProductOutputDialog_lockColor = "blue"
 #ProductOutputDialog_frameColor = "red"
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
index 30a5ab04ca..9bf886a081 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@ Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.11.1",
  com.google.guava;bundle-version="1.0.0",
  com.raytheon.uf.edex.auth;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization.comm,
+ com.raytheon.uf.edex.python.decoder;bundle-version="1.12.1174",
  org.apache.commons.io;bundle-version="2.4.0"
 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
 Export-Package: com.raytheon.uf.edex.activetable
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml b/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
index 505ae6f152..b2facf28c0 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
@@ -53,6 +53,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" />
 
 	<!-- Create the copy filter -->	
 	<!-- filter set -->
@@ -66,7 +67,9 @@
 		<echo message="Updating ${gfe.suite.bin} with latest GFESuite tools" />
 		<echo message="deploy.client=${deploy.client}" />
 		<mkdir dir="${gfe.suite.bin}"/>
+		<mkdir dir="${gfe.suite.hti}"/>
 		<antcall target="-deploy.cli.common"/>
+		<antcall target="-deploy.hti"/>
 		<antcall target="-deploy.svcBackup"/>
 		<!-- <antcall target="-deploy.cli.client"/> -->
 		<antcall target="-set.permissions"/>
@@ -88,6 +91,16 @@
     	</copy>
 	</target>
 	
+	<target name="-deploy.hti" 
+		description="Deploys HTI software to a specific directory">
+		<!-- copy the CLI tools to the deploy directory -->
+		<echo message="Copying in HTI files" />
+		<copy todir="${gfe.suite.hti}" overwrite="true">
+			<fileset dir="${basedir}/hti"/>
+			<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" />
@@ -114,4 +127,4 @@
 		        </fileset>
 		</chmod>
 	</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec
index fffd18d171..5d322ca3fb 100644
--- a/rpms/awips2.core/Installer.gfesuite-server/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec
@@ -81,6 +81,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
+
 # Copy the profile.d scripts.
 PROFILE_D_DIR="rpms/common/environment/awips2-gfesuite/profile.d"
 cp %{_baseline_workspace}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d