Commit graph

4059 commits

Author SHA1 Message Date
Steve Harris
90889f8aa3 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
2013-10-04 11:30:03 -04:00
Bryan Kowal
0675463123 Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]]].


Former-commit-id: ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]]
Former-commit-id: 9d47e7565d
Former-commit-id: 020566233e [formerly d4eba48f94] [formerly 4664dae5d08c4cc7ae160de4020c49d55f3b6503 [formerly 4d08d7a1c3]]
Former-commit-id: 68d2284d937f5ab15bf63a3e4489f789f257de56 [formerly 2f6791dc19]
Former-commit-id: 07a882ac48
2013-10-04 09:47:59 -05:00
Bryan Kowal
b767da74f2 Revert "Issue #2033 - msi build updates"
Undo copying localization into etc at build time.

This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1] [formerly 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly e46254cef1 [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]].


Former-commit-id: 28e14d1520 [formerly 1632c72103] [formerly 02e1055f19] [formerly 28e14d1520 [formerly 1632c72103] [formerly 02e1055f19] [formerly 3d6ff3f0fa [formerly 02e1055f19 [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: 1b450afc35 [formerly a29a8b8d0e] [formerly cf942de33b8e2634ee81bb98c9f6b239e1f435b7 [formerly ac0b2bd9eb]]
Former-commit-id: 2829b85519ed488a07adf58fb2aa8d2956d7f337 [formerly b72e77fdc0]
Former-commit-id: 0ad325f534
2013-10-04 09:47:59 -05:00
Mike Duff
9da45fbeba Issue #2375 - Fix for set number of rows in notification center
Change-Id: I9f8b937265e77c9777313225ab83f71a81b46994

Former-commit-id: 354af07416 [formerly 80081ff25b] [formerly 865b5f6878] [formerly 354af07416 [formerly 80081ff25b] [formerly 865b5f6878] [formerly d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]]
Former-commit-id: d258009cc7
Former-commit-id: e1017e7ce8 [formerly 2261f9ff61] [formerly 1ac7599652efeecae27c7dd2a2b8782fc610c0bc [formerly 81bd77e56d]]
Former-commit-id: fe1695af03cdc9d9177a3ce07797224bc9abb217 [formerly 96df3a4989]
Former-commit-id: 6a1030a923
2013-10-04 09:27:30 -05:00
Ben Steffensmeier
f06e6116c3 Issue #2402 Make PythonDecoder more extendable.
Former-commit-id: 69cab5e25f [formerly f848fa2218] [formerly a5a0bf72b6] [formerly 69cab5e25f [formerly f848fa2218] [formerly a5a0bf72b6] [formerly 058b32eaec [formerly a5a0bf72b6 [formerly 19329b4f5a621f20bc45beedbe5acaadc84e9c2f]]]]
Former-commit-id: 058b32eaec
Former-commit-id: 7f079e75a7 [formerly d0c330f5a2] [formerly 06c3f35b16a3936f0a83c95eff7c53e69cfe49f3 [formerly 2bccf6a62d]]
Former-commit-id: 3d0fd46d669925f46415fcd1bd45ea0bb0b67fab [formerly dcc0043064]
Former-commit-id: edeb2950ad
2013-10-03 18:19:04 -05:00
Richard Peter
9aee14b218 Merge "Issue #2390 update grib decoder and vb to handle new storm surge parameters. Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209" into development
Former-commit-id: ae5f215b7e [formerly f52fdf1916] [formerly 5adf4298ef] [formerly ae5f215b7e [formerly f52fdf1916] [formerly 5adf4298ef] [formerly bc3843dc75 [formerly 5adf4298ef [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]]
Former-commit-id: bc3843dc75
Former-commit-id: 72a46c6756 [formerly 8694f13766] [formerly cd6bc6d12c65aaf24ab02fb94462ec677ce9cce2 [formerly f7a7228e09]]
Former-commit-id: 0488b58ee82f69a582d8420f06035cc332282db1 [formerly 2af4638a97]
Former-commit-id: 19e860f9a8
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
4739ae6645 Issue #2390 update grib decoder and vb to handle new storm surge parameters.
Change-Id: I03a079fc06a922f693609e51df79e4d78cb4f209

Former-commit-id: 759829c4bb [formerly 7f7aa20d0a] [formerly 236b3fe05f] [formerly 759829c4bb [formerly 7f7aa20d0a] [formerly 236b3fe05f] [formerly 8f94e1434c [formerly 236b3fe05f [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]]
Former-commit-id: 8f94e1434c
Former-commit-id: ecbfb28dd5 [formerly 69eec8d4c6] [formerly 58059d168eebf3a630d52b3ac6f4dd734e1de30b [formerly d4670d19b1]]
Former-commit-id: b00fe31533b34d7e7bf994f06a803ba4bd872d43 [formerly 9a0a15ffd8]
Former-commit-id: 8187fb1fa8
2013-10-03 16:30:13 -05:00
Nate Jensen
4368cb1b30 Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject
Change-Id: Ic5e4926d97629e9f43990d1585da59eb7ef30650

Former-commit-id: 4347fe1d46 [formerly ee134db130] [formerly 3f24b9e424] [formerly 4347fe1d46 [formerly ee134db130] [formerly 3f24b9e424] [formerly 42fee320ab [formerly 3f24b9e424 [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]]
Former-commit-id: 42fee320ab
Former-commit-id: 86ddc9d15c [formerly 82e0af6a9c] [formerly 21bad7f950e722fad0361157366fe92dc449fa51 [formerly 160d1fbb01]]
Former-commit-id: 220663087ebab45ada54810410abf530e2c79762 [formerly 25bdea7759]
Former-commit-id: 3a28687ca2
2013-10-03 15:18:55 -05:00
Nate Jensen
605883d367 Merge "Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness" into development
Former-commit-id: 4308271540 [formerly 4fa6911aa0] [formerly 23c742c202] [formerly 4308271540 [formerly 4fa6911aa0] [formerly 23c742c202] [formerly 36f5c2c44b [formerly 23c742c202 [formerly fdf53f7eb888c38849821457fe248ba1f399b6e5]]]]
Former-commit-id: 36f5c2c44b
Former-commit-id: 15fcc9f06f [formerly 649c3b0e7d] [formerly 08a7b33298fc1dc66e7d0ed824ae2a26fc0bbbc1 [formerly 485a36fbb4]]
Former-commit-id: a729071b455eafbe2ee24dea385d54a617153dae [formerly 084a495032]
Former-commit-id: 96672be561
2013-10-03 12:56:47 -05:00
Roger Ferrel
ae869d0bd8 Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 91b64293fe [formerly 220769dab0] [formerly 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53]]
Former-commit-id: 73f8bad6e41b1181298090e56e125f8939db1f69 [formerly 029eec5dc4]
Former-commit-id: 7bb7770fbf
2013-10-03 12:33:26 -05:00
Bryan Kowal
58c68ad717 Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly 26f787ac83 [formerly 3b1f089cbd [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]]
Former-commit-id: 26f787ac83
Former-commit-id: 42298eb650 [formerly 2e9836e506] [formerly 9ca71543985cf366b72245955e1fe6c6e51848a9 [formerly 429c534da0]]
Former-commit-id: 711ed72151263981fca589f1d61416eda2f74eea [formerly 9f7222a1b3]
Former-commit-id: 16efd625bb
2013-10-03 11:54:23 -05:00
Max Schenkelberg
f6c8e9e3a7 Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness
Amend: Accepted ticket.

Change-Id: Ib8171694869f60b46fb38634e71de61eb0e76830

Former-commit-id: fe7051816e [formerly 780ac0129f] [formerly e3f6b1ea21] [formerly fe7051816e [formerly 780ac0129f] [formerly e3f6b1ea21] [formerly 866c851b47 [formerly e3f6b1ea21 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]]
Former-commit-id: 866c851b47
Former-commit-id: 9e14571020 [formerly 43b7cb3107] [formerly 00101432c385c23ffd439ab94c020a849e2c2d13 [formerly ba25f56dbe]]
Former-commit-id: 4b955d0b10fa41cd5cc0265beb057666f0fda43d [formerly 80efdbb2b4]
Former-commit-id: 6e5873733e
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
01cdfd1a74 Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644

Former-commit-id: 1aa1f72b68 [formerly 860258e49c] [formerly ff06ea1c5a] [formerly 1aa1f72b68 [formerly 860258e49c] [formerly ff06ea1c5a] [formerly 20853f7333 [formerly ff06ea1c5a [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]]
Former-commit-id: 20853f7333
Former-commit-id: 075a394152 [formerly bf0642450c] [formerly d31fc0b096d78305c15905ad2838ab76dd9d9f67 [formerly 6c7c693581]]
Former-commit-id: fe305e36f7a480ddb53f09d2c5268ee0ec31211d [formerly baa1ddd596]
Former-commit-id: 938ace6bae
2013-10-03 10:36:47 -05:00
Bryan Kowal
3b0e12457a Issue #2295 - CAVE updates for ALR
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc

Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76

Former-commit-id: 763aad00be [formerly 4342c463b2] [formerly aa8691edfd] [formerly 763aad00be [formerly 4342c463b2] [formerly aa8691edfd] [formerly 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9d5ae53748 [formerly 6c60d06f9f] [formerly 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927]]
Former-commit-id: 09eb38934521a07d3d49532275423945bfefbb8f [formerly 4ce26acc3b]
Former-commit-id: 767466a8fe
2013-10-02 15:49:17 -05:00
Bryan Kowal
638baff715 Issue #2272 - EDEX updates for ALR
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically

Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369

Former-commit-id: 5ffff05346 [formerly 60c544c7a9] [formerly 26cf5dad60] [formerly 5ffff05346 [formerly 60c544c7a9] [formerly 26cf5dad60] [formerly 73690a97aa [formerly 26cf5dad60 [formerly d1f201a579b9a0421295df26c9ad17717581073f]]]]
Former-commit-id: 73690a97aa
Former-commit-id: 7fb399245e [formerly 6162beb8e0] [formerly 232a8e4ea04337a2838adc508ab6d0ba1d969176 [formerly 86e0b3480f]]
Former-commit-id: 786c992a118444a64bf3d9fc4012ded979ecc3e5 [formerly 6db57eb23e]
Former-commit-id: 58ed2e7ae7
2013-10-02 15:49:16 -05:00
Greg Armendariz
9f381d9def Merge "Issue #2142 fix hibernate log" into development
Former-commit-id: aa8ce6217a [formerly 1c7dcca534] [formerly 16e36817cf] [formerly aa8ce6217a [formerly 1c7dcca534] [formerly 16e36817cf] [formerly f7b6c60ee6 [formerly 16e36817cf [formerly bf5cbc38c8b345830c673cda8078a62de8040335]]]]
Former-commit-id: f7b6c60ee6
Former-commit-id: 4354bf629b [formerly 18f6b66b7a] [formerly 975400851b7a97c1e9d9c7f5b0ef8e00b4d7398e [formerly b2c2fcb968]]
Former-commit-id: f5dc5e89de7de346353dacfc24c49a1401a85a56 [formerly 13fbc8b6ef]
Former-commit-id: 48595626a4
2013-10-02 15:32:54 -05:00
Nate Jensen
4da05cc7a2 Issue #2142 fix hibernate log
Change-Id: I20cfbaacd210ec43f6228d094669b34224862549

Former-commit-id: 3f34a0dbdf [formerly 5e48cfdd9d] [formerly ee3550654b] [formerly 3f34a0dbdf [formerly 5e48cfdd9d] [formerly ee3550654b] [formerly 687e64dc29 [formerly ee3550654b [formerly e5d5ceb52ab2a0306c313169dddd71cf4368de17]]]]
Former-commit-id: 687e64dc29
Former-commit-id: d8714ec679 [formerly a97cd93f95] [formerly b230d0faea1b92b210dda3b96f5b55f688e6557c [formerly db35be851e]]
Former-commit-id: 36eda52b170225c4fcabdbd3b08633aa835a3f16 [formerly 729678f323]
Former-commit-id: fc53dae5f8
2013-10-02 15:30:52 -05:00
Nate Jensen
1385422154 Merge "Issue #2404 move grid reprojection style rules to common." into development
Former-commit-id: 1e6d394f92 [formerly 028165eace] [formerly 4564a94369] [formerly 1e6d394f92 [formerly 028165eace] [formerly 4564a94369] [formerly 6bc326b8d1 [formerly 4564a94369 [formerly 942bc0600576cd0d322c4e82748ac6fbffc0548e]]]]
Former-commit-id: 6bc326b8d1
Former-commit-id: f40d99d191 [formerly 14d7cc21e1] [formerly f0bd4cb19b2ac76d589f892ac615883522e8605e [formerly d7a8341832]]
Former-commit-id: 758fea464c13040924835ea44ce50afb8f8bdeec [formerly 549f2b33ba]
Former-commit-id: a0340f2a82
2013-10-02 11:21:04 -05:00
Nate Jensen
14f3539d4e Merge "Issue #2296 - Change email recipients of unit test failure email." into development
Former-commit-id: 9fc0fd9bcc [formerly 5eeb64c356] [formerly 708ac85c7c] [formerly 9fc0fd9bcc [formerly 5eeb64c356] [formerly 708ac85c7c] [formerly 5dc4dbb431 [formerly 708ac85c7c [formerly 4f46993c19c9479541ec009469e00f2060e408a3]]]]
Former-commit-id: 5dc4dbb431
Former-commit-id: e92f9dbf85 [formerly dd9d517f56] [formerly 292b727cc0db6aab9ed4c84e6586be1809cf496b [formerly f67efb2b78]]
Former-commit-id: 3bfcb06ae143cbee54f96a682a48b9727b6a3ba3 [formerly cc3c0e95df]
Former-commit-id: 8291074794
2013-10-02 11:20:54 -05:00
Ben Steffensmeier
5634ecd5bb Issue #2404 move grid reprojection style rules to common.
Former-commit-id: 2117878f10 [formerly a95f0dbac4] [formerly a75361ad34] [formerly 2117878f10 [formerly a95f0dbac4] [formerly a75361ad34] [formerly 32a01070f9 [formerly a75361ad34 [formerly 2a81f5fe8e38e6e6c6476586b1df09d8ab01d1fa]]]]
Former-commit-id: 32a01070f9
Former-commit-id: 428afa32f7 [formerly 95b1c01650] [formerly f52511bb3d7e8809dd3a38dc82d418a570719e4c [formerly 59d7c79c20]]
Former-commit-id: 9fd866488384b8ff82d16fcbe5359ea652d9ee85 [formerly dc4c07c194]
Former-commit-id: ff28df9bbc
2013-10-02 10:33:23 -05:00
Mike Duff
6fa54bd6ed Issue #2296 - Change email recipients of unit test failure email.
Change-Id: I17338a82fd97a12eaafc1b64a91ebe35de1fb270

Former-commit-id: 70aadebda0 [formerly 425ce97978] [formerly 7072b53ba5] [formerly 70aadebda0 [formerly 425ce97978] [formerly 7072b53ba5] [formerly 77c2043a1a [formerly 7072b53ba5 [formerly 466b16f5052e3a848980976cfbdcf5dff95673c9]]]]
Former-commit-id: 77c2043a1a
Former-commit-id: 0b026a1acb [formerly 35c44291e0] [formerly 21d75a3c534d0f9d3e1bf796e1ff2507799c3c09 [formerly 229637bf7a]]
Former-commit-id: b0acecb4c85e69618467c8388a053ba8722d6f51 [formerly 076da5b3f3]
Former-commit-id: 387865a9fc
2013-10-02 09:54:16 -05:00
Nate Jensen
bd680298a8 Issue #2361 remove XML annotations from localization requests/responses
Change-Id: Ia2aa791f7e68524d19f24522c7824a977d25d58f

Former-commit-id: 1810a8cf6d [formerly 8e17babd91] [formerly dd75847b7b] [formerly 1810a8cf6d [formerly 8e17babd91] [formerly dd75847b7b] [formerly 396e69180d [formerly dd75847b7b [formerly ef569f59ca91c73cfbfad4b062fb0110d33533d3]]]]
Former-commit-id: 396e69180d
Former-commit-id: 006a97cb22 [formerly 28ce7782fe] [formerly 65d1242b3cdd63e3ebb6a298f4c1b96d6ee987a6 [formerly 3b92de5abc]]
Former-commit-id: ecd0f27815ae60d6978e1f0ba0fff1be6371fcde [formerly 38edfa0d07]
Former-commit-id: c18e9ee060
2013-10-02 09:09:26 -05:00
Roger Ferrel
9635ebf647 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: 0c9b15df71 [formerly 2ba7117d13] [formerly a76fc08e93] [formerly 0c9b15df71 [formerly 2ba7117d13] [formerly a76fc08e93] [formerly e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a6316240e5 [formerly 34ea90f18a] [formerly a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d]]
Former-commit-id: 43c9bb837f60460e0ee95d90741e92a50a1a3384 [formerly 0d86e00182]
Former-commit-id: efde4f9297
2013-10-01 16:36:34 -05:00
Richard Peter
b7f12fd06f Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
Former-commit-id: d42c70b457 [formerly 5a3d77f26f] [formerly 463c07c3de] [formerly d42c70b457 [formerly 5a3d77f26f] [formerly 463c07c3de] [formerly 59061263d2 [formerly 463c07c3de [formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]]]
Former-commit-id: 59061263d2
Former-commit-id: be160753c6 [formerly 33a53e5b2a] [formerly 5f8a32532e78cbb0c9686f7ba34b352df06ead58 [formerly 7309d7d836]]
Former-commit-id: e3644bc4bb2123bfc7d9a43c4ec4ea96d57f5844 [formerly 2a86df5796]
Former-commit-id: 541ff7c791
2013-10-01 15:31:12 -05:00
Nate Jensen
43db24a722 Merge "Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager" into development
Former-commit-id: e0fb7611a3 [formerly 68c8f9addd] [formerly 265b6e7e61] [formerly e0fb7611a3 [formerly 68c8f9addd] [formerly 265b6e7e61] [formerly 6cd79464ef [formerly 265b6e7e61 [formerly 33899872714e8b945131bc17eab63bc71af38d37]]]]
Former-commit-id: 6cd79464ef
Former-commit-id: cc4b86a7c4 [formerly c4018373f1] [formerly 90d47dafdaac70bbece8a61b2bcc06fe50ccdf5e [formerly 64d66cf406]]
Former-commit-id: 9be2d046ae3c463c0bd18fb490f51d07cba08c89 [formerly ff27201982]
Former-commit-id: 580f3be05d
2013-10-01 15:19:56 -05:00
Richard Peter
8a6f8865ea Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50

Former-commit-id: 21d44cc52a [formerly 75b0f19d87] [formerly bb9488bb92] [formerly 21d44cc52a [formerly 75b0f19d87] [formerly bb9488bb92] [formerly f4e71b65d3 [formerly bb9488bb92 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 1e05051167 [formerly 3514194d3b] [formerly 7e26aa18c7f56b191ba44b8bf661be4364edc8a9 [formerly 39ae6d437d]]
Former-commit-id: e746656ef69ab2826357b57acf74fda2ede8ad96 [formerly ddf07f8030]
Former-commit-id: 86c28e6e16
2013-10-01 15:06:34 -05:00
Richard Peter
ec9e48704b Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

Former-commit-id: 1eb943d331 [formerly 984785ce5e] [formerly e45689dbc7] [formerly 1eb943d331 [formerly 984785ce5e] [formerly e45689dbc7] [formerly add32a774f [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]]
Former-commit-id: add32a774f
Former-commit-id: 64d062aa4b [formerly aa2eda2c38] [formerly 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a]]
Former-commit-id: e210fa8935d6faf05e7b000811df47d3a19ffb19 [formerly 06737e3fa2]
Former-commit-id: 32dd0fedc1
2013-10-01 14:22:33 -05:00
Richard Peter
7f7309484a Merge "Issue #2191 Fixing Registry Federation" into development
Former-commit-id: cbe194726e [formerly f1dbe103ee] [formerly 50ce059677] [formerly cbe194726e [formerly f1dbe103ee] [formerly 50ce059677] [formerly eefbfee6fc [formerly 50ce059677 [formerly 97ab04bce3db7f2f2e19d310da5b696e2a860d55]]]]
Former-commit-id: eefbfee6fc
Former-commit-id: 06d67558f6 [formerly 8e429ae579] [formerly 550e1d4073239f5086d4625a19c0241364bd9699 [formerly 14b1fcc763]]
Former-commit-id: c5ee3453f91c1d24c9910aafa3e5abc19dc45510 [formerly ed261ea1a5]
Former-commit-id: b6b92e0ff1
2013-10-01 13:07:47 -05:00
Nate Jensen
f6e4f03765 Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager
Change-Id: I83c36ee235066aa57da88f09090470bce84679f7

Former-commit-id: 97c2f14ad4 [formerly f529c077c6] [formerly effa4f4f26] [formerly 97c2f14ad4 [formerly f529c077c6] [formerly effa4f4f26] [formerly 3e7dc7782f [formerly effa4f4f26 [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: 1d651281da [formerly e1c35952c9] [formerly 9a175ca9dd613a376d9b2a4105b8dc30b47ee828 [formerly 4e6f5afc57]]
Former-commit-id: bd7e0e22b92751e13fbae0bd35a8820eae0554e3 [formerly 593700bd28]
Former-commit-id: 0c92f4eca1
2013-10-01 11:25:45 -05:00
Roger Ferrel
d1f17de341 Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive.
Change-Id: I00ab0a44e37d4e9898aa256f4963c34ed8ae1f48

Former-commit-id: 6f87e4d4ff [formerly 93ce65763e] [formerly e8be9f980a] [formerly 6f87e4d4ff [formerly 93ce65763e] [formerly e8be9f980a] [formerly 546c051e35 [formerly e8be9f980a [formerly 482b253e94e069ae82507e22a94213342b1b92e6]]]]
Former-commit-id: 546c051e35
Former-commit-id: 55931d93af [formerly 3466232f8d] [formerly 3bfae98b1f8082ff8a68fadd0ca1886140657bbf [formerly f01f8e9eb4]]
Former-commit-id: 3cdfa687304fb07dfa424ab4da65b9f89ee2d18e [formerly 213127601d]
Former-commit-id: d5626a0591
2013-09-30 16:45:32 -05:00
Bryan Kowal
4666acc492 Issue #2033 - msi build updates
Former-commit-id: 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly e46254cef1 [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]
Former-commit-id: e46254cef1
Former-commit-id: f3d50a7986 [formerly 93ff6ab60d] [formerly 51e6108a23287dd44038da5afa85240716815ba7 [formerly e76c20007a]]
Former-commit-id: fcd0e86f16a56a19a3cc744fffd66eb77a9afa96 [formerly 8660d4b9e7]
Former-commit-id: 6056aed708
2013-09-30 16:18:37 -05:00
Lee Venable
40dcc74e4b Issue #2420 - fixed font memory leak in the setFont method
Change-Id: Ibf773c6df580cb65dd62b46f8fd127fde6585a57

Former-commit-id: 56ea34b9b3 [formerly e18b0d7e6a] [formerly 44d9e12d98] [formerly 56ea34b9b3 [formerly e18b0d7e6a] [formerly 44d9e12d98] [formerly 9c159e7c40 [formerly 44d9e12d98 [formerly 16effa6f2cda60d566e5f820ab517ed105a0894e]]]]
Former-commit-id: 9c159e7c40
Former-commit-id: ff2735cb20 [formerly e5861dabc3] [formerly c2fe41219e1468e63489b59b609a6c88a3e261b0 [formerly 39cf74adf1]]
Former-commit-id: cc9f4bc462c6658c6cc6b8999b1d28542a2d7612 [formerly 238d4fa030]
Former-commit-id: 027e9179a5
2013-09-30 14:31:46 -05:00
Nate Jensen
9be6409ebb Merge "Issue #2400 fix so active map editor is used if applicable" into development
Former-commit-id: 04328937c8 [formerly 1825bea2cb] [formerly c5d223ade8] [formerly 04328937c8 [formerly 1825bea2cb] [formerly c5d223ade8] [formerly 7da1197e7a [formerly c5d223ade8 [formerly 288acb25b23972bda06795bd02e2de973d4b170b]]]]
Former-commit-id: 7da1197e7a
Former-commit-id: a091b5c9fe [formerly 40eb34ac41] [formerly 90ff2e938948e00e66ff7ecf8253586ab937eaee [formerly 3e9afe9bab]]
Former-commit-id: 6a5db254a0efc8dd20c53c7419ecef627e5398eb [formerly 2ce522854c]
Former-commit-id: 622563303e
2013-09-30 13:10:08 -05:00
Greg Armendariz
22751a433b Merge "Issue #2033 - pde and rpm build updates" into development
Former-commit-id: c781e15ae7 [formerly 14fda3ff05] [formerly 32349a807b] [formerly c781e15ae7 [formerly 14fda3ff05] [formerly 32349a807b] [formerly 4c838ad045 [formerly 32349a807b [formerly c39016a5ce3f12e960b2419a8e3a7df6523791a3]]]]
Former-commit-id: 4c838ad045
Former-commit-id: 9816057613 [formerly 660f7bb52f] [formerly bc3a985a002c87784c0f6a1c6fc438e6f48c05c0 [formerly ab4c07dfdc]]
Former-commit-id: 4a3b6965bdb130622af0d2fa92aa48cb6fa18387 [formerly 926e15025f]
Former-commit-id: 03eee46e44
2013-09-30 12:11:59 -05:00
Steve Harris
08f26c03de 13.5.2-7 baseline
Former-commit-id: cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]]
Former-commit-id: a212c30bd7
Former-commit-id: 430d088fae [formerly 06ba0dbf6c] [formerly 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782]]
Former-commit-id: 2b43017e06d19d174d794056f4c10668bd2a1f3c [formerly 5e4023b974]
Former-commit-id: 79d71e33d0
2013-09-30 13:05:31 -04:00
Nate Jensen
344dfd805b Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

Former-commit-id: 6f44e0c9e3 [formerly 58c9aced4e] [formerly 8e9e495149] [formerly 6f44e0c9e3 [formerly 58c9aced4e] [formerly 8e9e495149] [formerly c1dd4b40fb [formerly 8e9e495149 [formerly 563212924964f8ca66cba789d7867b19c68d0682]]]]
Former-commit-id: c1dd4b40fb
Former-commit-id: 3a4fc09777 [formerly 81f5ecb21a] [formerly 876c39cce804bd2eaf674c9c20e970b9219de559 [formerly 136ea71235]]
Former-commit-id: 8f67c9aecbad713073c6c28ec81520dae762c7f9 [formerly 726f38c27f]
Former-commit-id: 8b62ea092a
2013-09-30 11:47:26 -05:00
Benjamin Phillippe
154b7738a4 Issue #2191 Fixing Registry Federation
Change-Id: Ibf3dec6af45424bc8678a37f00b070d3032bb7de

Former-commit-id: f759853531 [formerly 1c9f237245] [formerly f76c747a01] [formerly f759853531 [formerly 1c9f237245] [formerly f76c747a01] [formerly ac44137242 [formerly f76c747a01 [formerly 985d2d02c2191eadcba59af4b16ad3d7e15de6d6]]]]
Former-commit-id: ac44137242
Former-commit-id: cf48f462fe [formerly 83cbecc94e] [formerly cdba9178e2b25b4e73d616be88130ca8a588122a [formerly cc1c27ea93]]
Former-commit-id: 6417a029e2cb3e30c82525aecbc613a0e27282b4 [formerly 6e249902d4]
Former-commit-id: bfac3e7977
2013-09-30 10:16:03 -05:00
Mike Duff
bfa5977f36 Issue #2417 - Fix the highlight all button in the notification center's find dialog
Change-Id: Ia39e049045116a4766ed989612f6ab9a3d994efd

Former-commit-id: b6cdbfa984 [formerly a966d4ce97] [formerly 43e2b5c156] [formerly b6cdbfa984 [formerly a966d4ce97] [formerly 43e2b5c156] [formerly b0fac5792b [formerly 43e2b5c156 [formerly 01d92017a3db5aafc4b6d6a9f00abbf64481cfe7]]]]
Former-commit-id: b0fac5792b
Former-commit-id: fe2772a402 [formerly 095a9161f4] [formerly 3c1e5b6577a1d21f08888d233d952d001cab7fd5 [formerly 708f60d5c0]]
Former-commit-id: c96432dad30245caa5e43f9c105434cdf5f58275 [formerly e66ae68770]
Former-commit-id: 9dd740eeee
2013-09-30 09:40:08 -05:00
Lee Venable
6d5268c5a8 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: 03eded9a02 [formerly ae23948831] [formerly 0758d67964] [formerly 03eded9a02 [formerly ae23948831] [formerly 0758d67964] [formerly 9c02d45802 [formerly 0758d67964 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]]]]
Former-commit-id: 9c02d45802
Former-commit-id: 02d2efbab4 [formerly abb0b0a7f1] [formerly 10aea7943c14acb6d64234fe754bf95304637693 [formerly b9fd15122e]]
Former-commit-id: 0158af54cfb4bea6b73a9bd8f8cd81ae38ed2a61 [formerly 87be8618c4]
Former-commit-id: a9e6005dd2
2013-09-27 15:07:02 -05:00
Brian Clements
9291d684ab Issue #2404 added upgrade script to move style rules
Former-commit-id: 2fe6db57ff [formerly 480605251a] [formerly 5c3a995fad] [formerly 2fe6db57ff [formerly 480605251a] [formerly 5c3a995fad] [formerly 2ebc09493a [formerly 5c3a995fad [formerly c6b890c59cdc5d831358f3d908533cc1ecf2cec9]]]]
Former-commit-id: 2ebc09493a
Former-commit-id: 1e3b3868c6 [formerly 1dc301acd0] [formerly f194e1c3c80a443fa6a811b28b45cc1803a644c8 [formerly 788e95f6d1]]
Former-commit-id: 95049c7ff1d632548a963225d5db1a144d7438cb [formerly 72b5f0927a]
Former-commit-id: 86ad359c34
2013-09-27 11:16:35 -05:00
Brian Clements
211a10b732 Issue #2404 Moved colormap parameter factory to common
moved grid level translator from viz to common
updated references to moved classes
created grid style util for common styling code
updated style manager to look in common for files
moved data plugin style rules to common


Former-commit-id: 75f633875a [formerly 4c5d2b051d] [formerly 2f25116c10] [formerly 75f633875a [formerly 4c5d2b051d] [formerly 2f25116c10] [formerly 75448f8a42 [formerly 2f25116c10 [formerly 7cdff04cc4d60b50a2a2c08499ee329586031e0f]]]]
Former-commit-id: 75448f8a42
Former-commit-id: 020e0ad959 [formerly fedd0dc781] [formerly d4cfc1a33bcf3a62fb5caa53d995204178e1de78 [formerly e8cc15940c]]
Former-commit-id: 709ced1825803b3b455dac5f222841852fd18389 [formerly 0ba625fbe6]
Former-commit-id: 6cb6d468fe
2013-09-27 09:41:51 -05:00
Nate Jensen
a4d8983d8a Merge "Issue #2386 Backend work for adding multiple types to Subscription overlap rules Change-Id: I0779dc7987031999b80ab0859c7f33dca20a5c17" into development
Former-commit-id: d229a9e02f [formerly 51bf49f6b5] [formerly 291cd53426] [formerly d229a9e02f [formerly 51bf49f6b5] [formerly 291cd53426] [formerly c40bedaaf9 [formerly 291cd53426 [formerly 9f24ff56dd91286c02ef168be4d4b36efe67f497]]]]
Former-commit-id: c40bedaaf9
Former-commit-id: 429c48e4b0 [formerly daff685991] [formerly c4f4fd5103ce13cdb252034475a043e5da28d555 [formerly a865c6b706]]
Former-commit-id: 649eb84b04fb47db496460ed25a754c1760e8968 [formerly e5d98833b1]
Former-commit-id: a3cfe6903a
2013-09-27 09:39:54 -05:00
Nate Jensen
5224d5d4ef Merge "Issue #2081 Removed the special case handling of spaces in dataURIs. Provided upgrade script for data types that have underscores in their dataURIs that should be spaces." into development
Former-commit-id: 5193e82c1d [formerly 37beaaadc1] [formerly 692a15a92f] [formerly 5193e82c1d [formerly 37beaaadc1] [formerly 692a15a92f] [formerly 06631d85f6 [formerly 692a15a92f [formerly df60c32387ae7959be9e5ea7579f07ab67fb991b]]]]
Former-commit-id: 06631d85f6
Former-commit-id: 9eca55b752 [formerly 5d3eecfb25] [formerly b71d7a6b2c8b021455c0e5e77af58de4b2ed71e2 [formerly 4a7b73943a]]
Former-commit-id: a5510c1f7c90fbde6ee384f8292da8e085c14e4f [formerly 40c0a64490]
Former-commit-id: 9296ad509b
2013-09-26 17:31:26 -05:00
Richard Peter
1fdaf8e8b5 Merge "Issue #2413 - Added isDirty check to new config for Data Browser Peer review comments" into development
Former-commit-id: d4a9919307 [formerly a7f13c41ae] [formerly 2257278313] [formerly d4a9919307 [formerly a7f13c41ae] [formerly 2257278313] [formerly 1f40a40449 [formerly 2257278313 [formerly bedacaf43bb65ed3cfbf2aff57cd8839f8df4815]]]]
Former-commit-id: 1f40a40449
Former-commit-id: f1a02dd4de [formerly 84c5ae8313] [formerly 3fc499910ccf3ce4979b9fd849045398d61f9ca7 [formerly a87a85f3af]]
Former-commit-id: dab4fb914467a43c442df7d1ad111a5982858e9c [formerly 795a14d55b]
Former-commit-id: 88968d426f
2013-09-26 15:23:54 -05:00
Mike Duff
0857131ad5 Issue #2413 - Added isDirty check to new config for Data Browser
Peer review comments

Change-Id: I920fb093aea05ca985e1429671b94e34279a1af2

Former-commit-id: 4a008acf29 [formerly ab857adda8] [formerly 9d95942ad1] [formerly 4a008acf29 [formerly ab857adda8] [formerly 9d95942ad1] [formerly 8a325f1af7 [formerly 9d95942ad1 [formerly 56d7387b481a2ed6c6647130ad75eae22e319928]]]]
Former-commit-id: 8a325f1af7
Former-commit-id: 5717096f2e [formerly 65fc907fa9] [formerly 7ae2d0e707c77ed36da8f67bc4002f3195cbc23c [formerly 5a62dad000]]
Former-commit-id: e3c32800a4b1bef61bebddb38b060046a148dbd0 [formerly e0dca1d286]
Former-commit-id: 980ac20a35
2013-09-26 15:18:42 -05:00
Mike Duff
88ae14c3dd Issue #2410 - Fix loading of notification center's filter config file
Change-Id: I0bc9557d0eb0a8f5de40a45064cba031f7839fbd

Former-commit-id: 12575e501a [formerly a9ec223319] [formerly 83064b2bd7] [formerly 12575e501a [formerly a9ec223319] [formerly 83064b2bd7] [formerly d29beb9d8d [formerly 83064b2bd7 [formerly 96b4c904497ffc99d57949455b96025c658ae9c7]]]]
Former-commit-id: d29beb9d8d
Former-commit-id: 059618692b [formerly 8f89d25fc2] [formerly 21fe3045321c5e2ed56fa3c17953fed91c53998c [formerly c2f6f46ece]]
Former-commit-id: 6915a6af6f3ff233d076cd84631ee0a8579a9e1d [formerly 79bcf798a2]
Former-commit-id: 6598f68ff0
2013-09-26 15:08:30 -05:00
Richard Peter
3e5e551827 Merge "Issue #2412 - Fix problem loading config in dataset discovery browser" into development
Former-commit-id: 9a4ac3be05 [formerly 7bcf34a67f] [formerly 077703ddd8] [formerly 9a4ac3be05 [formerly 7bcf34a67f] [formerly 077703ddd8] [formerly 15866b434c [formerly 077703ddd8 [formerly 97e67fe192e23cc11a05f9db69455b88c7a6fa5d]]]]
Former-commit-id: 15866b434c
Former-commit-id: fc2a63ae15 [formerly 64f7bceaf6] [formerly 4f737c335107fe37379a8e21d576bf4d75918c92 [formerly 3ba5596d9f]]
Former-commit-id: 86a8fbc8216d02be14c475759d5b3e887fc3d065 [formerly ac85df4574]
Former-commit-id: feb026820f
2013-09-26 14:56:11 -05:00
Richard Peter
ed90d9d257 Merge "Issue #2409 - Add widget disposed check" into development
Former-commit-id: 4b5d2ebe33 [formerly 5dd79b7d5e] [formerly 4a4f47e8d1] [formerly 4b5d2ebe33 [formerly 5dd79b7d5e] [formerly 4a4f47e8d1] [formerly 00e7a6fb16 [formerly 4a4f47e8d1 [formerly 3c3fa316eb073d685f471ebcc48d599b4013c2c4]]]]
Former-commit-id: 00e7a6fb16
Former-commit-id: 7aef50cd70 [formerly 2e72cda86c] [formerly aef2cc3aacb239e6df24efd698892f6fc1909fef [formerly 0f6fc99952]]
Former-commit-id: 9e6540c9fb1f875b94537b61ecab9c4f398d5cf6 [formerly 3b1c95ecde]
Former-commit-id: ba88b1e608
2013-09-26 14:55:17 -05:00
Richard Peter
351cd837f9 Merge "Issue #2408 - Add a restore hidden notification menu item to Notification center" into development
Former-commit-id: 722d1c48e9 [formerly 24da2b9721] [formerly f066cee72b] [formerly 722d1c48e9 [formerly 24da2b9721] [formerly f066cee72b] [formerly 614cde9ec7 [formerly f066cee72b [formerly fac0408066832cb82e8193e1151eb8c63f9131f8]]]]
Former-commit-id: 614cde9ec7
Former-commit-id: 94a172b2f9 [formerly e75f71c079] [formerly a9f5068270194d6028c8d361a2849fc5b4bd463b [formerly 4c5a733870]]
Former-commit-id: 0230de49fbc325c1af49731fc71d2cf52c354abc [formerly 801d9e4ccc]
Former-commit-id: cd9e7d8195
2013-09-26 14:55:01 -05:00
Richard Peter
dbf3aa5045 Merge "Issue #2375 - Only display the configured number of messages in the notification center. Peer review comments" into development
Former-commit-id: b296af36fa [formerly fd6b01b653] [formerly f1b5b78165] [formerly b296af36fa [formerly fd6b01b653] [formerly f1b5b78165] [formerly a1a5ad148c [formerly f1b5b78165 [formerly c43fa953929a1da0eb0ed8523f5a9b85b4e4b981]]]]
Former-commit-id: a1a5ad148c
Former-commit-id: 24910e6531 [formerly a0aa2311e0] [formerly e43702f2b9d4c946e9047af629ed7de7dd6c5d92 [formerly a284046404]]
Former-commit-id: 58adbe9925844b0eef205c1dc8943aa3dd25f33f [formerly d5ca48b3c6]
Former-commit-id: 460ef0b032
2013-09-26 14:54:48 -05:00