Steve Harris
ffcc34f8d4
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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
Brian.Dyke
29681c7ca4
OB_14.1.1-21 baseline
...
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
2014-03-04 11:47:42 -05:00
Brian.Dyke
2bad40cfee
OB_14.1.1-20 baseline
...
Former-commit-id: bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de
2014-02-26 17:39:15 -05:00
Brian.Dyke
1a8a0b703e
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
...
Former-commit-id: f7a43d07109a7c04ffb9754c285043ce446d46b5
2014-02-24 14:51:00 -05:00
Brian.Dyke
10b723647b
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -05:00
David Gillingham
de12904c7a
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd
2014-02-18 13:24:37 -06:00
Richard Peter
d19e464a1a
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: 5bf461753675af961c484d022cec4006fabfeba8
2014-02-18 12:44:57 -06:00
Lee Venable
4e7c3c0cbe
Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
...
Former-commit-id: 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21
2014-02-18 12:19:41 -06:00
Brad Gonzales
794bbc3c9b
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: 4c3148df4e85ccfa1d5b123fcb605d97249833d7
2014-02-18 12:11:02 -06:00
Mike Duff
911789b910
Issue #2636 - Change how retrieval plan is updated over time.
...
Peer review comments
Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950
Former-commit-id: 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5
2014-02-18 12:05:26 -06:00
Brad Gonzales
ba4e308328
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: d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb
2014-02-18 11:10:44 -06:00
Ron Anderson
14a082a4e9
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: 4155b9785e0a82078db6805659146980cafc2aa7
2014-02-18 10:45:20 -06:00
Dave Hladky
7ee101d7c7
Issue #2786 Pending subscriptions don't work.
...
Former-commit-id: e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79
2014-02-18 09:14:38 -06:00
Nate Jensen
83e9226419
Issue #2813 fix xml serialization of subscriptions
...
Former-commit-id: 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba
2014-02-17 11:37:48 -06:00
Steve Harris
9fcc5ad930
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: a494febee5f45d211797843d56077ac0ef358dbf
2014-02-17 08:54:34 -06:00
Ben Steffensmeier
23694f5e0c
Issue #2528 Fix display of data on somewhat identical projections.
...
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26
Former-commit-id: dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa
2014-02-13 13:27:32 -06:00
Ron Anderson
2f067699f2
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad
2014-02-13 10:10:34 -06:00
Ron Anderson
d906b780e8
Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
...
Former-commit-id: caf31f2a88227c7ed9141676feb937822f4d03ce
2014-02-11 17:16:07 -06:00
Ron Anderson
ee89463d27
Issue #2719 Update NHA GFE domain
...
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c
Former-commit-id: 28008b46b5d68e544dace5f721b283c222701699
2014-02-11 17:07:01 -06:00
Brian.Dyke
1d6a9456b7
14.1.1-18 baseline
...
Former-commit-id: a8009c4ee3effc8586b830244db8db716ec0f37c
2014-02-11 15:52:50 -05:00
Ben Steffensmeier
0bb18f2cd7
Issue #2765 Fix aliases for probability parameters.
...
Former-commit-id: 11bbfb8275cfafb411d1d5d9732b021f0011712a
2014-02-11 11:35:03 -06:00
Nate Jensen
fd43d9e095
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 36d571557def95e0eb1350c4e68cbe3e225f282a
2014-02-10 16:48:29 -06:00
Brad Gonzales
704e466f28
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: f1a4a7b24290b6e85380668563793ac529fc5b31
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
ed2c1a0329
Issue #2762 Fix Satellite Data Access.
...
Former-commit-id: 4016e9366e8917225777b079da4b94dd1e6fde4a
2014-02-06 13:53:44 -06:00
Mike Duff
e84ae26421
Issue #2636 - Fix for ncf spring config
...
Former-commit-id: 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6
2014-02-06 09:29:20 -06:00
Richard Peter
36d3d21b57
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: daacb19de029a15f94338c84a85116d0435f79be
2014-02-05 18:20:36 -06:00
Mike Duff
6b01c2957f
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 2e406f02b0abbdeee0f553df430f5a58977d9af2
2014-02-05 16:08:01 -06:00
Dave Hladky
39f97723d6
Issue #2686 Refactor of retrieval
...
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 0b85e00cecdca6c5dcb6deee138f1a002515ac3c
2014-02-05 14:49:26 -06:00
Richard Peter
e5af004993
Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
...
Former-commit-id: a2536c180f68e5ea970e3406e3ef1f899650f3e2
2014-02-04 18:12:48 -06:00
Brian.Dyke
dad6f2896b
Issue #224
...
Former-commit-id: 043faa447b4fc15a996dfe6108093bed5f1b6497
2014-02-04 17:05:12 -05:00
Brian.Dyke
b23c6f59f7
Issue #179
...
Former-commit-id: d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9
2014-02-04 16:53:34 -05:00
Brian.Dyke
35b25ee2a9
Issue #131
...
Former-commit-id: 4167f33801ee2450502231438955e72c4428fbcc
2014-02-04 16:36:11 -05:00
Brian.Dyke
edccef5569
Issue #88
...
Former-commit-id: 66a1b2ba9933754b0d6d0324108268563e6381bc
2014-02-04 16:34:40 -05:00
Mike Duff
eb46191ba9
Issue #2636 - Scheduling refactor. Single scheduling method now.
...
Review comments
Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58
Former-commit-id: fc9ed661c3fe3ca75d30d8df414b5d1cd5725613
2014-02-04 14:01:29 -06:00
Richard Peter
fb8d982ede
Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1
...
Former-commit-id: b2edf70f6d9404ed4963ee874c3e03d13bf49303
2014-02-04 12:22:19 -06:00
Brian.Dyke
23280af290
14.1.1-17 baseline
...
Former-commit-id: 810229668fd7ff81b5c426161d496fc62e24b75c
2014-02-04 12:33:46 -05:00
Benjamin Phillippe
fc589ed84d
Issue #2769 Removed aggressive Hibernate session flushes
...
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216
Former-commit-id: 0440395a596d13bf8b4f1dda4857c185c6c8afa5
2014-02-04 10:24:11 -06:00
Mike Duff
c9b98868d2
Issue #2745 - Don't display fulfilled or cancelled allocations
...
Former-commit-id: 7b7f294622e886d7457d7abe0451d3e819568677
2014-02-03 16:57:03 -06:00
Steve Harris
eb9d4319dc
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 9133aeccd450b0e241953c588192c2ee33fcbe8e
2014-02-03 10:26:11 -06:00
Brian.Dyke
40ce5ccc2a
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
...
Former-commit-id: 0409f7045a797c8c051a353d69de1991b8c8b681
2014-01-31 08:28:09 -05:00
Greg Armendariz
5ad9cca7a3
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: 4df9504e742c2807676521b10e56797fb3a24a68
2014-01-30 13:04:40 -06:00
Nate Jensen
906c679b4e
Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
...
events while in there
Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619
Former-commit-id: 68de7dd0f4e5728cb077dad541ef9369627fced4
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
1db0291792
Issue #2537 Fix modelsounding registration.
...
Former-commit-id: e4e476afc2063211523840eaa6f845a4c2264774
2014-01-29 15:36:05 -06:00
Ron Anderson
7c06f0b011
Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
...
Former-commit-id: 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e
2014-01-29 14:16:31 -06:00
Ron Anderson
0f6e082769
Issue #2719 Add NHA domain to serverConfig.py
...
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044
Former-commit-id: 2c8d067a3a4c4848bc2eb313c4e901507844074d
2014-01-29 13:55:54 -06:00
David Gillingham
c802315ddc
Issue #2170 : Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
...
Former-commit-id: 3dfffb5f49a84a6ed82481d08c809e1217750f70
2014-01-29 11:56:05 -06:00
Ron Anderson
20259f3554
Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1
...
Former-commit-id: 8040e4cad015d5725ed3b08bc9ae5e4d97b21749
2014-01-29 08:39:41 -06:00
Mike Duff
1caacacfe3
Issue #2636 - Changed subscription code to use gmt calendar.
...
Former-commit-id: 3e75bd3e55517bca7c85213307ed67973c2f145e
2014-01-28 11:09:33 -06:00
Ron Anderson
045ebfe967
Issue #2504 Fix ingestAT
...
Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8
Former-commit-id: ccf63372764f767af99d93b4d0299f9b8d066ee6
2014-01-27 18:16:46 -06:00
Stephen Gilbert
b64adbed81
Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1
...
Former-commit-id: 57ce64e6119d2bf540da80c1161b88b04474d53c
2014-01-27 14:20:47 -05:00
