Commit graph

2448 commits

Author SHA1 Message Date
Slav Korolev
ea9b31b24b Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 6d4cf7476f [formerly a34b1196b7] [formerly 5087a0154d] [formerly 6d4cf7476f [formerly a34b1196b7] [formerly 5087a0154d] [formerly bfa84e65ec [formerly 5087a0154d [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]]
Former-commit-id: bfa84e65ec
Former-commit-id: b8e48e1740 [formerly 0566c86a6c] [formerly fa4d07cf875d177a851b8a0990f11bc8ec215736 [formerly 40b4bf6e8e]]
Former-commit-id: 12d59f30d6e7039021ded78217db65a4b236a048 [formerly 5e494af996]
Former-commit-id: 9dd91d63c1
2014-02-25 15:23:22 -05:00
Richard Peter
aac768e805 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly 2c433bb05c [formerly 90b48e0393] [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 3735cd3ffe [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]]
Former-commit-id: b4e48698ed
Former-commit-id: 85a16601ed [formerly f803d557c2] [formerly d78cc4dd432220d2d29a4c19ab555ecd83067517 [formerly 66b271a550]]
Former-commit-id: 5b87edac1a20018c339b438ff189f180ab2dc96a [formerly e78e5a15b9]
Former-commit-id: e28b3bb5b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
ac050068d5 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: c364269fae [formerly f57f472f6a] [formerly 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01]]
Former-commit-id: 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c [formerly f4513d0e64]
Former-commit-id: aa2d8b76a1
2014-02-25 09:22:08 -06:00
Brian.Dyke
9db7ca881a Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
2014-02-24 14:51:00 -05:00
Ron Anderson
5eb76e8ed6 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
2014-02-24 13:46:48 -06:00
Nate Jensen
0d8cd5360a Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]]
Former-commit-id: b1586f8603
Former-commit-id: 1837a83743 [formerly d6e9cb73f5] [formerly 9d8fe1a0158253d440a5c43e42535da472859450 [formerly bf8bb95f51]]
Former-commit-id: 6f49258d52063f413dae43a0a944ac2785e75d66 [formerly 6979321635]
Former-commit-id: da2a363550
2014-02-24 13:25:35 -06:00
Dave Hladky
2ed6aabcb0 Issue #2469 Fixed default rules implementation
Former-commit-id: d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly d31708962b [formerly f9c6a396f0] [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 1d256bfcee [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]]
Former-commit-id: 45413d0db4
Former-commit-id: 05c81677d2 [formerly dc97eb7890] [formerly 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76 [formerly ff5a5961db]]
Former-commit-id: ca019feb8178be88e796a82d279fda02bcfa070a [formerly 8a924bcc2c]
Former-commit-id: e030ac65b2
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
762a32fab9 Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 59c34458ff [formerly 3c7e578000] [formerly 8c6b48d405e8efd0e175f4ea9f8f0320fd5743ea [formerly a510abdb22]]
Former-commit-id: 0e5366ec874b8f9ecca31d3710cb6e5de118326b [formerly 358e7d3b1d]
Former-commit-id: 831bb0b021
2014-02-24 10:27:30 -06:00
John.McPherson
3d919d78f0 ASM #209 DR 16362
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7

Former-commit-id: 90ab3a4331 [formerly ea0dc8b3dc] [formerly 1d987c36d9] [formerly 90ab3a4331 [formerly ea0dc8b3dc] [formerly 1d987c36d9] [formerly bbd70c06f1 [formerly 1d987c36d9 [formerly b01f04471631f5e2c24dba77f7e96b72444becff]]]]
Former-commit-id: bbd70c06f1
Former-commit-id: 0132b51bb3 [formerly acf30e83bf] [formerly eadb2e218caf8cf873f770c74881c5170f7f9926 [formerly ae671c3601]]
Former-commit-id: e29111a9555688f35eea1a9b4f6d25176eb100cd [formerly dbad6b2701]
Former-commit-id: 995015a0ca
2014-02-24 03:07:21 +00:00
Dave Hladky
15edb8e522 Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]]
Former-commit-id: 49f6c31256
Former-commit-id: e15d2f50f9 [formerly 3b9f80d03e] [formerly de3f95e5f61e7ea15849603d3138b155fe401280 [formerly 445b55f796]]
Former-commit-id: 1b4853e591b02029ef646ca2512a6fb8faddce26 [formerly c545368839]
Former-commit-id: c4e70210fd
2014-02-21 16:01:20 -06:00
Brian.Dyke
de9e6553a9 OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
2014-02-21 06:50:59 -05:00
Brad Gonzales
527eb96112 Issue #2828 Added purge cron to Central SBN Simulator.
Amend: Removed comment accidentally merged from other branch.
       Moved logging to outer loop and log count of purged files for each dir.

Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6

Former-commit-id: 3052b2d9c7 [formerly 290a381715] [formerly 12e22752c2] [formerly 3052b2d9c7 [formerly 290a381715] [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 12e22752c2 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: 1b59fc4647 [formerly bef4e8ee53] [formerly e919fb24b5e5ab419e4dfb1442bf1fa5d1ee68d4 [formerly 08c4d1afea]]
Former-commit-id: 214aa1b94f9b4ce96af324adcfe25c14276c8588 [formerly 675477ed66]
Former-commit-id: 7dddf974b8
2014-02-20 16:31:16 -06:00
Ron Anderson
9c77ad5ef4 Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: bb3577ef37 [formerly e4aeaa79f1] [formerly 6a7e4a147d] [formerly bb3577ef37 [formerly e4aeaa79f1] [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly 6a7e4a147d [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: e2bd1327b4 [formerly 1dcaf2b790] [formerly 5022d5c01f2275eac9682199580e2e9a6b2b93e7 [formerly d63ad1b1de]]
Former-commit-id: 5e5b97037cd1e8490c7bc462cbcb300afc123568 [formerly 2eb6cb45e3]
Former-commit-id: 42048983ce
2014-02-20 12:32:31 -06:00
Juliya Dynina
65c1acefb2 Merge "ASM #118" into asm_14.2.2
Former-commit-id: ee1cebfb86 [formerly d9fecf06d2] [formerly 0f5ce6fbde] [formerly ee1cebfb86 [formerly d9fecf06d2] [formerly 0f5ce6fbde] [formerly f1a10568d6 [formerly 0f5ce6fbde [formerly f2354898d0a40ae7a19b4349d25b4204d2da3e4d]]]]
Former-commit-id: f1a10568d6
Former-commit-id: a63194a59c [formerly 8b164ca292] [formerly 07c51a1ca611ba15719519acb8b77e99388a6710 [formerly a668f336bf]]
Former-commit-id: 510c296d91fd8f62671fcd00a4c7fb9ccea2a0a7 [formerly 70d512cb7d]
Former-commit-id: 04413ee642
2014-02-20 11:23:32 -05:00
Ron Anderson
7dc6619828 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: e1585c58e1 [formerly 810ad594a1] [formerly c13942140a] [formerly e1585c58e1 [formerly 810ad594a1] [formerly c13942140a] [formerly 6f4a63000d [formerly c13942140a [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]]
Former-commit-id: 6f4a63000d
Former-commit-id: 81b8bf2374 [formerly ee5658f9d9] [formerly 3eb2456c26e36a840ecec7dab9cc4390d60c3a47 [formerly c07544b904]]
Former-commit-id: 46d149bd475770264ea464931219c00627746cee [formerly 32b8cc8a8e]
Former-commit-id: a5c6428787
2014-02-20 09:55:56 -06:00
Ron Anderson
13cf523fb0 Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 6645688ff4 [formerly 2bfa521e7d] [formerly 6b6aa14e59] [formerly 6645688ff4 [formerly 2bfa521e7d] [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 6b6aa14e59 [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]]
Former-commit-id: 08a1be844d
Former-commit-id: e1a346790e [formerly 0ee3625c50] [formerly ccd2b797cfa81d3394ddffbff2fae12e18e85480 [formerly 1571b9a8eb]]
Former-commit-id: b143a17afee4d4020a754d4a6c26cfa8398ff32d [formerly 7897be61e2]
Former-commit-id: 30d9fec3ae
2014-02-20 09:34:18 -06:00
Nate Jensen
9cfc792b03 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: f939d93d7f [formerly 3782880dac] [formerly 9011e1b31e] [formerly f939d93d7f [formerly 3782880dac] [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 8a564e9987 [formerly 9394879520] [formerly 9bf4479e05cb345ab571f6736d903c87cbcab9f4 [formerly b1e2788958]]
Former-commit-id: 45ded3c22eb341b860a5a8b1046988c3fb69c275 [formerly 8f73511086]
Former-commit-id: 1db1ae5a38
2014-02-19 17:18:24 -06:00
Nate Jensen
8ee4ae7565 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]]
Former-commit-id: f99cf7df47
Former-commit-id: eeac24c773 [formerly d3ec0da1bb] [formerly 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027]]
Former-commit-id: bcd8e67559fb255fbb3d3d11663bad0ea365591b [formerly dafb323edb]
Former-commit-id: dbdcfa8e41
2014-02-19 16:19:27 -06:00
Ron Anderson
60569c9c0d Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: dab0ebc99e [formerly 8703c43937] [formerly 98d2417f94] [formerly dab0ebc99e [formerly 8703c43937] [formerly 98d2417f94] [formerly b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]]
Former-commit-id: b8c00d8ead
Former-commit-id: efbe57d909 [formerly b9904edc3a] [formerly 5a4e4666cbcd00018ef121b89b85a78808d680db [formerly 7e7f0abfdc]]
Former-commit-id: 1e59da19780cb626d96172f2b0f32ab6257e2bba [formerly db9cc1e6b5]
Former-commit-id: 331803d94a
2014-02-19 15:39:56 -06:00
Mike Duff
352b114250 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]]
Former-commit-id: 95fcee385a
Former-commit-id: a723f69ad9 [formerly 89c4a3e04b] [formerly 280611ef49d0a886c12f13b5471242ae42c55bac [formerly 3100a71f34]]
Former-commit-id: d105e7a0938fbc4a67695d10a5942cb2e4247a07 [formerly 92d356f4f0]
Former-commit-id: 401973b39e
2014-02-19 15:26:14 -06:00
Ron Anderson
41a6f52eff Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 84bea14340 [formerly 908e43039e] [formerly ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]]
Former-commit-id: a122ae5f46b63941580c026c45106c52001929d6 [formerly b0a4b63689]
Former-commit-id: e91fd1d683
2014-02-19 11:55:11 -06:00
Slav Korolev
ed33d3c27a Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b

Former-commit-id: 39e49448ba [formerly f7a6a6c613] [formerly a597ac0989] [formerly 39e49448ba [formerly f7a6a6c613] [formerly a597ac0989] [formerly 3b1ea13cb1 [formerly a597ac0989 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]]]
Former-commit-id: 3b1ea13cb1
Former-commit-id: 164665bbac [formerly 06d55c28f4] [formerly eb29cf1af1a77f7e96c773b8304d91c618f49609 [formerly 8ec2d02f52]]
Former-commit-id: ee8fc481497fe0a2b7908dacd5bcff00be54bc43 [formerly f09add5f92]
Former-commit-id: 8ab22e3559
2014-02-19 12:01:06 -05:00
Matt Nash
fbe80195e5 Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization

Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2

Former-commit-id: 1d6e1d443c [formerly 3f67324d7c] [formerly 2d20e84f6a] [formerly 1d6e1d443c [formerly 3f67324d7c] [formerly 2d20e84f6a] [formerly 1835019567 [formerly 2d20e84f6a [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]]
Former-commit-id: 1835019567
Former-commit-id: 9cb0b6d530 [formerly ae1d36b6d0] [formerly 82cdf604370def6ebacc4f1cbb2ebeaa41b75898 [formerly bb10484bd0]]
Former-commit-id: 936c1375ad966bfb52b19b40f76a2bb6fa4628d3 [formerly 3b39e1d2bc]
Former-commit-id: 1814b1448e
2014-02-19 10:01:25 -06:00
Nate Jensen
ee6a119baf Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: dd821703b6 [formerly 82fde2011c] [formerly 698a4f827d] [formerly dd821703b6 [formerly 82fde2011c] [formerly 698a4f827d] [formerly 713ec598c3 [formerly 698a4f827d [formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]]]]
Former-commit-id: 713ec598c3
Former-commit-id: ce2568b36b [formerly 05edfb90d5] [formerly c65265d8b3848ad6c99e526ec9bdee82f0097eb3 [formerly 79cbb8d79a]]
Former-commit-id: 48aa64701649e8ab565c825ab2b63fe15c4aff21 [formerly 93458ab911]
Former-commit-id: 51e9dec1c0
2014-02-18 17:35:39 -06:00
Nate Jensen
776486ec44 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 2f1c0109b1 [formerly 4bb0997749] [formerly cc96c8c42118f1e42ca1fd6d9fbb3290f8d9ee88 [formerly a6bb05f2e3]]
Former-commit-id: 84feaf6d94e20d2227dfe57960856e8fbe245c47 [formerly 3c9ebe52d3]
Former-commit-id: 337aa2f312
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
21c5a5ebdd Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: 804bf6a8ed [formerly add98f22b1] [formerly 3e0cba04c0] [formerly 804bf6a8ed [formerly add98f22b1] [formerly 3e0cba04c0] [formerly e19b4518ef [formerly 3e0cba04c0 [formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]]]]
Former-commit-id: e19b4518ef
Former-commit-id: 3b183b18f0 [formerly 2be385e6b8] [formerly eab364eba85832224dcbd55f2f0ec613bcd2e297 [formerly 399e3d3f07]]
Former-commit-id: f96a1fd7e9cbf2b586a75675929cc78df919c52a [formerly 4e57fcf1f2]
Former-commit-id: 4a4ff1e02d
2014-02-18 13:57:28 -06:00
David Gillingham
da665e15b0 Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]]
Former-commit-id: de12904c7a
Former-commit-id: b373d71852 [formerly a83191356d] [formerly d751bcbb04dc8d77626c940f99e5f7ad3f73874d [formerly 1520317c24]]
Former-commit-id: dccf95a720d831ceee3c0b64bcf95676cd281af5 [formerly 474dda75de]
Former-commit-id: 5911f4b2d4
2014-02-18 13:24:37 -06:00
Richard Peter
fac7168aac 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: 4dcb9b321d [formerly c666adb530] [formerly 3ed6ad64ce] [formerly 4dcb9b321d [formerly c666adb530] [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 3ed6ad64ce [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]]
Former-commit-id: d19e464a1a
Former-commit-id: ba1cb2a9cf [formerly f7e43bdabd] [formerly 342727148b90c7cfc603e2659e805e35a76103ca [formerly 3c4e188037]]
Former-commit-id: 0946878bb5aee9e4ba8c1d55fee28dd46686ac45 [formerly ccd90f2d86]
Former-commit-id: bbce2567a7
2014-02-18 12:44:57 -06:00
Lee Venable
80ef62e8fd Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
Former-commit-id: f81d0d88b8 [formerly e9226e7140] [formerly 0cf2dba731] [formerly f81d0d88b8 [formerly e9226e7140] [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 0cf2dba731 [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: ab57d3efe7 [formerly 46dbd967a5] [formerly acd1e7e5cccd9c772e69add2efbbd68d034964ff [formerly 6fc9dcb3b1]]
Former-commit-id: 999e96801ebb27fa8bfb43cbde945a0c58ce1874 [formerly 28b0809a1c]
Former-commit-id: 0bd01db3cc
2014-02-18 12:19:41 -06:00
Brad Gonzales
d899777a6d 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: b0f71efecc [formerly 49ddffc99b] [formerly 36a24c1cb5] [formerly b0f71efecc [formerly 49ddffc99b] [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 36a24c1cb5 [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 2330bf10b2 [formerly 3bb9975728] [formerly 156a80d9ff219de8a2827577a58910cefd208d71 [formerly 90d34f7386]]
Former-commit-id: f42b463f576142d80cc6c0dbb6de2708378d5614 [formerly b99b5d9373]
Former-commit-id: d50a8cd7a5
2014-02-18 12:11:02 -06:00
Mike Duff
08bd755af0 Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly 911789b910 [formerly 89bd047283 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]]
Former-commit-id: 911789b910
Former-commit-id: cddd263edc [formerly 42e6591bc8] [formerly 63198d978b2d9ab9f18c26071e586f7a38cac365 [formerly 5f9d913c6d]]
Former-commit-id: f2a50ed00c3b42b132cd818df4e07da12380595e [formerly d277c1caf1]
Former-commit-id: 2467a11a7e
2014-02-18 12:05:26 -06:00
Brad Gonzales
e906d71ac4 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: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6 [formerly 1b76488111] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e]
Former-commit-id: b0421675ff
2014-02-18 11:10:44 -06:00
Ron Anderson
c3b687b9a5 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: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
2014-02-18 10:45:20 -06:00
Brian Clements
c0da4f94d4 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 74d08f1d19 [formerly 02319f36e4] [formerly 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]]
Former-commit-id: 30b1054d786354e5944fa7b6968a4b2cddf1c07a [formerly 5889341612]
Former-commit-id: f866ac4365
2014-02-18 10:03:12 -06:00
Loubna.Bousaidi
f275d8ce4a ASM #118
Change-Id: I7eee4de29a6aec74b3755951ba60b3c5ec69b769

Former-commit-id: 0962574317 [formerly 78f5231cd2] [formerly 5443998332] [formerly 0962574317 [formerly 78f5231cd2] [formerly 5443998332] [formerly c7615b9027 [formerly 5443998332 [formerly a41751263aeda5020f320ff2e2b4bd96d462300d]]]]
Former-commit-id: c7615b9027
Former-commit-id: 9cfaac2108 [formerly 7f1b301677] [formerly 5ae6ec9277f8201b5bef849a0077129cd4b4ac90 [formerly 0493ce9bc1]]
Former-commit-id: e0f11487d631b88dddc800f82e50fce8e27c5d20 [formerly 85f0e405f5]
Former-commit-id: 3b94b3b125
2014-02-18 15:41:01 +00:00
Dave Hladky
2708c918de Issue #2786 Pending subscriptions don't work.
Former-commit-id: c8711269fa [formerly 24a4fab603] [formerly 5c11dd09bb] [formerly c8711269fa [formerly 24a4fab603] [formerly 5c11dd09bb] [formerly 7ee101d7c7 [formerly 5c11dd09bb [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: b0849517aa [formerly 012619f05f] [formerly 8cc48c2dd72749fa9b1d02eaf6673400410fa283 [formerly 78d41d01bb]]
Former-commit-id: ef97cd1ab357557ce1ca31b9265c978f0586073f [formerly 9ccf06c4f4]
Former-commit-id: 51b644bf0c
2014-02-18 09:14:38 -06:00
Bryan Kowal
347439ff96 Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
Amend: add a default value for localization site in the pure overrider.

Change-Id: I6056c274a10def96ba69786b58ba284146e49160

Former-commit-id: 8493f0581f [formerly bb3a067f93] [formerly f5afe830a7] [formerly 8493f0581f [formerly bb3a067f93] [formerly f5afe830a7] [formerly e0b0d88e46 [formerly f5afe830a7 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]]]
Former-commit-id: e0b0d88e46
Former-commit-id: dc3c609086 [formerly b5d4574294] [formerly 0fabd8efb5af94eb16e9f5943156b46b011fbfcc [formerly d4ce52459e]]
Former-commit-id: 1f4c4d080742176ec073740e722e466292bd26b6 [formerly f5e65b5e56]
Former-commit-id: 14488904e5
2014-02-17 14:41:10 -06:00
Nate Jensen
0bca06ef1a Issue #2813 fix xml serialization of subscriptions
Former-commit-id: e42eb1940d [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly be75cc3731]] [formerly e42eb1940d [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly be75cc3731]] [formerly 83e9226419 [formerly be75cc3731 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]]
Former-commit-id: 83e9226419
Former-commit-id: fd8e2126b1 [formerly e9bbdfdf89] [formerly 814fc7ae6232206fb29b52f95a6d3c32f51b62c5 [formerly 30bbc788ce]]
Former-commit-id: 97227c6baf4c9b880f984a88d56c645160f85e93 [formerly 39b3824ae3]
Former-commit-id: c6b270f084
2014-02-17 11:37:48 -06:00
Steve Harris
a5d78a7f44 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
2014-02-17 08:54:34 -06:00
Max Schenkelberg
c6b69c6e58 Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: 38aae37f01 [formerly 4d656b5d06] [formerly 6309f9b34b] [formerly 38aae37f01 [formerly 4d656b5d06] [formerly 6309f9b34b] [formerly c8e93190f2 [formerly 6309f9b34b [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]]]
Former-commit-id: c8e93190f2
Former-commit-id: db72c9efca [formerly b311aba5d5] [formerly 1c98b48279c1d2eb2dd2a33cad63c8a665916563 [formerly 3571135645]]
Former-commit-id: e29d9ec91d5916874942ed927bab31b9f20f3c65 [formerly d374fc9f5d]
Former-commit-id: 316e7ca511
2014-02-14 10:47:42 -06:00
Ben Steffensmeier
f686048ddc Issue #2528 Fix display of data on somewhat identical projections.
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 23694f5e0c [formerly 54a17c012d [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]]
Former-commit-id: 23694f5e0c
Former-commit-id: bc38342841 [formerly be00537d6d] [formerly 9216d693916f99cccb2708677c47ef641c0cf7d1 [formerly bedf3cf45d]]
Former-commit-id: d7ddd5a4a6a966a25cee41eb29c97f5337897152 [formerly c8feeebbbd]
Former-commit-id: 1e96945cb8
2014-02-13 13:27:32 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
2014-02-13 10:10:34 -06:00
Ben Steffensmeier
7bb5c6f342 Issue #2672 Fix problems encountered in data access layer.
Former-commit-id: 5ed46c8b38 [formerly d663567b36] [formerly 41983df7a0] [formerly 5ed46c8b38 [formerly d663567b36] [formerly 41983df7a0] [formerly 835bcc695d [formerly 41983df7a0 [formerly ec95d1af0696b1f9b0b105143e26ea40937b28a8]]]]
Former-commit-id: 835bcc695d
Former-commit-id: 0bf76e4cd7 [formerly 8fb8ea57d5] [formerly 79d48c0d792ff42c68382190a1ca74d1fb6c0908 [formerly d85014e363]]
Former-commit-id: 66de3a85c2f28ffecd38f610814c84a9430dee90 [formerly 9cc950cf06]
Former-commit-id: 3a49bb1a90
2014-02-12 18:37:02 -06:00
Richard Peter
321ad20826 Merge "Issue #2655 fix textlightning distribution regex" into development
Former-commit-id: 6611c70839 [formerly 172f0a9fa4] [formerly 70e9bef750] [formerly 6611c70839 [formerly 172f0a9fa4] [formerly 70e9bef750] [formerly 3feee2cf50 [formerly 70e9bef750 [formerly b1ba10c3b69187b762c962801a937adeb6ef5867]]]]
Former-commit-id: 3feee2cf50
Former-commit-id: 9709f881bf [formerly 9d183aaa97] [formerly 450dcd5eb62fde046f4116dff0528b7a55567591 [formerly ca851b6d2e]]
Former-commit-id: 93e0574c589b8c8ada189eb6d1e581b277839c38 [formerly 06e025de7d]
Former-commit-id: c810bf2555
2014-02-12 15:34:43 -06:00
Nate Jensen
5a8ff8dbac Issue #2655 fix textlightning distribution regex
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99

Former-commit-id: 2cd9b9ef13 [formerly cf1dcae597] [formerly a6c562d3f0] [formerly 2cd9b9ef13 [formerly cf1dcae597] [formerly a6c562d3f0] [formerly 16d6a29bb9 [formerly a6c562d3f0 [formerly 48825cb03da5bde6f8b1252fe2e366119535f8f3]]]]
Former-commit-id: 16d6a29bb9
Former-commit-id: 31fed91d11 [formerly 929d683210] [formerly a4537d42ffe3e0752006e8f23e4ef3cfdcdc8f60 [formerly 3b918cee5f]]
Former-commit-id: 4f64c1a64bd338816bfb84b1d7486414f2c46b6f [formerly 72330e9b62]
Former-commit-id: 7f3016b679
2014-02-12 15:03:45 -06:00
Ron Anderson
303a1b1786 Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
Former-commit-id: cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly d906b780e8 [formerly af4f8de839 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]]
Former-commit-id: d906b780e8
Former-commit-id: e0403fd81d [formerly 2fdcef7338] [formerly 33d7dc6d66fee245851700ef94b840f31e915bc0 [formerly 361881dfda]]
Former-commit-id: 64ebb3c14ee6f0c360a86bff0fcf037a49b4d01a [formerly 2e1f7c8199]
Former-commit-id: 79a635bc9e
2014-02-11 17:16:07 -06:00
Ron Anderson
3d1cd70b57 Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]]
Former-commit-id: ee89463d27
Former-commit-id: 07fdb410c6 [formerly 1ca9c95567] [formerly 92ba98108868529a68af7962661c0c08a1eade14 [formerly bfa65ed39e]]
Former-commit-id: 738332a4bfc2ad7f86c63c6827a2be4e66627c41 [formerly dd597e8349]
Former-commit-id: 454ce0268d
2014-02-11 17:07:01 -06:00
Brian.Dyke
fc21d2dee4 14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
2014-02-11 15:52:50 -05:00
Slav Korolev
8b9c7a68a7 Issue #2763. Made LFCR correction of input data.
Former-commit-id: d715fc58dc [formerly 633a33dd21] [formerly 43802c3a5f] [formerly d715fc58dc [formerly 633a33dd21] [formerly 43802c3a5f] [formerly 47fc09a684 [formerly 43802c3a5f [formerly ea2d524767ea5eef74cda5fa5fbff886da1d3bc9]]]]
Former-commit-id: 47fc09a684
Former-commit-id: b2d7b314d4 [formerly 293af25a13] [formerly b95a9391756e1f2a8fcfd1f7948aee953988e1d7 [formerly 239f37f467]]
Former-commit-id: b78625be88064da354ba65aeab0cdc6fa6a20ab1 [formerly a7d8cfb651]
Former-commit-id: 93db746127
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
ee421748c3 Issue #2765 Fix aliases for probability parameters.
Former-commit-id: 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 43a8b80ef2 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: be4d0f1c88 [formerly c0dbdb9906] [formerly 63b3cde2a263f269c8044495d613aae2f31b7980 [formerly eb9c4ef999]]
Former-commit-id: fa23535348a4984a61c61d93acbf80e9954fa499 [formerly 8a4c3686f8]
Former-commit-id: d69ac764db
2014-02-11 11:35:03 -06:00