xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2

Browse source 
Former-commit-id: 99263f79e1 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]
Former-commit-id: 5bd22b74c6
This commit is contained in:
Fay.Liang 2014-11-20 13:32:25 -05:00
commit 7aa08b8ba4
5 changed files with 56 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
View file

@ -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"

78
cave/com.raytheon.viz.gfe/localization/gfe/weGroups/HTI.xml
View file

@ -1,42 +1,42 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<WEGroup name="HTI">
<WEItem parmID="SurgeHtPlusTideNAVDnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMLLWnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMSLnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationTimingnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationMaxnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMHHWnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="ProposedSS_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="ProposedSSnc_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="QPF_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="QPFtoFFGRatio_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="ProposedSS_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsN64_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="prob64_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="TornadoThreat_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="WindGust_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="Wind_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsD34_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="prob34_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="FloodingRainThreat_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="StormSurgeThreat_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="prob50_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pws64int_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsD64_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pws34int_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="WindThreat_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsN34_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationMax_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMHHW_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMLLW_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMSL_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideNAVD_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationTiming_SFC:MFL_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationMax_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMHHW_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMLLW_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMSL_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideNAVD_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationTiming_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="Hazards_SFC:MFL_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideNAVDnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMLLWnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMSLnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationTimingnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationMaxnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMHHWnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="ProposedSS_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="ProposedSSnc_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="QPF_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="QPFtoFFGRatio_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="ProposedSS_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsN64_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="prob64_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="TornadoThreat_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="WindGust_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="Wind_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsD34_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="prob34_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="FloodingRainThreat_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="StormSurgeThreat_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="prob50_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pws64int_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsD64_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pws34int_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="WindThreat_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="pwsN34_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationMax_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMHHW_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMLLW_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMSL_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideNAVD_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationTiming_SFC:SITE_GRID__ISC_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationMax_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMHHW_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMLLW_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideMSL_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="SurgeHtPlusTideNAVD_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="InundationTiming_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
<WEItem parmID="Hazards_SFC:SITE_GRID__Fcst_00000000_0000" relativeCycleNumber="-1"/>
</WEGroup>

1
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
View file

@ -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

15
edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
View file

@ -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>
</project>

1
rpms/awips2.core/Installer.gfesuite-server/component.spec
View file

@ -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