Merge branch 'unidata_16.2.2' of github.com:Unidata/awips2 into unidata_16.2.2

Conflicts: cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
2016-10-04 09:29:46 -06:00 · 2016-10-04 09:29:46 -06:00 · 30161defc8
commit 30161defc8
parent bce3575c63 5b3f332cd8
18 changed files with 44 additions and 149 deletions
--- a/rpms/legal/Master_Rights_File.pdf
+++ b/rpms/legal/Master_Rights_File.pdf
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
@ -26,9 +26,9 @@
 	targetID="com.raytheon.uf.viz.d2d.ui.perspectives.D2D5Pane">
    	<view id="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow"
    		relative="org.eclipse.ui.editorss" 
-    		relationship="bottom"
-    		ratio="0.8"
-    		visible="false"/>	
+    		relationship="right"
+    		ratio="0.85"
+    		visible="false"/>
  </perspectiveExtension> 
 </extension>

--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/baseTPC.xml
@ -19,6 +19,10 @@
        further_licensing_information.
    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
+		menuText="Hurricane Track Summaries" id="hurricaneTrackSummary">
+		<substitute key="productType" value="TCMAT1,TCMAT2,TCMAT3,TCMAT4,TCMAT5,TCMEP1,TCMEP2,TCMEP3,TCMEP4,TCMEP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMWP1,TCMWP2,TCMWP3,TCMWP4,TCMWP5,TCP" />
+	</contribute>
 	<contribute xsi:type="subMenu" menuText="Hurricane"
 	            id="ncepHydro.tpc.hurricane">
 	    <contribute xsi:type="subinclude" fileName="menus/ncepHydro/tpc/hurricane.xml"/>
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml
@ -19,23 +19,6 @@
        further_licensing_information.
    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="titleItem" titleText="------ Track Summaries ------"
-		id="TrackSummaryLine" />
-	<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
-		menuText="Atlantic" id="atlanticTrackSummary">
-		<substitute key="productType" value="TCMAT1,TCMAT2,TCMAT3,TCMAT4,TCMAT5" />
-		<substitute key="legend" value="Atlantic" />
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
-		menuText="E Pacific" id="easternPacificTrackSummary">
-		<substitute key="productType" value="TCMEP1,TCMEP2,TCMEP3,TCMEP4,TCMEP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5" />
-		<substitute key="legend" value="E Pacific" />
-	</contribute>
-	<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
-		menuText="W Pacific" id="westernPacificTrackSummary">
-		<substitute key="productType" value="TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMWP1,TCMWP2,TCMWP3,TCMWP4,TCMWP5,TCP" />
-		<substitute key="legend" value="W Pacific" />
-	</contribute>
 	<contribute xsi:type="subMenu" menuText="Hourly Forecasts">
 		<contribute xsi:type="bundleItem" file="bundles/HourlyForecastPlot.xml"
 			menuText="AT1" id="AT1">
@ -144,4 +127,4 @@
 	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/CHGQLMGuidancePlot.xml"
 		menuText="CHGQLM guidance" id="CHGQLMguidance" useReferenceTime="true">
 	</contribute>
-</menuTemplate>
+</menuTemplate>
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
@ -81,8 +81,6 @@ public class D2D5Pane implements IPerspectiveFactory {
        // Get the editor area.
        String editorArea = layout.getEditorArea();
        layout.setFixed(false);
-        layout.addPlaceholder("com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow", IPageLayout.RIGHT,0.85f, editorArea); 
-        //layout.addPlaceholder("edu.ucar.unidata.viz.radar.radarBrowser", IPageLayout.RIGHT,0.65f, editorArea); 
        layout.addPlaceholder("gov.noaa.gsd.viz.ensemble.tool.viewer", IPageLayout.RIGHT,0.6f, editorArea); 

        List<String> baseViewsToAdd = new ArrayList<String>();
--- a/cave/com.raytheon.uf.viz.tcs/localization/bundles/TrackSummaryPlot.xml
+++ b/cave/com.raytheon.uf.viz.tcs/localization/bundles/TrackSummaryPlot.xml
@ -27,7 +27,7 @@
 					<loadProperties loadWithoutData="true">
 						<capabilities/>
 					</loadProperties>
-					<resourceData xsi:type="tcsResourceData" plotSource="${legend} Hurricane Tracks"
+					<resourceData xsi:type="tcsResourceData" plotSource="Hurricane Tracks"
 						isUpdatingOnMetadataOnly="false" isRequeryNecessaryOnTimeMatch="true">
 						<metadataMap>
 							<mapping key="pluginName">
--- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/index.xml
+++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/index.xml
@ -19,10 +19,10 @@
        further_licensing_information.
    -->
 <menuContributionFile>
-    <include installTo="menu:ncepHydro?after=SPC" 
+    <include installTo="menu:ncepHydro?after=TPC" 
             fileName="menus/hydro/baseHydroQPE.xml"
             subMenu="QPE"/>
-    <include installTo="menu:ncepHydro?after=SPC" 
+    <include installTo="menu:ncepHydro?after=TPC" 
             fileName="menus/hydro/baseHydroQPF.xml"
             subMenu="QPF"/>
    <include installTo="menu:ncepHydro?before=HydroMenuEnd" 
@ -38,4 +38,4 @@
    <include installTo="menu:ncepHydro?after=HYDRO"
 			 fileName="menus/hydro/baseHydroApps.xml"/> 
 -->
-</menuContributionFile>
+</menuContributionFile>
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml
@ -82,10 +82,5 @@
 	        <substitute key="posOffset" value="1800"/>
 	        <substitute key="negOffset" value="1800"/>       
 	    </contribute>
-	    
-	    <contribute xsi:type="separator" id="msasSeparator"/>
-	    <contribute xsi:type="titleItem" 
-			titleText="------ MSAS Obs------" id="msasLine"/>
-		<contribute xsi:type="subinclude" fileName="menus/obs/baseMSASObs.xml"/>
    </contribute>
-</menuTemplate>
+</menuTemplate>
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSurface.xml
@ -164,6 +164,7 @@
 			<substitute key="posOffset" value="0"/>
 		    <substitute key="negOffset" value="43200"/> 
 		</contribute>
+		
    </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/Redbook.xml" 
              menuText="MSLP Analysis" id="MSLPressureAnalysis">
--- a/cave/com.raytheon.viz.product.awips/plugin_customization.ini
+++ b/cave/com.raytheon.viz.product.awips/plugin_customization.ini
@ -4,4 +4,4 @@ org.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
 org.eclipse.ui.editors/lineNumberRuler=true
 org.eclipse.core.resources/snapshots.operations=2147483647
 org.eclipse.core.resources/description.snapshotinterval=2147483647
-org.eclipse.ui/SHOW_MEMORY_MONITOR = true
+org.eclipse.ui/SHOW_MEMORY_MONITOR = false
--- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ConvectionProbability.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ConvectionProbability.xml
@ -57,7 +57,7 @@
                        <perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="true"/>
                        <capabilities>
                            <capability xsi:type="colorableCapability" colorAsString="white"/>
-                            <capability xsi:type="densityCapability" density="1.0"/>
+                            <capability xsi:type="densityCapability" density="0.25"/>
                            <capability xsi:type="magnificationCapability" magnification="1.0"/>
                            <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
                            <capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
--- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LightningProbability.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/LightningProbability.xml
@ -57,7 +57,7 @@
                        <perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="true"/>
                        <capabilities>
                            <capability xsi:type="colorableCapability" colorAsString="white"/>
-                            <capability xsi:type="densityCapability" density="1.0"/>
+                            <capability xsi:type="densityCapability" density="0.25"/>
                            <capability xsi:type="magnificationCapability" magnification="1.0"/>
                            <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
                            <capability xsi:type="displayTypeCapability" displayType="CONTOUR"/>
--- a/rpms/awips2.core/Installer.version/scripts/profile.d/awips2.sh
+++ b/rpms/awips2.core/Installer.version/scripts/profile.d/awips2.sh
@ -121,3 +121,6 @@ if [ -d ${LDM_INSTALL} ]; then
  fi
 fi

+if [ -d /awips2/yajsw/lib/core/jna/com/sun/jna ]; then
+  export LD_LIBRARY_PATH=/awips2/yajsw/lib/core/jna/com/sun/jna/linux-amd64:$LD_LIBRARY_PATH
+fi
--- a/rpms/awips2.core/Installer.yajsw/component.spec
+++ b/rpms/awips2.core/Installer.yajsw/component.spec
@ -1,80 +0,0 @@
-%define _yajsw_version 11.11
-
-#
-# AWIPS II YAJSW Spec File
-#
-
-Name: awips2-yajsw
-Summary: AWIPS II yajsw Distribution
-Version: %{_yajsw_version}
-Release: 3
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: noarch
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-
-provides: awips2-yajsw
-requires: awips2-java
-
-%description
-AWIPS II yajsw Distribution - A custom compilation of yajsw ${_yajsw_version} used
-by several AWIPS II components.
-
-# disable jar repacking
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
-
-%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
-/bin/mkdir -p %{_build_root}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-%install
-DIST_DIR="%{_baseline_workspace}/foss/yajsw-%{_yajsw_version}/packaged"
-
-YAJSW_ZIP="yajsw-dist.zip"
-
-unzip ${DIST_DIR}/${YAJSW_ZIP} -d %{_build_root}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-mkdir -p %{_build_root}/etc
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%dir /awips2
-%dir /awips2/yajsw
-/awips2/yajsw/*.jar
-/awips2/yajsw/*.txt
-%dir /awips2/yajsw/lib
-/awips2/yajsw/lib/*
-
-%defattr(755,awips,fxalpha,755)
-%dir /awips2/yajsw/scripts
-/awips2/yajsw/scripts/*.sh
--- a/rpms/awips2.upc/Installer.edex-upc/programs/edex
+++ b/rpms/awips2.upc/Installer.edex-upc/programs/edex
@ -24,9 +24,10 @@
 #                                                                       #
 #-----------------------------------------------------------------------#
 # ChangeLog                                                             #
-# 07/2011 M.James/Unidata       Created                                 #
-# 10/2015 M.James/Unidata       Log files fixed; purge check added      #
-# 11/2015 M.James/Unidata       Added CAVE user count as "edex users"   #
+# 07/2011 M.James/Unidata	Created					#
+# 10/2015 M.James/Unidata	Log files fixed; purge check added	#
+# 11/2015 M.James/Unidata	Added CAVE user count as "edex users"	#
+# 10/2016 M.James/Unidata	No longer need to edit ldmd.conf	#
 #-----------------------------------------------------------------------#
 . /etc/profile.d/awips2.sh
 # directories definitions
@ -38,7 +39,6 @@ LOG_PATH=${EDEX_PATH}/logs
 # files
 PG_FILE=${DATA_PATH}/pg_hba.conf
 EDEX_ENV_FILE=${EDEX_PATH}/bin/setup.env
-LDMD_CONF=${AWIPS_HOME}/ldm/etc/ldmd.conf

 # valid options
 options=( 'status' 'start' 'stop' 'log' 'setup' 'purge' 'users')
@ -50,9 +50,9 @@ IP=`/sbin/ifconfig $usedev | grep -v "inet6" | grep "inet" | awk '{ print $2 }'

 # truncate
 IP_CIDR="${IP%.*}"
-editFiles=($PG_FILE $EDEX_ENV_FILE $LDMD_CONF)
-boolFiles=(true true true)
-editFuncs=(edit_pg edit_edex edit_ldm)
+editFiles=($PG_FILE $EDEX_ENV_FILE)
+boolFiles=(true true)
+editFuncs=(edit_pg edit_edex)

 YMD=`date '+%Y%m%d'`

@ -208,12 +208,6 @@ edit_pg() { # edex pg_hba.conf
   echo '       File backed up to '$PG_FILE'.setup_'$YMD
 }

-edit_ldm() { # edex ldmd.conf and registry.xml
-   sed -i.setup_$YMD 's/EDEX_HOSTNAME/localhost/g' $LDMD_CONF
-   echo '[edit] Hostname localhost added to '$LDMD_CONF
-}
-
-
 edit_edex() { # setup.env automatic edit
   sed -i.setup_$YMD 's/localhost/'$HOSTNAME'/g' $EDEX_ENV_FILE
   echo '[edit] '$HOSTNAME' added to '$EDEX_ENV_FILE
@ -295,7 +289,8 @@ edex_setup() { # setup IP subnet and domains for EDEX, prompt user for confirm
      echo '      ** Missing '$HOSTNAME
      continue=true
   fi
-
+   #echo '[edit] ldm regutil...'
+   su - awips -c 'regutil -s '$HOSTNAME' /hostname'
   echo ''
   edex_edits
   if [ $continue=true ]; then
--- a/rpms/awips2.upc/Installer.ldm/component.spec
+++ b/rpms/awips2.upc/Installer.ldm/component.spec
@ -268,9 +268,6 @@ cd ..
 if [ $? -ne 0 ]; then
   exit 1
 fi
-# TODO: change to use regutil
-sed -i 's/EDEX_HOSTNAME/'${_myHost}'/' ${_ldm_dir}/etc/ldmd.conf
-#sed -i 's/<size>500M<\/size>/<size>1500M<\/size>/' ${_ldm_dir}/etc/registry.xml

 if [ ! -h /awips2/ldm/logs ]; then
  ln -s /awips2/ldm/var/logs /awips2/ldm/
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
@ -92,26 +92,25 @@ EXEC	"rtstats -h rtstats.unidata.ucar.edu"
 # 
 # DEFAULT
 #
-REQUEST NEXRAD3 ".*" idd.unidata.ucar.edu
+REQUEST NEXRAD3 ".*/p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA|NVW|NTV|NST|NME|NHI|NSS).*" idd.unidata.ucar.edu
 REQUEST FNEXRAD|IDS|DDPLUS|UNIWISC ".*" idd.unidata.ucar.edu
 REQUEST NGRID ".*" idd.unidata.ucar.edu
-# VIIRS only (do not request simulated GOES-R)
-REQUEST NOTHER "^TIP... KNES" idd.unidata.ucar.edu
+REQUEST NOTHER "^TIP... KNES.*" idd.unidata.ucar.edu
 REQUEST HDS|NIMAGE ".*" idd.unidata.ucar.edu
 #REQUEST	LIGHTNING	".*"	idd.unidata.ucar.edu
 #
-# By default CONDUIT ingest GFS.25deg, NAM12, NAM40, NAM90, RAP, NDFD
+# By default CONDUIT will ingest GFS0.5deg, NAM12, NAM40, RAP40
 #
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[0]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[1]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[2]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[3]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[4]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[5]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[6]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[7]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[8]$"	idd.unidata.ucar.edu
-REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[9]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[0]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[1]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[2]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[3]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[4]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[5]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[6]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[7]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[8]$"	idd.unidata.ucar.edu
+REQUEST	CONDUIT	".(pgrb2.0p50|awip12|awip3d|awp236|awp252|nwstg/NWS_0).[9]$"	idd.unidata.ucar.edu
 #
 # NLDN (Restricted Access)
 #
@ -127,7 +126,7 @@ REQUEST	CONDUIT	"(0p25|awip12|awip3d|rap|nwstg/NWS_0).*[9]$"	idd.unidata.ucar.ed
 #
 # CMC
 #
-REQUEST CMC ".*" idd.unidata.ucar.edu
+#REQUEST CMC ".*" idd.unidata.ucar.edu
 #
 # NSSL MRMS (Restricted Access)
 #
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
@ -131,7 +131,7 @@ FNEXRAD	^rad/NEXRCOMP/(...)/(...)_(........)_(....)
 #
 # Partial Feed (best for performance on most systems)
 #
-NEXRAD3	^SDUS[23578]. .... (......) /p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA)(...)
+NEXRAD3	^SDUS[23578]. .... (......) /p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0Q|N0S|N0U|OHA|NVW|NTV|NST|NME|NHI|NSS)(...)
 	FILE	-overwrite -close -edex /awips2/data_store/radar/\3/\2/\3_\2_\1_(seq).rad
 ##
 ## ACARS (restricted to NWS use only)