Steve Harris
96658d8ce0
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
...
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 069093884fffcc34f8d4
2014-03-06 08:39:43 -06:00
Brian.Dyke
7cad374af5
OB_14.1.1-21 baseline
...
Former-commit-id: 1d92e5bab629681c7ca4
2014-03-04 11:47:42 -05:00
Brian.Dyke
16117255f3
OB_14.1.1-20 baseline
...
Former-commit-id: 324696c4362bad40cfee
2014-02-26 17:39:15 -05:00
Brian.Dyke
227131e5f1
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: 2faab606e51a8a0b703e
2014-02-24 14:51:00 -05:00
Brian.Dyke
64044e7ce5
OB_14.1.1-19 baseline
...
Former-commit-id: cfa499797810b723647b
2014-02-21 06:50:59 -05:00
David Gillingham
1520317c24
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 32719432ffde12904c7a
2014-02-18 13:24:37 -06:00
Richard Peter
3c4e188037
Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
...
Former-commit-id: 3ed6ad64ced19e464a1a
2014-02-18 12:44:57 -06:00
Lee Venable
6fc9dcb3b1
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 0cf2dba7314e7c3c0cbe
2014-02-18 12:19:41 -06:00
Brad Gonzales
90d34f7386
Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
...
Amend: updated test envlope sizes.
fixed ticket numbers in software history.
Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5
Former-commit-id: 36a24c1cb5794bbc3c9b
2014-02-18 12:11:02 -06:00
Mike Duff
5f9d913c6d
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 89bd047283911789b910
2014-02-18 12:05:26 -06:00
Brad Gonzales
3be3380944
Issue #2771 For Data Delivery CAVE now request current id from
...
the registry EDEX. Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.
Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
Created ClusterIdUtil. DataDeliveryIdUtil uses that utility. It also verifies the id against the awips sites.
Changed centralRegistry.sh to set CLUSTER_ID to NCF.
Handle cases where site id is HAK or HUS.
Check for empty id setting in Cluster ID Util.
Return full id for Data Delivery ID.
Simplify Data Delivery ID and return Cluster ID.
Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911
Former-commit-id: 19460ed0d7ba4e308328
2014-02-18 11:10:44 -06:00
Ron Anderson
d4ba9eba94
Merge branch 'master_14.1.1' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 32bcf9d0d014a082a4e9
2014-02-18 10:45:20 -06:00
Dave Hladky
78d41d01bb
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: 5c11dd09bb7ee101d7c7
2014-02-18 09:14:38 -06:00
Nate Jensen
30bbc788ce
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: be75cc373183e9226419
2014-02-17 11:37:48 -06:00
Steve Harris
e115197bb7
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 267cc881a49fcc5ad930
2014-02-17 08:54:34 -06:00
Ben Steffensmeier
bedf3cf45d
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: 54a17c012d23694f5e0c
2014-02-13 13:27:32 -06:00
Ron Anderson
2d7c87ac84
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: fcf45916f42f067699f2
2014-02-13 10:10:34 -06:00
Ron Anderson
361881dfda
Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
...
Former-commit-id: af4f8de839d906b780e8
2014-02-11 17:16:07 -06:00
Ron Anderson
bfa65ed39e
Issue #2719 Update NHA GFE domain
...
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: a665530831ee89463d27
2014-02-11 17:07:01 -06:00
Brian.Dyke
c5857c30f2
14.1.1-18 baseline
...
Former-commit-id: 575e3281231d6a9456b7
2014-02-11 15:52:50 -05:00
Ben Steffensmeier
eb9c4ef999
Issue #2765 Fix aliases for probability parameters.
...
Former-commit-id: 43a8b80ef20bb18f2cd7
2014-02-11 11:35:03 -06:00
Nate Jensen
2111989497
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 75ca70fba6fd43d9e095
2014-02-10 16:48:29 -06:00
Brad Gonzales
0b211e8036
Issue #2636 Changed EdexBandwidthManager startup scheduling to use the
...
in-memory bandwidth manager to setup initial scheduling because it
is much faster.
Amend: updated log statement.
fix for rescheduling of already scheduled BandwidthAllocations.
Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3
Former-commit-id: 9c50fb29fd704e466f28
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
e7662de8db
Issue #2762 Fix Satellite Data Access.
...
Former-commit-id: 2166b5b696ed2c1a0329
2014-02-06 13:53:44 -06:00
Mike Duff
6210a6aa18
Issue #2636 - Fix for ncf spring config
...
Former-commit-id: 3f7defe563e84ae26421
2014-02-06 09:29:20 -06:00
Richard Peter
c965993d17
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 64f0cabaef36d3d21b57
2014-02-05 18:20:36 -06:00
Mike Duff
6a2f75e8d5
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 101c08818d6b01c2957f
2014-02-05 16:08:01 -06:00
Dave Hladky
2b998409f5
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 6172c83afc39f97723d6
2014-02-05 14:49:26 -06:00
Richard Peter
4309c55a5f
Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
...
Former-commit-id: 8f844bc9cee5af004993
2014-02-04 18:12:48 -06:00
Brian.Dyke
610cf76a29
Issue #224
...
Former-commit-id: 3f86a80d7edad6f2896b
2014-02-04 17:05:12 -05:00
Brian.Dyke
6d58d8c016
Issue #179
...
Former-commit-id: a0626cdc00b23c6f59f7
2014-02-04 16:53:34 -05:00
Brian.Dyke
4701088670
Issue #131
...
Former-commit-id: bd5db64b5b35b25ee2a9
2014-02-04 16:36:11 -05:00
Brian.Dyke
a5606c86c7
Issue #88
...
Former-commit-id: 643ef1a1a6edccef5569
2014-02-04 16:34:40 -05:00
Mike Duff
684390e599
Issue #2636 - Scheduling refactor. Single scheduling method now.
...
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: eee642ac9beb46191ba9
2014-02-04 14:01:29 -06:00
Richard Peter
4c361f2cff
Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1
...
Former-commit-id: 844f05e1effb8d982ede
2014-02-04 12:22:19 -06:00
Brian.Dyke
947ec5fd96
14.1.1-17 baseline
...
Former-commit-id: 180d1356cd23280af290
2014-02-04 12:33:46 -05:00
Benjamin Phillippe
cdaa7e32b4
Issue #2769 Removed aggressive Hibernate session flushes
...
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216
Former-commit-id: 1691c5a3fffc589ed84d
2014-02-04 10:24:11 -06:00
Mike Duff
4a07f6fb4c
Issue #2745 - Don't display fulfilled or cancelled allocations
...
Former-commit-id: f81772f4bec9b98868d2
2014-02-03 16:57:03 -06:00
Steve Harris
33aea09906
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: b2032880aceb9d4319dc
2014-02-03 10:26:11 -06:00
Brian.Dyke
dd183bc0e9
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 4e7b1b207f40ce5ccc2a
2014-01-31 08:28:09 -05:00
Greg Armendariz
66e79f459e
Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1
...
Former-commit-id: ed0c7248605ad9cca7a3
2014-01-30 13:04:40 -06:00
Nate Jensen
7bd1d802be
Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
...
events while in there
Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619
Former-commit-id: 327c588c9e906c679b4e
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
501aec2537
Issue #2537 Fix modelsounding registration.
...
Former-commit-id: 819369747e1db0291792
2014-01-29 15:36:05 -06:00
Ron Anderson
64f55c6b02
Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
...
Former-commit-id: fb262fdad27c06f0b011
2014-01-29 14:16:31 -06:00
Ron Anderson
5427d15150
Issue #2719 Add NHA domain to serverConfig.py
...
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044
Former-commit-id: ce28c6c47f0f6e082769
2014-01-29 13:55:54 -06:00
David Gillingham
17d38b4974
Issue #2170 : Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
...
Former-commit-id: 5edfbaa4a5c802315ddc
2014-01-29 11:56:05 -06:00
Ron Anderson
604a4363a3
Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1
...
Former-commit-id: b7c10ddebf20259f3554
2014-01-29 08:39:41 -06:00
Mike Duff
f4da152d87
Issue #2636 - Changed subscription code to use gmt calendar.
...
Former-commit-id: 6e01cdb78e1caacacfe3
2014-01-28 11:09:33 -06:00
Ron Anderson
89246e17c5
Issue #2504 Fix ingestAT
...
Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8
Former-commit-id: bb2ef86d14045ebfe967
2014-01-27 18:16:46 -06:00
Stephen Gilbert
d947a0e7c1
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 6785474b17b64adbed81
2014-01-27 14:20:47 -05:00
