Merge remote-tracking branch 'origin/unidata_16.2.2' into unidata_16.2.2-osx

This commit is contained in:
Michael James 2016-12-22 12:46:17 -07:00
commit 957f342975
18 changed files with 46 additions and 254 deletions

View file

@ -1,38 +1,21 @@
### EDEX localization related variables ###
export AW_SITE_IDENTIFIER=BOU
## Cluster id can be set to the cluster's id (example:tbw for dx1-tbwo)
## it will be autogenerated if not set
export CLUSTER_ID=NCF
# Change the NCF_HOST to be the IP address of the server acting as the NCF server
export DATADELIVERY_HOST=thredds.ucar.edu
export EBXML_REGISTRY_FEDERATION_ENABLED=true
export EBXML_REGISTRY_WEBSERVER_PORT=80
export EBXML_THRIFT_SERVICE_PORT=9588
export EDEX_SERVER=localhost
# database names
# database
export DC_DB_NAME=dc_ob7oax
export FXA_DB_NAME=fxatext
export HM_DB_NAME=hmdb
export IH_DB_NAME=hd_ob92oax
# Resolve conflict on AFOS PILs by finding site with first letter in the following order.
export PREFERRED_AFOS_FIRST_LETTER="KCPTXM"
### end of localization variables ###
# setup environment for HPE
export DATA_ARCHIVE_ROOT=/awips2/data_store
# setup db connections
export DB_ADDR=localhost
# postgres connection
export DB_ADDR=${EDEX_SERVER}
export DB_PORT=5432
# setup connection to qpid
export BROKER_ADDR=localhost
# pypies hdf5 connection
export PYPIES_SERVER=http://${EDEX_SERVER}:9582
export BROKER_ADDR=${EDEX_SERVER}
# setup hdf5 connection if pypies is enabled
export PYPIES_SERVER=http://${BROKER_ADDR}:9582
# moved here from environment.xml
# these values are returned to clients that contact the localization service
export HTTP_PORT=9581
export HTTP_SERVER_PATH=/services
@ -42,18 +25,16 @@ export JMS_VIRTUALHOST=edex
export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/api/latest/connection/${JMS_VIRTUALHOST}
export RADAR_SERVER=tcp://${BROKER_ADDR}:8813
# set the AWIPS II shared directory
# data delivery config
#export CLUSTER_ID=NCF
#export DATADELIVERY_HOST=thredds.ucar.edu
#export EBXML_REGISTRY_FEDERATION_ENABLED=true
#export EBXML_REGISTRY_WEBSERVER_PORT=80
#export EBXML_THRIFT_SERVICE_PORT=9588
# hydroapps config
export SHARE_DIR=/awips2/edex/data/share
# set the AWIPS II temporary directory
export TEMP_DIR=/awips2/edex/data/tmp
# set hydroapps directory path
export apps_dir=${SHARE_DIR}/hydroapps
# site identifier for hydroapps
export SITE_IDENTIFIER=${AW_SITE_IDENTIFIER}
# set Fax environment variables pointing to ldad@ls1
export LDAD_EXTERNAL_HOME=/ldad
export LDAD_EXTERNAL_PUBLIC=/data/ldad/public
export AWIPS2_TEMP=/awips2/tmp

View file

@ -18,31 +18,11 @@
<constructor-arg value="true" /> <!-- require valid distribution file for startup -->
</bean>
<bean id="radarRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
factory-method="register">
<constructor-arg value="radar" />
<constructor-arg value="jms-durable:queue:Ingest.RadarRadarServer" />
</bean>
<camelContext id="radar-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<!--
<endpoint id="radarFileEndpoint" uri="file:${edex.home}/data/sbn/radar?noop=true&amp;idempotent=false" />
<route id="radarFileConsumerRoute">
<from ref="radarFileEndpoint" />
<bean ref="fileToString" />
<setHeader headerName="pluginName">
<constant>radar</constant>
</setHeader>
<to uri="jms-durable:queue:Ingest.Radar" />
</route>
-->
<endpoint id="radarJmsEndpoint" uri="jms-durable:queue:Ingest.Radar?concurrentConsumers=${radar-decode.sbn.threads}"/>
<endpoint id="radarRadarServerJmsEndpoint" uri="jms-durable:queue:Ingest.RadarRadarServer?concurrentConsumers=${radar-decode.local.threads}"/>
<!-- Begin Radar routes -->
<route id="radarIngestRoute">
<from ref="radarJmsEndpoint"/>
@ -52,14 +32,6 @@
<to uri="direct:radarcommon" />
</route>
<route id="radarRadarServerIngestRoute">
<from ref="radarRadarServerJmsEndpoint"/>
<setHeader headerName="dataType">
<constant>radar-local</constant>
</setHeader>
<to uri="direct:radarcommon" />
</route>
<route id="radarCommonIngestRoute">
<from uri="direct:radarcommon" />
<setHeader headerName="pluginName">
@ -84,14 +56,6 @@
</route>
</camelContext>
<bean id="radarServerConnectionHandler"
class="com.raytheon.edex.rpgenvdata.RadarServerConnectionHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg
value="com.raytheon.uf.common.dataplugin.radar.request.RadarServerConnectionRequest" />
<constructor-arg ref="radarServerConnectionHandler" />
</bean>
<bean id="import88dLocations" class="com.raytheon.edex.plugin.radar.util.Import88DLocationsUtil"/>
<bean factory-bean="ndmProc" factory-method="registerListener">

View file

@ -1,5 +1,6 @@
# DO NOT EDIT LINES BEGINNING WITH '#'
# LOCAL_RADARS (including terminal) - MUST HAVE THIS LINE
kftg
# TDWR_RADARS - MUST HAVE THIS LINE
tadw

View file

@ -186,7 +186,7 @@ ArealQpeGenSrv : ON
DqcPreProcSrv : ON
DqcPreProcSrv.run_dqc_preprocessor : ON
MpeRUCFreezingLevel : ON
MpeLightningSrv : ON
MpeLightningSrv : OFF
#====================================================================================
#===================== run_report_alarm Configuration ===============================

View file

@ -8,7 +8,7 @@
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<endpoint id="manualFileEndpoint"
uri="file:${edex.home}/data/manual?delete=true&amp;delay=5000&amp;maxMessagesPerPoll=1000&amp;exclusiveReadLockStrategy=#fileChangedStrategy&amp;recursive=true" />
uri="file:${data.archive.root}/manual?delete=true&amp;delay=5000&amp;maxMessagesPerPoll=1000&amp;exclusiveReadLockStrategy=#fileChangedStrategy&amp;recursive=true" />
<route id="manualFileScan">
<from ref="manualFileEndpoint" />

View file

@ -132,14 +132,6 @@ unzip %{_component_zip_file_name}
rm -f %{_component_zip_file_name}
%pre
# /awips2/cave must not exist.
if [ -d /awips2/cave ]; then
# TODO: need to make CAVE RPMs do a better job of cleaning up files that they are
# responsible for.
echo -e "\e[1;31mERROR: the /awips2/cave directory already exists. /awips2/cave\e[m"
echo -e "\e[1;31m will be removed.\e[m"
rm -rf /awips2/cave
fi
%post
# We need to create a link to the python shared library if it does not exist.

View file

@ -30,7 +30,7 @@ BuildRequires: awips2-ant
BuildRequires: awips2-java
%description
AWIPS II Common Base - Contains common plugins utilized by both EDEX and CAVE.
AWIPS II Common Base - Contains common plugins utilized by EDEX.
%prep
# Ensure that a "buildroot" has been specified.
@ -49,15 +49,18 @@ if [ $? -ne 0 ]; then
fi
%build
_build_xml=build.xml
BUILD_EDEX=%{_baseline_workspace}/build.edex
EDEX_DIST=${BUILD_EDEX}/edex/dist
cd ${BUILD_EDEX}
/awips2/ant/bin/ant -f build.xml \
/awips2/ant/bin/ant -f ${_build_xml} \
-Dbuild.arch=x86_64 \
-Dfeature=com.raytheon.uf.common.base.feature \
-Duframe.eclipse=%{_uframe_eclipse} \
buildHybrid
clean \
build \
clean
if [ $? -ne 0 ]; then
exit 1
fi
@ -71,15 +74,6 @@ if [ $? -ne 0 ]; then
exit 1
fi
RPMS_CORE=%{_baseline_workspace}/rpms/awips2.core
RPMS_COMMON_BASE=${RPMS_CORE}/Installer.common-base
SCRIPTS=${RPMS_COMMON_BASE}/scripts
cp -vf ${RPMS_COMMON_BASE}/scripts/* %{_build_root}/awips2/cave
if [ $? -ne 0 ]; then
exit 1
fi
#create a list of all files packaged for /awips2/edex/data/utility
UTILITY=/awips2/edex/data/utility
if [ -d %{_build_root}/$UTILITY ]; then
@ -116,29 +110,7 @@ else if [ $retVal -eq 0 ]; then
fi
fi
# CAVE installed?
# when the plugins are for CAVE, we need to
# use the p2 director to install from a repository.
rpm -q awips2-cave > /dev/null 2>&1
if [ $? -eq 0 ]; then
/bin/bash /awips2/cave/installCAVECommon.sh
rm -f /awips2/cave/installCAVECommon.sh
else
# hide the cave repository
pushd . > /dev/null 2>&1
cd /awips2
rm -rf .cave
mv cave .cave
popd > /dev/null 2>&1
fi
%preun
if [ -d /awips2/.cave ]; then
rm -rf /awips2/.cave
fi
if [ -d /awips2/.edex ]; then
rm -rf /awips2/.edex
fi
@ -153,8 +125,3 @@ rm -rf ${RPM_BUILD_ROOT}
%dir /awips2
%dir /awips2/edex
/awips2/edex/*
%dir /awips2/cave
/awips2/cave/*
%dir /awips2/cave/.repository
/awips2/cave/.repository/*

View file

@ -1,70 +0,0 @@
#!/bin/bash
# Set all paths required by CAVE before installing.
export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:$LD_LIBRARY_PATH
export LD_PRELOAD=libpython.so
if [ -d /awips2/cave/lib ]; then
export LD_LIBRARY_PATH=/awips2/cave/lib/lib_illusion:$LD_LIBRARY_PATH
fi
if [ -d /awips2/cave/lib64 ]; then
export LD_LIBRARY_PATH=/awips2/cave/lib64/lib_illusion:$LD_LIBRARY_PATH
fi
# Need to use awips2-java to do this.
export PATH=/awips2/java/bin:/awips2/python/bin:${PATH}
export JAVA_HOME="/awips2/java/jre"
# Set the CAVE logfile location.
export LOGFILE_CAVE=/dev/null
# Use the eclipse p2 manager.
CAVE_EXE="/awips2/cave/cave"
NOSPLASH_ARG="-nosplash"
DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
DESTINATION_ARG="-destination /awips2/cave"
INSTALL_ARG="-i com.raytheon.uf.common.base.feature.feature.group"
UNINSTALL_ARG="-u com.raytheon.uf.common.base.feature.feature.group"
REPO="-repository file:/awips2/cave/.repository/"
COMMON_CMD="${CAVE_EXE} ${NOSPLASH_ARG} ${DIRECTOR_APP} ${DESTINATION_ARG}"
INSTALL_CMD="${COMMON_CMD} ${INSTALL_ARG} ${REPO}"
UNINSTALL_CMD="${COMMON_CMD} ${UNINSTALL_ARG}"
# Uninstall any existing components since the p2 director does not
# support updating.
# If the feature is not installed, this does not fail quietly.
# Determine if the feature needs to be uninstalled.
${UNINSTALL_CMD} -verifyOnly > /dev/null 2>&1
if [ $? -eq 0 ]; then
LOG_TIMESTAMP=`date`
echo "uninstall previous STARTED: ${LOG_TIMESTAMP}"
${UNINSTALL_CMD}
LOG_TIMESTAMP=`date`
echo "uninstall previous COMPLETE: ${LOG_TIMESTAMP}"
fi
# complete the install
LOG_TIMESTAMP=`date`
echo "installation STARTED: ${LOG_TIMESTAMP}"
${INSTALL_CMD}
if [ $? -ne 0 ]; then
exit 1
fi
LOG_TIMESTAMP=`date`
echo "installation COMPLETE: ${LOG_TIMESTAMP}"
# remove the repository
if [ -f /awips2/cave/.repository/artifacts.xml ]; then
rm -f /awips2/cave/.repository/artifacts.xml
fi
if [ -f /awips2/cave/.repository/content.xml ]; then
rm -f /awips2/cave/.repository/content.xml
fi
if [ -d /awips2/cave/.repository/features ]; then
rm -rf /awips2/cave/.repository/features
fi
if [ -d /awips2/cave/.repository/plugins ]; then
rm -rf /awips2/cave/.repository/plugins
fi

View file

@ -118,48 +118,3 @@ RLX, 38.31306, -81.71861, 0, 12856, 0, 9999, -1.043702145771157E7, -7737021.4577
EYW, 24.55, -81.75, 0, 12856, 0, 9999, -1.044051199191862E7, -7740511.99191862, 1767517.7741523045, 3867517.7741523045
CAR, 46.8667, -68.0167, 0, 12856, 0, 9999, -8913383.816522704, -6213383.816522704, 4863931.021847511, 6963931.021847511
HUN, 34.7244, -86.4786, 0, 12856, 0, 9999, -1.0966327221337413E7, -8266327.221337413, 3072021.6934645926, 5172021.693464592
Processing World request: 7
Processing Canada request: 8
Completed Canada request: 8
INFO 2016-08-30 13:34:41,051 [Worker-2] PerformanceLogger: MapQueryJob: Loading map Canada took 3 ms
Processing State Boundaries request: 9
Completed World request: 7
INFO 2016-08-30 13:34:41,059 [Worker-4] PerformanceLogger: MapQueryJob: Loading map World took 14 ms
Completed State Boundaries request: 9
INFO 2016-08-30 13:34:41,128 [Worker-7] PerformanceLogger: MapQueryJob: Loading map State Boundaries took 77 ms
Processing Canada request: 10
Processing State Boundaries request: 11
Completed Canada request: 10
INFO 2016-08-30 13:34:50,868 [Worker-4] PerformanceLogger: MapQueryJob: Loading map Canada took 59 ms
Processing Canada request: 12
Completed Canada request: 12
INFO 2016-08-30 13:34:50,921 [Worker-2] PerformanceLogger: MapQueryJob: Loading map Canada took 2 ms
Completed State Boundaries request: 11
INFO 2016-08-30 13:34:50,987 [Worker-7] PerformanceLogger: MapQueryJob: Loading map State Boundaries took 173 ms
Processing State Boundaries request: 13
Completed State Boundaries request: 13
INFO 2016-08-30 13:34:51,019 [Worker-7] PerformanceLogger: MapQueryJob: Loading map State Boundaries took 96 ms
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Last minute sent 2 messages
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Total sent 7 messages
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Network Traffic Stats for 'GetServersRequest' : 1 messages
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Network Traffic Stats for 'GetPluginRecordMapRequest' : 1 messages
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Network Traffic Stats for 'MenuCreationRequest' : 1 messages
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Network Traffic Stats for 'UtilityRequestMessage' : 2 messages
INFO 2016-08-30 13:34:56,737 [Worker-0] PerformanceLogger: StatsJob: Network Traffic Stats for 'QlServerRequest' : 2 messages
MenuTimeRefreshTask : Tue Aug 30 13:38:56 CDT 2016 : running
DataRefreshTask : Tue Aug 30 13:38:56 CDT 2016 : running
MenuTimeRefreshTask : Tue Aug 30 13:38:56 CDT 2016 : Scheduled in 5 minutes
DataRefreshTask : Tue Aug 30 13:38:56 CDT 2016 : Scheduled in 5 minutes
MenuTimeRefreshTask : Tue Aug 30 13:43:56 CDT 2016 : running
DataRefreshTask : Tue Aug 30 13:43:56 CDT 2016 : running
MenuTimeRefreshTask : Tue Aug 30 13:43:56 CDT 2016 : Scheduled in 5 minutes
DataRefreshTask : Tue Aug 30 13:43:56 CDT 2016 : Scheduled in 5 minutes
VizWorkbenchAdvisor: User exiting CAVE, shutdown initiated
In SummedHourlyMpeAction.isEnabled()
Stopping queryJob
Stopping queryJob
Stopping queryJob
Stopping queryJob
Stopping queryJob
Time to store thin client caches: 2779ms
Stopping com.raytheon.uf.viz.core plugin

View file

@ -75,17 +75,17 @@ if [ -d ${NOTIFICATION_INSTALL} ]; then
fi
export LD_LIBRARY_PATH=${_lib_dir}:${LD_LIBRARY_PATH}
fi
# Determine if the qpid lib directory is already on LD_LIBRARY_PATH
CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${QPID_LIB_DIR}`
if [ "${CHECK_PATH}" = "" ]; then
export LD_LIBRARY_PATH=${QPID_LIB_DIR}:$LD_LIBRARY_PATH
fi
# Determine if awips2-notification Is Already Part Of The Path.
CHECK_PATH=`echo ${PATH} | grep ${NOTIFICATION_INSTALL}`
if [ "${CHECK_PATH}" = "" ]; then
export PATH=${NOTIFICATION_INSTALL}/bin:${PATH}
fi
fi
# Determine if the qpid lib directory is already on LD_LIBRARY_PATH
CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${QPID_LIB_DIR}`
if [ "${CHECK_PATH}" = "" ]; then
export LD_LIBRARY_PATH=${QPID_LIB_DIR}:$LD_LIBRARY_PATH
fi
if [ -d ${POSTGRESQL_INSTALL} ]; then
# Determine if awips2-postgresql is Already On LD_LIBRARY_PATH
CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${POSTGRESQL_INSTALL}`

View file

@ -330,7 +330,9 @@ edex_start() { # start all edex services
su -c "service httpd-pypies start"
su -c "service qpidd start"
edex_purge_reset
if [ "${args[1]}" != 'dev' ]; then
if [ "${args[1]}" == 'base' ]; then
su -c "service edex_camel start"
elif [ "${args[1]}" != 'dev' ]; then
su -c "service edex_camel start"
su -c "service edex_ldm start"
fi

View file

@ -3,11 +3,11 @@
# ldm-%{_ldm_version}.tar.gz is tarred up ldm-%{_ldm_version}/src dir after
# ISG makes retrans changes
#
# AWIPS II LDM Spec File
# AWIPS LDM Spec File
#
%define __prelink_undo_cmd %{nil}
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Summary: AWIPS LDM Distribution
Version: %{_component_version}.%{_component_release}
Release: %{_ldm_version}
Group: AWIPSII
@ -28,7 +28,7 @@ Requires: libtool, libpng-devel
Provides: awips2-ldm
%description
AWIPS II LDM Distribution - Contains AWIPS II LDM.
AWIPS LDM Distribution
%prep
# Ensure that a "buildroot" has been specified.
@ -276,7 +276,7 @@ if [ ! -h /awips2/ldm/data ]; then
ln -s /awips2/ldm/var/data /awips2/ldm/
fi
if getent passwd awips &>/dev/null; then
/bin/chown -R awips:fxalpha ${_ldm_dir} /awips2/data_store
/bin/chown -R awips:fxalpha ${_ldm_dir}
cd /awips2/ldm/src/
make install_setuids
else

View file

@ -1,5 +1,4 @@
# LDM scour has been replaced by EDEX scour (16.2.2+)
#0 * * * * /awips2/ldm/bin/ldmadmin scour >> /awips2/ldm/logs/scour.log 2>&1
0 * * * * /awips2/ldm/bin/ldmadmin scour >> /awips2/ldm/logs/scour.log 2>&1
# rotate logs
0 17 * * * /awips2/ldm/bin/ldmadmin newlog
# nex2gini for daa and dta (lower case)

View file

@ -53,7 +53,7 @@
# are started by the "exec" command and are in the same process group.
#
EXEC "pqact -e"
EXEC "edexBridge -s localhost"
EXEC "edexBridge -vxl /awips2/ldm/logs/edexBridge.log -s localhost"
#
# rtstats uses the LDM to send product latency statistics to the UPC.
# For more info on rtstats please see the man page.

View file

@ -917,9 +917,9 @@ NGRID ^(Y.UZ9[0-9]) (KWB.) (..)(..)(..)
#
# ECMF-Global, ECMF1..ECMF12
#
HDS ^H..... ECM. ......[^!]*!grib.*/[^/]*/[^/]*/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*)
FILE -edex -log
/awips2/data_store/grid/ECMWF/ECMWF-\1_\2_\3_\4_\5-(seq).grib
#HDS ^H..... ECM. ......[^!]*!grib.*/[^/]*/[^/]*/#([^/]*)/([0-9]{8})([0-9]{4})/(F[0-9]{3})/([^/]*)
# FILE -edex -log
# /awips2/data_store/grid/ECMWF/ECMWF-\1_\2_\3_\4_\5-(seq).grib
#
# ---------------------------------------------------
# - National Precipitation Verification Unit (NPVU) -

View file

@ -15,3 +15,4 @@
#~ldm/data/dir2 2 *.foo
/awips2/ldm/logs 2 *.stats
/awips2/data_store 1
/awips2/edex/data/manual 1

View file

@ -1,4 +1,4 @@
/data/ldm/logs/ldmd.log /data/ldm/logs/nwstg.log /data/ldm/logs/goes_add.log /data/ldm/logs/nwstg2.log /data/ldm/logs/oconus.log /data/ldm/logs/polarsat.log {
/awips2/ldm/logs/ldmd.log /awips2/ldm/logs/edexBridge.log {
missingok
compress
notifempty

View file

@ -16,7 +16,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="16.2.2"
export AWIPSII_RELEASE="1"
export AWIPSII_RELEASE="3"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"
@ -26,7 +26,7 @@ export WORKSPACE="${BUILD_WORKSPACE}/AWIPS2-UPC_build/baseline"
export UFRAME_ECLIPSE="/awips2/eclipse"
export AWIPSII_STATIC_FILES="/awips2/repo"
export AWIPSII_STATIC_FILES="/home/awips/awips2-static"
export AWIPSII_STATIC_FILES="/awips2/repo/awips2-static"
export AWIPSII_BUILD_ROOT="${BUILD_WORKSPACE}/tmp/${USER}/awips-component"
export REPO_DEST="${BUILD_WORKSPACE}/tmp/${USER}/repo"