From 74b31fd4284a7c5ed19afd7cec4831dd0bd2b521 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 11:52:32 -0600 Subject: [PATCH 01/15] travisci build yum install boost-devel for qpid-cpp/qpid-lib --- build/build_rhel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build_rhel.sh b/build/build_rhel.sh index c922e2a753..d9a3eb82b2 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -5,7 +5,7 @@ OS_VERSION=$2 yum -y clean all yum -y clean expire-cache yum groupinstall "Development tools" -y >& /dev/null -yum install wget cmake ruby -y +yum install wget cmake ruby boost-devel -y wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips2.repo yum -y clean all yum groupinstall awips2-ade -y >& /dev/null From fa015ca52a72cf1d156f4ea5cb12afef0ffc33d9 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 13:07:19 -0600 Subject: [PATCH 02/15] uuid-devel in rhel travis build --- build/build_rhel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build_rhel.sh b/build/build_rhel.sh index d9a3eb82b2..1e3fe00047 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -5,7 +5,7 @@ OS_VERSION=$2 yum -y clean all yum -y clean expire-cache yum groupinstall "Development tools" -y >& /dev/null -yum install wget cmake ruby boost-devel -y +yum install wget cmake ruby boost-devel uuid-devel -y wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips2.repo yum -y clean all yum groupinstall awips2-ade -y >& /dev/null From b4afd4437af68b4a5f50e038c819156e7a3a9af5 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 13:07:52 -0600 Subject: [PATCH 03/15] simple ifps server addresses --- .../utility/common_static/base/gfe/config/serverConfig.py | 4 ++-- .../utility/common_static/base/gfe/config/svcbu.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py index 0b2a1c084d..e67458b5c0 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py @@ -2823,8 +2823,8 @@ D2DAccumulativeElements= { #--------------------------------------------------------------------------- # base urls for the ISC Routing Table ISC_ROUTING_TABLE_ADDRESS = { - "ANCF" : "http://svcbu-ancf.er.awips.noaa.gov:8080/irt", - "BNCF" : "http://svcbu-bncf.er.awips.noaa.gov:8080/irt" + "ANCF" : "http://localhost:8080/irt", + "BNCF" : "http://localhost:8080/irt" } diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/svcbu.properties b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/svcbu.properties index a1654ba62f..f87ce407e5 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/svcbu.properties +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/svcbu.properties @@ -132,7 +132,7 @@ SVCBU_DB=Official SVCBU_TRIM_ELEMS=1 SVCBU_FAILED_SITE_PORT=98000001 SVCBU_GRIDAREA=ISC_Send_Area -SVCBU_ADDRESSEE="ANCF,BNCF" +SVCBU_ADDRESSEE="ANCF" SVCBU_WMO_HEADER=SVCBKPIFP SVCBU_USER=0 From 06c1c4cc0c71809e5eee26aa4058ec39314017aa Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 13:23:06 -0600 Subject: [PATCH 04/15] that's libuuid-devel --- build/build_rhel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build_rhel.sh b/build/build_rhel.sh index 1e3fe00047..f2654c58f7 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -5,7 +5,7 @@ OS_VERSION=$2 yum -y clean all yum -y clean expire-cache yum groupinstall "Development tools" -y >& /dev/null -yum install wget cmake ruby boost-devel uuid-devel -y +yum install wget cmake ruby boost-devel libuuid-devel -y wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips2.repo yum -y clean all yum groupinstall awips2-ade -y >& /dev/null From 335eb97294b7098c68b2687458749596df1ebb2c Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 13:58:08 -0600 Subject: [PATCH 05/15] cleanup build.properties for edex warning, menus --- edexOsgi/com.raytheon.edex.plugin.warning/build.properties | 1 - edexOsgi/com.raytheon.uf.edex.menus/build.properties | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/build.properties b/edexOsgi/com.raytheon.edex.plugin.warning/build.properties index edc4c8c7bb..c463b24b4b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.warning/build.properties +++ b/edexOsgi/com.raytheon.edex.plugin.warning/build.properties @@ -4,5 +4,4 @@ bin.includes = META-INF/,\ utility/,\ .,\ res/,\ - resources/,\ WarningDecoder.py diff --git a/edexOsgi/com.raytheon.uf.edex.menus/build.properties b/edexOsgi/com.raytheon.uf.edex.menus/build.properties index 5791d48d5f..34d2e4d2da 100644 --- a/edexOsgi/com.raytheon.uf.edex.menus/build.properties +++ b/edexOsgi/com.raytheon.uf.edex.menus/build.properties @@ -1,5 +1,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - .,\ - res/ + . From 6af622b6ae0ffec38293794873f4300810350eaa Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 13:58:27 -0600 Subject: [PATCH 06/15] nctaf removed from docs --- docs/edex/data-delivery.md | 2 +- docs/edex/data-plugins.md | 1 - docs/edex/data-purge.md | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/edex/data-delivery.md b/docs/edex/data-delivery.md index c7180bd118..7f64564192 100644 --- a/docs/edex/data-delivery.md +++ b/docs/edex/data-delivery.md @@ -104,7 +104,7 @@ utility-request -acars-common, acars-common-dataaccess, acarssounding-common, activetable-common, activetable-request, airep-common, airep-common-dataaccess, airmet-common, alertviz-request, archiveadmim-request, atcf-common, auth-request, awipstools-request, aww-common, binlightning-common, binlightning-common-dataaccess, bufrascat-common, bufrhdw-common, bufrmos-common, bufrmos-common-dataaccess, bufrmthdw-common, bufrncwf-common, bufrsigwx-common, bufrssmi-common, bufrua-common, bufrua-common-dataaccess, bufrua-request, ccfp-common, climate-common-dataaccess, climate-hmdb-common, convectprob-common, convsigmet-common, cwa-common, cwat-common, dat-request, dataaccess-common, dataaccess-request, database-common, database-request, datadelivery-common, dd-request-router, dissemination-request, dmw-common, ebxml-registry-common, ebxml-request-router, edex-message-common, edex-request, event-common, event-datadelivery-common, eventbus-common, ffg-common, ffmp-common, ffmp-dataplugin-common, fog-common, fssobs-common, gempak-common, gempak-request, geo-common, geomag-common, geomag-request, gfe-common, gfe-dataplugin-common, gfe-request, ghcd-common, ghcd-request, goessounding-common, gpd-common, gpd-request, grid-common, grid-dataplugin-common, grid-request, gridcoverage-common, hpe-request, hydro-common, idft-common, intlsigmet-common, level-common, levelhandler-common, localization-http-request, lsr-common, manualIngest-common, manualIngest-request, maps-dataplugin-common, mcidas-common, menus-request, message-common, modelsounding-common, modelsounding-common-dataaccess, modis-common, mosaic-common, mping-common, ncep-common, ncgrib-request, ncpafm-common, ncscat-common, nctaf-common, nctext-common, ncuair-common, nonconvsigmet-common, ntrans-common, nucaps-common, obs-common, obs-common-dataaccess, obs-message-common, obstation-dataplugin-common, ohd-common, ohd-common-database, ohd-request, parameter-common, persist-request, pgen-common, pgen-request, pirep-common, pirep-common-dataaccess, poessounding-common, pointdata-common, pointdata-request, pointset-common, preciprate-common, profiler-common, profiler-common-dataaccess, qc-common, qpf-common, radar-common, radar-dataplugin-common, radar-request, redbook-common, remotescript-request, request-service, request-service-common, rpgenvdata-request, satellite-common, satellite-dataplugin-common, satellite-request, scan-common, sfcobs-common, sfcobs-common-dataaccess, sgwh-common, sgwhv-common, shef-common, site-common, site-request, solarimage-common, soundingrequest-request, ssha-common, stats-common, stats-request, stormtrack-common, stq-common, svrwx-common, taf-common, tcg-common, tcm-common, tcs-common, text-common, text-dbsrv-common, text-dbsrv-request, text-request, text-subscription-common, text-subscription-request, time-common, topo-dataaccess-common, uengine-request, units-common, useradmin-common, useradmin-request, utility-common, utility-request, vaa-common, viirs-common, vil-common, warning-common, warning-common-dataaccess, warning-request, wcp-common +acars-common, acars-common-dataaccess, acarssounding-common, activetable-common, activetable-request, airep-common, airep-common-dataaccess, airmet-common, alertviz-request, archiveadmim-request, atcf-common, auth-request, awipstools-request, aww-common, binlightning-common, binlightning-common-dataaccess, bufrascat-common, bufrhdw-common, bufrmos-common, bufrmos-common-dataaccess, bufrmthdw-common, bufrncwf-common, bufrsigwx-common, bufrssmi-common, bufrua-common, bufrua-common-dataaccess, bufrua-request, ccfp-common, climate-common-dataaccess, climate-hmdb-common, convectprob-common, convsigmet-common, cwa-common, cwat-common, dat-request, dataaccess-common, dataaccess-request, database-common, database-request, datadelivery-common, dd-request-router, dissemination-request, dmw-common, ebxml-registry-common, ebxml-request-router, edex-message-common, edex-request, event-common, event-datadelivery-common, eventbus-common, ffg-common, ffmp-common, ffmp-dataplugin-common, fog-common, fssobs-common, gempak-common, gempak-request, geo-common, geomag-common, geomag-request, gfe-common, gfe-dataplugin-common, gfe-request, ghcd-common, ghcd-request, goessounding-common, gpd-common, gpd-request, grid-common, grid-dataplugin-common, grid-request, gridcoverage-common, hpe-request, hydro-common, idft-common, intlsigmet-common, level-common, levelhandler-common, localization-http-request, lsr-common, manualIngest-common, manualIngest-request, maps-dataplugin-common, mcidas-common, menus-request, message-common, modelsounding-common, modelsounding-common-dataaccess, modis-common, mosaic-common, mping-common, ncep-common, ncgrib-request, ncpafm-common, ncscat-common, nctext-common, ncuair-common, nonconvsigmet-common, ntrans-common, nucaps-common, obs-common, obs-common-dataaccess, obs-message-common, obstation-dataplugin-common, ohd-common, ohd-common-database, ohd-request, parameter-common, persist-request, pgen-common, pgen-request, pirep-common, pirep-common-dataaccess, poessounding-common, pointdata-common, pointdata-request, pointset-common, preciprate-common, profiler-common, profiler-common-dataaccess, qc-common, qpf-common, radar-common, radar-dataplugin-common, radar-request, redbook-common, remotescript-request, request-service, request-service-common, rpgenvdata-request, satellite-common, satellite-dataplugin-common, satellite-request, scan-common, sfcobs-common, sfcobs-common-dataaccess, sgwh-common, sgwhv-common, shef-common, site-common, site-request, solarimage-common, soundingrequest-request, ssha-common, stats-common, stats-request, stormtrack-common, stq-common, svrwx-common, taf-common, tcg-common, tcm-common, tcs-common, text-common, text-dbsrv-common, text-dbsrv-request, text-request, text-subscription-common, text-subscription-request, time-common, topo-dataaccess-common, uengine-request, units-common, useradmin-common, useradmin-request, utility-common, utility-request, vaa-common, viirs-common, vil-common, warning-common, warning-common-dataaccess, warning-request, wcp-common diff --git a/docs/edex/data-plugins.md b/docs/edex/data-plugins.md index bf4ab9bc46..cff78bc1fe 100644 --- a/docs/edex/data-plugins.md +++ b/docs/edex/data-plugins.md @@ -49,7 +49,6 @@ td:first-child { font-weight: bold } | modis | NASA Moderate-resolution Imaging Spectroradiometer | | ncpafm | NCEP Point/Area Forecast Matrices data | | ncscat | NCEP ASCAT/Quikscat records | -| nctaf | NCEP Terminal Aerodrome Forecasts | | nctext | NCEP Text decoders | | ncuair | NCEP Upper Air decoder | | ndm | National Dataset Maintenance ingester | diff --git a/docs/edex/data-purge.md b/docs/edex/data-purge.md index 01ab574fc9..47145e820c 100644 --- a/docs/edex/data-purge.md +++ b/docs/edex/data-purge.md @@ -158,6 +158,5 @@ To see a list of the data plug-ins that have purge rules: /awips2/edex/data/utility/common_static/base/purge/ghcdPurgeRules.xml /awips2/edex/data/utility/common_static/base/purge/ntransPurgeRules.xml /awips2/edex/data/utility/common_static/base/purge/regionalsatPurgeRules.xml - /awips2/edex/data/utility/common_static/base/purge/nctafPurgeRules.xml /awips2/edex/data/utility/common_static/base/purge/solarimagePurgeRules.xml /awips2/edex/data/utility/common_static/site/AFC/purge/regionalsatPurgeRules.xml From 7b16f662bdc4ef5e092157b3cda607a8f839cafb Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 13:58:45 -0600 Subject: [PATCH 07/15] nctaf removed from PointDataCubeAdapter --- .../com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java index a28a602fab..9601dec531 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java @@ -80,7 +80,7 @@ public class PointDataCubeAdapter extends DefaultDataCubeAdapter { private static String[] supportedPlugins = { "obs", "modelsounding", "bufrssmi", "lsr", "sfcobs", "goessounding", "bufrascat", "poessounding", "bufrua", "qc", "fssobs", "bufrmosAVN", - "bufrmosETA", "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP", "bufrmosMRF", "airep", "pirep", "nctaf" }; + "bufrmosETA", "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP", "bufrmosMRF", "airep", "pirep" }; protected AbstractPointDataInventory inventory; From 30615ecd0535d3a4cd74d0c8cd89125ccc91f6c1 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 14:00:58 -0600 Subject: [PATCH 08/15] cibuild script to echo log and avoid 10min timeout on travis --- build/build_rhel.sh | 4 +- rpms/unidata/cibuild.sh | 112 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 2 deletions(-) create mode 100755 rpms/unidata/cibuild.sh diff --git a/build/build_rhel.sh b/build/build_rhel.sh index f2654c58f7..89eaec2736 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -28,7 +28,7 @@ git clone https://github.com/Unidata/awips2-nws.git --branch unidata_${AWIPSII_V cd /awips2/repo/awips2-builds/rpms/unidata/ -/bin/bash build.sh -qpid -/bin/bash build.sh -b buildEDEX +/bin/bash cibuild.sh -qpid +/bin/bash cibuild.sh -b buildEDEX find /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/ diff --git a/rpms/unidata/cibuild.sh b/rpms/unidata/cibuild.sh new file mode 100755 index 0000000000..3642020da3 --- /dev/null +++ b/rpms/unidata/cibuild.sh @@ -0,0 +1,112 @@ +#!/bin/bash -v +set -xe +if [[ ${2} = "buildCAVE" ]]; then + rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/ + rm -rf /awips2/jenkins/buildspace/workspace/tmp/mjames/ +fi +export JENKINS_WORKSPACE=/awips2/repo/awips2-builds + +# determine where we are ... +path_to_script=`readlink -f $0` +dir=$(dirname $path_to_script) + +export _script_dir=${dir} +echo "Running build.sh from ${_script_dir}" +echo " JENKINS_WORKSPACE = ${JENKINS_WORKSPACE}" +#/bin/bash ${_script_dir}/build2.sh +#echo "Entering the build2.sh script" + + +START_TIME=`date "+%s"` +timestamp=`date +%Y_%m_%d_%H:%M:%S` + +# set all awips2 components into the path. +#export PATH=/awips2/java/bin:/awips2/python/bin:/awips2/ant/bin:/usr/local/heroku/bin:/home/mjames/util:/awips2/eclipse:/usr/lib64/qt-3.3/bin:/bin:/usr/local/bin:/bin:/usr/bin:/usr/ccs/bin +#export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:${LD_LIBRARY_PATH} +export JAVA_HOME=/awips2/java +export ANT_HOME=/awips2/ant + +# determine where we are ... +path_to_script=`readlink -f $0` +dir=$(dirname $path_to_script) +cd ${dir} +logdir=${dir}/../logs + +# prepare the build environment (since we are manually executed) +source ${dir}/buildEnvironment.sh + +echo "BUILD_DIR = $BUILD_DIR" +echo "BUILD_WORKSPACE = $BUILD_WORKSPACE" +echo "BASELINE = $BASELINE" +echo "AWIPSII_VERSION = $AWIPSII_VERSION" +echo "AWIPSII_RELEASE = $AWIPSII_RELEASE" +echo "AWIPSII_TOP_DIR = $AWIPSII_TOP_DIR" +echo "WORKSPACE = $WORKSPACE" +echo "UFRAME_ECLIPSE = $UFRAME_ECLIPSE" +echo "AWIPSII_STATIC_FILES = $AWIPSII_STATIC_FILES" +echo "AWIPSII_BUILD_ROOT = $AWIPSII_BUILD_ROOT" + +# prepare the rpm build directory structure +mkdir -p ${AWIPSII_TOP_DIR}/BUILD +mkdir -p ${AWIPSII_TOP_DIR}/RPMS +mkdir -p ${AWIPSII_TOP_DIR}/SOURCES +mkdir -p ${AWIPSII_TOP_DIR}/SPECS +mkdir -p ${AWIPSII_TOP_DIR}/SRPMS +echo BASELINE is ${BASELINE} +echo WORKSPACE is ${WORKSPACE} + +# prepare the baseline +pushd . > /dev/null 2>&1 +cd ${BASELINE} +mkdir -p ${WORKSPACE} +RSYNC_DIRS=`cat $dir/rsync.dirs` +rsync -ruql --delete --exclude-from=${dir}/excludes ${RSYNC_DIRS} ${WORKSPACE} + +popd > /dev/null 2>&1 + +# execute the build for the appropriate architecture +_rpms_build_directory=${WORKSPACE}/rpms/build +_architecture=`uname -i` +_build_sh_directory=${_rpms_build_directory}/${_architecture} +pushd . > /dev/null 2>&1 + +cd ${_build_sh_directory} +cp -v ${dir}/buildEnvironment.sh . + +#Usage: build.sh OPTION [-nobinlightning] +# -delta perform a build of only the rpms that are likely to change. +# -full perform a full build of all the rpms. +# -ade build all rpms that are packaged in the ade. +# -viz only build the Viz rpms (CAVE & AlertViz). +# -edex only build the EDEX rpms. +# -qpid build only the QPID rpms. +# -ldm build the awips2-ldm rpm; requires root privileges. +# -package create a yum repository tar file with the rpms that were just built. +# --help display this message and exit. +# +# check rpms/build/x86_64/build.sh for these groups +# +pwd + +/bin/bash ${_build_sh_directory}/build.sh ${1} ${2} + +popd > /dev/null 2>&1 + +export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}" + +if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then + mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/ +fi +if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then + mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/ +fi + +END_TIME=`date "+%s"` +TIME_SPENT=$((END_TIME - START_TIME)) +TTI_HOURS=$((TIME_SPENT/3600)) +TTI_SECS=$((TIME_SPENT %3600)) #Remaining seconds +TTI_MINS=$((TTI_SECS/60)) +TTI_SECS=$((TTI_SECS%60)) +echo "Total-time-Spent-In-The-Build-For $0 = $TTI_HOURS hours, $TTI_MINS minutes, $TTI_SECS seconds" + +exit From e5894084e22c0e6f0442b06b72b006e508401593 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 23 Oct 2017 14:56:12 -0600 Subject: [PATCH 09/15] mkdir rpmdir noarch --- build/build_rhel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/build_rhel.sh b/build/build_rhel.sh index 89eaec2736..fb938c9ef3 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -16,6 +16,7 @@ yum install git -y >& /dev/null mkdir -p /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline mkdir -p /awips2/jenkins/buildspace/workspace/tmp mkdir -p /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/ +mkdir -p /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/ pushd /awips2/repo From 771a11553dc29d14927d46bea5a93a7bc8fd3a3b Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 24 Oct 2017 09:31:12 -0600 Subject: [PATCH 10/15] rm isc routing in gfe request --- .../res/spring/gfe-request.xml | 85 ------------------- 1 file changed, 85 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml index 35668c8bff..41c1f0db95 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml @@ -89,11 +89,6 @@ - - - - - @@ -181,16 +176,6 @@ - - - - - - - - - - @@ -245,29 +230,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -315,7 +277,6 @@ - @@ -385,54 +346,8 @@ - - - - - - - - - - - java.lang.Throwable - - - - - - - - - - - - - - - - - - - - java.lang.Throwable - - - - - - - - - - - - - - - From 188651b7e94edc3fb6e39f6daa7f60be1fcfd8c3 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 24 Oct 2017 09:32:20 -0600 Subject: [PATCH 11/15] setup.env hostnames --- build/deploy.edex.awips2/esb/bin/setup.env | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build/deploy.edex.awips2/esb/bin/setup.env b/build/deploy.edex.awips2/esb/bin/setup.env index de58a9db1c..d9cb0eff82 100644 --- a/build/deploy.edex.awips2/esb/bin/setup.env +++ b/build/deploy.edex.awips2/esb/bin/setup.env @@ -1,5 +1,4 @@ export AW_SITE_IDENTIFIER=OAX -export EDEX_SERVER=localhost export EXT_ADDR=external # database @@ -10,11 +9,11 @@ export IH_DB_NAME=hd_ob92oax export DATA_ARCHIVE_ROOT=/awips2/data_store # postgres connection -export DB_ADDR=${EDEX_SERVER} +export DB_ADDR=localhost export DB_PORT=5432 # qpid connection -export BROKER_ADDR=${EDEX_SERVER} +export BROKER_ADDR=localhost # pypies hdf5 connection export PYPIES_SERVER=http://${EXT_ADDR}:9582 @@ -24,7 +23,7 @@ export HTTP_PORT=9581 export HTTP_SERVER_PATH=/services export HTTP_SERVER=http://${EXT_ADDR}:${HTTP_PORT}${HTTP_SERVER_PATH} # for manualIngest this needs to be localhost(??) -export JMS_SERVER=tcp://${EDEX_SERVER}:5672 +export JMS_SERVER=tcp://${EXT_ADDR}:5672 export JMS_VIRTUALHOST=edex export JMS_CONNECTIONS_URL=http://${EXT_ADDR}:8180/api/latest/connection/${JMS_VIRTUALHOST} From 1b84867506ee5dfce69dceeb368f640b22a8bc0e Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 24 Oct 2017 09:51:30 -0600 Subject: [PATCH 12/15] trim travis build log --- build/build_rhel.sh | 4 ++-- rpms/unidata/cibuild.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build_rhel.sh b/build/build_rhel.sh index fb938c9ef3..88ae27cac3 100755 --- a/build/build_rhel.sh +++ b/build/build_rhel.sh @@ -29,7 +29,7 @@ git clone https://github.com/Unidata/awips2-nws.git --branch unidata_${AWIPSII_V cd /awips2/repo/awips2-builds/rpms/unidata/ -/bin/bash cibuild.sh -qpid -/bin/bash cibuild.sh -b buildEDEX +/bin/bash cibuild.sh -qpid +/bin/bash cibuild.sh -b buildEDEX >& /dev/null find /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/ diff --git a/rpms/unidata/cibuild.sh b/rpms/unidata/cibuild.sh index 3642020da3..df5c00b39e 100755 --- a/rpms/unidata/cibuild.sh +++ b/rpms/unidata/cibuild.sh @@ -1,4 +1,4 @@ -#!/bin/bash -v +#!/bin/bash set -xe if [[ ${2} = "buildCAVE" ]]; then rm -rf /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline/ From 4567a40dcdff080570e5b3a9d8f2da6b55accb9c Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 24 Oct 2017 10:31:22 -0600 Subject: [PATCH 13/15] gini regex for fnexrad --- .../common_static/base/distribution/satellite.gini.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml index 2ddb8b3046..2686c4e8b2 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml @@ -1,9 +1,7 @@ - TI[CGT]... .... + rad/NEXRCOMP + .*.gini.* .*.gini - .*.gini.png From 975d86f98e2cebb65188ee7b8f9c7c438d7c7d72 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 24 Oct 2017 10:50:43 -0600 Subject: [PATCH 14/15] Default data update interval to 1, push to poll --- .../uf/viz/thinclient/preferences/PreferenceInitializer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java index c6dcee086a..188951361c 100644 --- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java +++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java @@ -40,6 +40,7 @@ import com.raytheon.uf.viz.thinclient.Activator; * Oct 08, 2015 4891 njensen Default data update interval to 5 * Feb 08, 2016 5281 tjensen Replaced disableJms with dataRefreshMethod, * combined Data and Menu Refresh Intervals + * Oct 24, 2017 mjames@ucar Default data update interval to 1, push to poll * * * @@ -68,7 +69,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { * method will be used. */ store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD, - ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH); + ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL); store.setDefault( ThinClientPreferenceConstants.P_ENABLE_REQUEST_COMPRESSION, @@ -80,7 +81,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { // Default data refresh rate store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_INTERVAL, - 5); + 1); // By default, no proxy used store.setDefault(ThinClientPreferenceConstants.P_USE_PROXIES, false); From 3e4b6135786d335bbe30642379894dc276cb3fc2 Mon Sep 17 00:00:00 2001 From: Michael James Date: Tue, 24 Oct 2017 10:51:55 -0600 Subject: [PATCH 15/15] nexrad display resource color --- .../localization/bundles/nexradAvailability.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cave/com.raytheon.viz.radar/localization/bundles/nexradAvailability.xml b/cave/com.raytheon.viz.radar/localization/bundles/nexradAvailability.xml index ee7b425f5b..2f9640406e 100644 --- a/cave/com.raytheon.viz.radar/localization/bundles/nexradAvailability.xml +++ b/cave/com.raytheon.viz.radar/localization/bundles/nexradAvailability.xml @@ -52,6 +52,7 @@ +