Commit graph

2335 commits

Author SHA1 Message Date
Juliya Dynina
ee1cebfb86 Merge "ASM #118" into asm_14.2.2
Former-commit-id: f1a10568d6 [formerly 0f5ce6fbde [formerly f2354898d0a40ae7a19b4349d25b4204d2da3e4d]]
Former-commit-id: 0f5ce6fbde
Former-commit-id: d9fecf06d2
2014-02-20 11:23:32 -05:00
David Gillingham
43733c77eb Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]
Former-commit-id: 32719432ff
Former-commit-id: 607ce13c19
2014-02-18 13:24:37 -06:00
Richard Peter
4dcb9b321d 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: d19e464a1a [formerly 3ed6ad64ce [formerly 5bf461753675af961c484d022cec4006fabfeba8]]
Former-commit-id: 3ed6ad64ce
Former-commit-id: c666adb530
2014-02-18 12:44:57 -06:00
Lee Venable
f81d0d88b8 Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
Former-commit-id: 4e7c3c0cbe [formerly 0cf2dba731 [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]
Former-commit-id: 0cf2dba731
Former-commit-id: e9226e7140
2014-02-18 12:19:41 -06:00
Brad Gonzales
b0f71efecc 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: 794bbc3c9b [formerly 36a24c1cb5 [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]
Former-commit-id: 36a24c1cb5
Former-commit-id: 49ddffc99b
2014-02-18 12:11:02 -06:00
Mike Duff
c125b9d044 Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 911789b910 [formerly 89bd047283 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]
Former-commit-id: 89bd047283
Former-commit-id: 33f81d8822
2014-02-18 12:05:26 -06:00
Brad Gonzales
1d57e9f5f7 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: ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]
Former-commit-id: 19460ed0d7
Former-commit-id: 379c0fb46c
2014-02-18 11:10:44 -06:00
Ron Anderson
410f956cff 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: 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]
Former-commit-id: 32bcf9d0d0
Former-commit-id: e7f2b6883d
2014-02-18 10:45:20 -06:00
Loubna.Bousaidi
0962574317 ASM #118
Change-Id: I7eee4de29a6aec74b3755951ba60b3c5ec69b769

Former-commit-id: c7615b9027 [formerly 5443998332 [formerly a41751263aeda5020f320ff2e2b4bd96d462300d]]
Former-commit-id: 5443998332
Former-commit-id: 78f5231cd2
2014-02-18 15:41:01 +00:00
Dave Hladky
c8711269fa Issue #2786 Pending subscriptions don't work.
Former-commit-id: 7ee101d7c7 [formerly 5c11dd09bb [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]
Former-commit-id: 5c11dd09bb
Former-commit-id: 24a4fab603
2014-02-18 09:14:38 -06:00
Nate Jensen
e42eb1940d Issue #2813 fix xml serialization of subscriptions
Former-commit-id: 83e9226419 [formerly be75cc3731 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]
Former-commit-id: be75cc3731
Former-commit-id: 4583814741
2014-02-17 11:37:48 -06:00
Steve Harris
1b7e02636d Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]
Former-commit-id: 267cc881a4
Former-commit-id: d0352c69d4
2014-02-17 08:54:34 -06:00
Ben Steffensmeier
94f0b52344 Issue #2528 Fix display of data on somewhat identical projections.
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 23694f5e0c [formerly 54a17c012d [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]
Former-commit-id: 54a17c012d
Former-commit-id: 2b30269ac9
2014-02-13 13:27:32 -06:00
Ron Anderson
69ee4792ad Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]
Former-commit-id: fcf45916f4
Former-commit-id: 3e78908bb5
2014-02-13 10:10:34 -06:00
Ron Anderson
cf7281ba3c Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
Former-commit-id: d906b780e8 [formerly af4f8de839 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]
Former-commit-id: af4f8de839
Former-commit-id: 8ba331e7fb
2014-02-11 17:16:07 -06:00
Ron Anderson
0b73d0703e Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]
Former-commit-id: a665530831
Former-commit-id: 0f9b44ff94
2014-02-11 17:07:01 -06:00
Brian.Dyke
1f27652aa3 14.1.1-18 baseline
Former-commit-id: 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 575e328123
Former-commit-id: f05a2220cd
2014-02-11 15:52:50 -05:00
Ben Steffensmeier
89d47e3243 Issue #2765 Fix aliases for probability parameters.
Former-commit-id: 0bb18f2cd7 [formerly 43a8b80ef2 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]
Former-commit-id: 43a8b80ef2
Former-commit-id: 2952ae37a6
2014-02-11 11:35:03 -06:00
Juliya Dynina
a90e5adb68 Merge "ASM #94" into asm_14.2.2
Former-commit-id: 0ae2a064a3 [formerly e2479f4075 [formerly c2eb6022d788294a87a7878cdac6c325be1c1062]]
Former-commit-id: e2479f4075
Former-commit-id: 00d8dfb641
2014-02-11 10:08:00 -05:00
Michael Gamazaychikov
7531090e3d ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed

Former-commit-id: b63053d8b4 [formerly 42399284ca [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]
Former-commit-id: 42399284ca
Former-commit-id: 8cd5cce89e
2014-02-11 01:32:37 +00:00
Nate Jensen
24bbf4949d Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]
Former-commit-id: 75ca70fba6
Former-commit-id: c28085118f
2014-02-10 16:48:29 -06:00
Kiran.Shrestha
41523b7569 ASM #97
Change-Id: I4978b7ddba9ec714c4b2635fcb7e926447a3ff13

Former-commit-id: d54116125c [formerly e467e957d7 [formerly f4e1de7a38b8a25d735143fb6ffea710bf024c2a]]
Former-commit-id: e467e957d7
Former-commit-id: ba857c54d1
2014-02-10 19:33:57 +00:00
Brad Gonzales
c275da6725 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: 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]
Former-commit-id: 9c50fb29fd
Former-commit-id: 9529c1d191
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
89105e1257 Issue #2762 Fix Satellite Data Access.
Former-commit-id: ed2c1a0329 [formerly 2166b5b696 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]
Former-commit-id: 2166b5b696
Former-commit-id: a26a150a69
2014-02-06 13:53:44 -06:00
Mike Duff
e69e8c4615 Issue #2636 - Fix for ncf spring config
Former-commit-id: e84ae26421 [formerly 3f7defe563 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]
Former-commit-id: 3f7defe563
Former-commit-id: 3707a4eabd
2014-02-06 09:29:20 -06:00
Richard Peter
8ad3c5857b Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 36d3d21b57 [formerly 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]]
Former-commit-id: 64f0cabaef
Former-commit-id: 82fc0a2ed3
2014-02-05 18:20:36 -06:00
Mike Duff
3691146e34 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]
Former-commit-id: 101c08818d
Former-commit-id: bafe19bbd5
2014-02-05 16:08:01 -06:00
Dave Hladky
1c8f6fb36d Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]
Former-commit-id: 6172c83afc
Former-commit-id: 7fb7e10cda
2014-02-05 14:49:26 -06:00
Richard Peter
176bee122b Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]
Former-commit-id: 8f844bc9ce
Former-commit-id: 21b0a87d78
2014-02-04 18:12:48 -06:00
Brian.Dyke
cd80c22b5c Issue #224
Former-commit-id: dad6f2896b [formerly 3f86a80d7e [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]
Former-commit-id: 3f86a80d7e
Former-commit-id: ed476a583f
2014-02-04 17:05:12 -05:00
Brian.Dyke
ea0a5bebfd Issue #179
Former-commit-id: b23c6f59f7 [formerly a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]
Former-commit-id: a0626cdc00
Former-commit-id: 6b3ebc4fef
2014-02-04 16:53:34 -05:00
Brian.Dyke
fc1aa5076a Issue #131
Former-commit-id: 35b25ee2a9 [formerly bd5db64b5b [formerly 4167f33801ee2450502231438955e72c4428fbcc]]
Former-commit-id: bd5db64b5b
Former-commit-id: dea5f087d3
2014-02-04 16:36:11 -05:00
Brian.Dyke
6510e6da5a Issue #88
Former-commit-id: edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]
Former-commit-id: 643ef1a1a6
Former-commit-id: d56bdce6ff
2014-02-04 16:34:40 -05:00
Mike Duff
75faeae7e4 Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: eb46191ba9 [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]
Former-commit-id: eee642ac9b
Former-commit-id: 2ca26aaa39
2014-02-04 14:01:29 -06:00
Richard Peter
57402adccf Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1
Former-commit-id: fb8d982ede [formerly 844f05e1ef [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]
Former-commit-id: 844f05e1ef
Former-commit-id: fe3963680d
2014-02-04 12:22:19 -06:00
Brian.Dyke
4c6eb0c001 14.1.1-17 baseline
Former-commit-id: 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 180d1356cd
Former-commit-id: f3d34b0c38
2014-02-04 12:33:46 -05:00
Benjamin Phillippe
5de996ac4a Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: fc589ed84d [formerly 1691c5a3ff [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]
Former-commit-id: 1691c5a3ff
Former-commit-id: 3f4b92fffb
2014-02-04 10:24:11 -06:00
Mike Duff
9c70fb3261 Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]
Former-commit-id: f81772f4be
Former-commit-id: 4d529f5051
2014-02-03 16:57:03 -06:00
David Friedman
9caca1ee5a ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 969c50b80f [formerly 611503cd96 [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]]
Former-commit-id: 611503cd96
Former-commit-id: 24ebf8854c
2014-02-03 19:03:50 +00:00
Steve Harris
ab0609007c Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]
Former-commit-id: b2032880ac
Former-commit-id: 131af8538e
2014-02-03 10:26:11 -06:00
Brian.Dyke
8b06bfd2f9 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 40ce5ccc2a [formerly 4e7b1b207f [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]
Former-commit-id: 4e7b1b207f
Former-commit-id: 89b824b846
2014-01-31 08:28:09 -05:00
Greg Armendariz
37a226378d 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: 5ad9cca7a3 [formerly ed0c724860 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]
Former-commit-id: ed0c724860
Former-commit-id: 7fbfe85478
2014-01-30 13:04:40 -06:00
Nate Jensen
9ff86044a2 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: 906c679b4e [formerly 327c588c9e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]
Former-commit-id: 327c588c9e
Former-commit-id: c18e66cc45
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
e5a72cf008 Issue #2537 Fix modelsounding registration.
Former-commit-id: 1db0291792 [formerly 819369747e [formerly e4e476afc2063211523840eaa6f845a4c2264774]]
Former-commit-id: 819369747e
Former-commit-id: 12b989a34b
2014-01-29 15:36:05 -06:00
Ron Anderson
c717b6d805 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 7c06f0b011 [formerly fb262fdad2 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]
Former-commit-id: fb262fdad2
Former-commit-id: 81f9709ae7
2014-01-29 14:16:31 -06:00
Ron Anderson
9215ca8f82 Issue #2719 Add NHA domain to serverConfig.py
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: 0f6e082769 [formerly ce28c6c47f [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]
Former-commit-id: ce28c6c47f
Former-commit-id: ea12cecc04
2014-01-29 13:55:54 -06:00
Michael Gamazaychikov
94cd48fa70 ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b

Former-commit-id: edbadf059e [formerly 91c3468462 [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]
Former-commit-id: 91c3468462
Former-commit-id: 2c2b629206
2014-01-29 14:19:52 -05:00
David Gillingham
304eaa9f29 Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route.
Former-commit-id: c802315ddc [formerly 5edfbaa4a5 [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]
Former-commit-id: 5edfbaa4a5
Former-commit-id: fc25bbe1e9
2014-01-29 11:56:05 -06:00
Ron Anderson
93e675a762 Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1
Former-commit-id: 20259f3554 [formerly b7c10ddebf [formerly 8040e4cad015d5725ed3b08bc9ae5e4d97b21749]]
Former-commit-id: b7c10ddebf
Former-commit-id: 6d33a83771
2014-01-29 08:39:41 -06:00
Mike Duff
6be7c7f19d Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 1caacacfe3 [formerly 6e01cdb78e [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]
Former-commit-id: 6e01cdb78e
Former-commit-id: 4440c27ff6
2014-01-28 11:09:33 -06:00