Commit graph

3920 commits

Author SHA1 Message Date
Richard Peter
681f174d88 Issue #2357: Remove edex jms resource reuse by other threads.
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823

Former-commit-id: d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly 802ab87e57 [formerly be99174b65 [formerly a13a027b07a8d080c4506748afe5882575ae6532]]]
Former-commit-id: 802ab87e57
Former-commit-id: a391c7d1d91621bfca9c5deeb80e3d2239e0295a [formerly 5320536f54]
Former-commit-id: 7dc61aceee
2013-10-07 12:38:08 -05:00
Bryan Kowal
6d41496563 Issue #2033 - deploy the CAVE localization to the etc directory at installation time
Change-Id: I899b89c12d2bbe2fb739ba15b3bafbc9855e6102

Former-commit-id: b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly c3a65f9882 [formerly 73ccd8245d [formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]
Former-commit-id: c3a65f9882
Former-commit-id: 6318bd34a70adec7bacce93dbc889b1c6350df7e [formerly e27bfa7c27]
Former-commit-id: 0f9d525ac1
2013-10-07 12:22:50 -05:00
Ben Steffensmeier
c476f76088 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

Former-commit-id: 4e37571a61 [formerly bae5c951d4] [formerly f4c616fbff] [formerly 4e998f2576 [formerly f4c616fbff [formerly ce15657bc794afe819d729121bc202b4f43b97d6]]]
Former-commit-id: 4e998f2576
Former-commit-id: 2ba961c0a05f3ff564c22df12d8a167d66547f34 [formerly 76c73c10af]
Former-commit-id: 8428550b79
2013-10-07 12:04:19 -05:00
Bryan Kowal
4cd2815705 Merge "Revert "Issue #2033 - pde and rpm build updates"" into development
Former-commit-id: cfd39d5e5c [formerly 6e05c00981] [formerly 0698d28222] [formerly 82d61b53d4 [formerly 0698d28222 [formerly 0fb325bd5a463c243b807fbe44d2499bc7fc814c]]]
Former-commit-id: 82d61b53d4
Former-commit-id: d267346cd6171a83369a2844a809a17c5af0f381 [formerly 551b501e2e]
Former-commit-id: 5cd20aed43
2013-10-07 11:52:58 -05:00
Greg Armendariz
70af0399d8 Merge "Revert "Issue #2033 - msi build updates"" into development
Former-commit-id: cc3666ae99 [formerly 9a75ba8d59] [formerly 2059cbc573] [formerly b09988c403 [formerly 2059cbc573 [formerly 7157d5791045a456ebe9eef1c8ce21e549bf0761]]]
Former-commit-id: b09988c403
Former-commit-id: e195dddece73fe0b7dd5eecb629b639407bd6bd7 [formerly 74b1f23db7]
Former-commit-id: f03c56aa9d
2013-10-07 10:01:14 -05:00
Benjamin Phillippe
1d645a975b Issue #2385 Fixed subscription backup web page
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf

Former-commit-id: 1a10852cbf [formerly ce3e85e4d4] [formerly 2759456eb4] [formerly 5e72b8fa2e [formerly 2759456eb4 [formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: d30302cf9dd37231ec21ef2abe22da13e1537916 [formerly 323d9f40da]
Former-commit-id: 4fef3dad20
2013-10-07 09:52:47 -05:00
Lee Venable
82dc36a619 Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 3235852e78 [formerly 0eff818ede] [formerly c1991c5c66] [formerly 7bd1fec82e [formerly c1991c5c66 [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: 562ab2641867c75dba6e4590b19f96ce08f546ee [formerly bdd28e1e09]
Former-commit-id: a55d310ebe
2013-10-07 09:30:45 -05:00
Nate Jensen
b91262e079 Merge "Issue #2361 Get common.monitor plugin away from using global JAXB context and ISerializableObject" into development
Former-commit-id: 8ed4f41938 [formerly be1385b705] [formerly adc774bee9] [formerly c36c50d189 [formerly adc774bee9 [formerly a686d702002a5e01389be1fd5e72558239687080]]]
Former-commit-id: c36c50d189
Former-commit-id: c894f0c1c606778947fd465b7a239d04dcad6edd [formerly 10ba6f231a]
Former-commit-id: 01997dd1fb
2013-10-07 09:30:31 -05:00
Lee Venable
ccbc44f9d3 Issue #2436 - disposed of the sort color
Former-commit-id: f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]
Former-commit-id: c4ddd46b44
Former-commit-id: b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6]
Former-commit-id: 2ed106cac4
2013-10-07 09:11:25 -05:00
David Gillingham
87c7cb22ef Issue #2418: Add display support for pSurge 2.0 data in GFE.
Change-Id: Ifbd6df0247c26ea250cd52430211c51cf71c7381

Former-commit-id: af1b5406b1 [formerly 8bc1325626] [formerly 0fba91a985] [formerly 8eba0e3dea [formerly 0fba91a985 [formerly 840d411da94fd6267d6a91831257454595bfa66b]]]
Former-commit-id: 8eba0e3dea
Former-commit-id: 50cbfab2218b8b273b93c3d9609fe6b4e2f2380b [formerly aae6f4a634]
Former-commit-id: e9d6191c98
2013-10-04 12:58:07 -05:00
Dave Hladky
87574fd68a Issue #1797 Separation of gridded time and abstract time object
Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63

Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]
Former-commit-id: 1733834e74
Former-commit-id: 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c]
Former-commit-id: 21239525ea
2013-10-04 10:36:27 -05:00
Steve Harris
9e5ad5cd96 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]
Former-commit-id: 21b84f0290
2013-10-04 11:30:03 -04:00
Bryan Kowal
020566233e 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 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].


Former-commit-id: ab100bb5b1 [formerly a75ed2b079] [formerly bb2e914c00] [formerly 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: 4664dae5d08c4cc7ae160de4020c49d55f3b6503 [formerly 4d08d7a1c3]
Former-commit-id: d4eba48f94
2013-10-04 09:47:59 -05:00
Bryan Kowal
1b450afc35 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 e46254cef1 [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]].


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

Former-commit-id: 354af07416 [formerly 80081ff25b] [formerly 865b5f6878] [formerly d258009cc7 [formerly 865b5f6878 [formerly 74327c92303fe846d7333d8760652dbcace2d45f]]]
Former-commit-id: d258009cc7
Former-commit-id: 1ac7599652efeecae27c7dd2a2b8782fc610c0bc [formerly 81bd77e56d]
Former-commit-id: 2261f9ff61
2013-10-04 09:27:30 -05:00
Ben Steffensmeier
7f079e75a7 Issue #2402 Make PythonDecoder more extendable.
Former-commit-id: 69cab5e25f [formerly f848fa2218] [formerly a5a0bf72b6] [formerly 058b32eaec [formerly a5a0bf72b6 [formerly 19329b4f5a621f20bc45beedbe5acaadc84e9c2f]]]
Former-commit-id: 058b32eaec
Former-commit-id: 06c3f35b16a3936f0a83c95eff7c53e69cfe49f3 [formerly 2bccf6a62d]
Former-commit-id: d0c330f5a2
2013-10-03 18:19:04 -05:00
Richard Peter
72a46c6756 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 bc3843dc75 [formerly 5adf4298ef [formerly 3d09c6dedbaaa0db6b2247832a45bde8a1357786]]]
Former-commit-id: bc3843dc75
Former-commit-id: cd6bc6d12c65aaf24ab02fb94462ec677ce9cce2 [formerly f7a7228e09]
Former-commit-id: 8694f13766
2013-10-03 16:57:39 -05:00
Ben Steffensmeier
ecbfb28dd5 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 8f94e1434c [formerly 236b3fe05f [formerly 6de5f10b9abf900fc412f2b1e867ce339a15d41e]]]
Former-commit-id: 8f94e1434c
Former-commit-id: 58059d168eebf3a630d52b3ac6f4dd734e1de30b [formerly d4670d19b1]
Former-commit-id: 69eec8d4c6
2013-10-03 16:30:13 -05:00
Nate Jensen
86ddc9d15c 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 42fee320ab [formerly 3f24b9e424 [formerly e574d96b347d79fe7aaa0f8dded8c93af1191fdd]]]
Former-commit-id: 42fee320ab
Former-commit-id: 21bad7f950e722fad0361157366fe92dc449fa51 [formerly 160d1fbb01]
Former-commit-id: 82e0af6a9c
2013-10-03 15:18:55 -05:00
Nate Jensen
15fcc9f06f 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 36f5c2c44b [formerly 23c742c202 [formerly fdf53f7eb888c38849821457fe248ba1f399b6e5]]]
Former-commit-id: 36f5c2c44b
Former-commit-id: 08a7b33298fc1dc66e7d0ed824ae2a26fc0bbbc1 [formerly 485a36fbb4]
Former-commit-id: 649c3b0e7d
2013-10-03 12:56:47 -05:00
Roger Ferrel
91b64293fe Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53]
Former-commit-id: 220769dab0
2013-10-03 12:33:26 -05:00
Bryan Kowal
42298eb650 Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: aca0ce04b8 [formerly ef93741056] [formerly 3b1f089cbd] [formerly 26f787ac83 [formerly 3b1f089cbd [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]
Former-commit-id: 26f787ac83
Former-commit-id: 9ca71543985cf366b72245955e1fe6c6e51848a9 [formerly 429c534da0]
Former-commit-id: 2e9836e506
2013-10-03 11:54:23 -05:00
Max Schenkelberg
9e14571020 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 866c851b47 [formerly e3f6b1ea21 [formerly 384b8e6a02d4fffa0688993b2a2b53e974ecf493]]]
Former-commit-id: 866c851b47
Former-commit-id: 00101432c385c23ffd439ab94c020a849e2c2d13 [formerly ba25f56dbe]
Former-commit-id: 43b7cb3107
2013-10-03 11:43:26 -05:00
Ben Steffensmeier
075a394152 Issue #2363 Add more vector configuration optons.
Change-Id: I1a3e564629b9e4afe93a0a4ceee8e57681aa0644

Former-commit-id: 1aa1f72b68 [formerly 860258e49c] [formerly ff06ea1c5a] [formerly 20853f7333 [formerly ff06ea1c5a [formerly 8af298f9ef2c1c03e6be690c07829d0569b1dedd]]]
Former-commit-id: 20853f7333
Former-commit-id: d31fc0b096d78305c15905ad2838ab76dd9d9f67 [formerly 6c7c693581]
Former-commit-id: bf0642450c
2013-10-03 10:36:47 -05:00
Bryan Kowal
9d5ae53748 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 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927]
Former-commit-id: 6c60d06f9f
2013-10-02 15:49:17 -05:00
Bryan Kowal
7fb399245e 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 73690a97aa [formerly 26cf5dad60 [formerly d1f201a579b9a0421295df26c9ad17717581073f]]]
Former-commit-id: 73690a97aa
Former-commit-id: 232a8e4ea04337a2838adc508ab6d0ba1d969176 [formerly 86e0b3480f]
Former-commit-id: 6162beb8e0
2013-10-02 15:49:16 -05:00
Greg Armendariz
4354bf629b Merge "Issue #2142 fix hibernate log" into development
Former-commit-id: aa8ce6217a [formerly 1c7dcca534] [formerly c372f7639a43884d0d4221f75ac89b5a2cc690a4 [formerly 16e36817cf]] [formerly f7b6c60ee6 [formerly 16e36817cf [formerly bf5cbc38c8b345830c673cda8078a62de8040335]]]
Former-commit-id: f7b6c60ee6
Former-commit-id: 975400851b7a97c1e9d9c7f5b0ef8e00b4d7398e [formerly b2c2fcb968]
Former-commit-id: 18f6b66b7a
2013-10-02 15:32:54 -05:00
Nate Jensen
d8714ec679 Issue #2142 fix hibernate log
Change-Id: I20cfbaacd210ec43f6228d094669b34224862549

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

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

Former-commit-id: 1810a8cf6d [formerly 8e17babd91] [formerly dd75847b7b] [formerly 396e69180d [formerly dd75847b7b [formerly ef569f59ca91c73cfbfad4b062fb0110d33533d3]]]
Former-commit-id: 396e69180d
Former-commit-id: 65d1242b3cdd63e3ebb6a298f4c1b96d6ee987a6 [formerly 3b92de5abc]
Former-commit-id: 28ce7782fe
2013-10-02 09:09:26 -05:00
Roger Ferrel
a6316240e5 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 e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d]
Former-commit-id: 34ea90f18a
2013-10-01 16:36:34 -05:00
Richard Peter
be160753c6 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 59061263d2 [formerly 463c07c3de [formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]]
Former-commit-id: 59061263d2
Former-commit-id: 5f8a32532e78cbb0c9686f7ba34b352df06ead58 [formerly 7309d7d836]
Former-commit-id: 33a53e5b2a
2013-10-01 15:31:12 -05:00
Nate Jensen
cc4b86a7c4 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 6cd79464ef [formerly 265b6e7e61 [formerly 33899872714e8b945131bc17eab63bc71af38d37]]]
Former-commit-id: 6cd79464ef
Former-commit-id: 90d47dafdaac70bbece8a61b2bcc06fe50ccdf5e [formerly 64d66cf406]
Former-commit-id: c4018373f1
2013-10-01 15:19:56 -05:00
Richard Peter
1e05051167 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 f4e71b65d3 [formerly bb9488bb92 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 7e26aa18c7f56b191ba44b8bf661be4364edc8a9 [formerly 39ae6d437d]
Former-commit-id: 3514194d3b
2013-10-01 15:06:34 -05:00
Richard Peter
64d062aa4b 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 add32a774f [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]
Former-commit-id: add32a774f
Former-commit-id: 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a]
Former-commit-id: aa2eda2c38
2013-10-01 14:22:33 -05:00
Richard Peter
06d67558f6 Merge "Issue #2191 Fixing Registry Federation" into development
Former-commit-id: cbe194726e [formerly f1dbe103ee] [formerly 50ce059677] [formerly eefbfee6fc [formerly 50ce059677 [formerly 97ab04bce3db7f2f2e19d310da5b696e2a860d55]]]
Former-commit-id: eefbfee6fc
Former-commit-id: 550e1d4073239f5086d4625a19c0241364bd9699 [formerly 14b1fcc763]
Former-commit-id: 8e429ae579
2013-10-01 13:07:47 -05:00
Nate Jensen
1d651281da 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 3e7dc7782f [formerly effa4f4f26 [formerly f8d8a0033729878c8c6d94c00fd861ddc81f9d96]]]
Former-commit-id: 3e7dc7782f
Former-commit-id: 9a175ca9dd613a376d9b2a4105b8dc30b47ee828 [formerly 4e6f5afc57]
Former-commit-id: e1c35952c9
2013-10-01 11:25:45 -05:00
Roger Ferrel
55931d93af 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 546c051e35 [formerly e8be9f980a [formerly 482b253e94e069ae82507e22a94213342b1b92e6]]]
Former-commit-id: 546c051e35
Former-commit-id: 3bfae98b1f8082ff8a68fadd0ca1886140657bbf [formerly f01f8e9eb4]
Former-commit-id: 3466232f8d
2013-09-30 16:45:32 -05:00
Bryan Kowal
f3d50a7986 Issue #2033 - msi build updates
Former-commit-id: 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly e46254cef1 [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]
Former-commit-id: e46254cef1
Former-commit-id: 51e6108a23287dd44038da5afa85240716815ba7 [formerly e76c20007a]
Former-commit-id: 93ff6ab60d
2013-09-30 16:18:37 -05:00
Lee Venable
ff2735cb20 Issue #2420 - fixed font memory leak in the setFont method
Change-Id: Ibf773c6df580cb65dd62b46f8fd127fde6585a57

Former-commit-id: 56ea34b9b3 [formerly e18b0d7e6a] [formerly 44d9e12d98] [formerly 9c159e7c40 [formerly 44d9e12d98 [formerly 16effa6f2cda60d566e5f820ab517ed105a0894e]]]
Former-commit-id: 9c159e7c40
Former-commit-id: c2fe41219e1468e63489b59b609a6c88a3e261b0 [formerly 39cf74adf1]
Former-commit-id: e5861dabc3
2013-09-30 14:31:46 -05:00
Nate Jensen
a091b5c9fe Merge "Issue #2400 fix so active map editor is used if applicable" into development
Former-commit-id: 04328937c8 [formerly 1825bea2cb] [formerly c5d223ade8] [formerly 7da1197e7a [formerly c5d223ade8 [formerly 288acb25b23972bda06795bd02e2de973d4b170b]]]
Former-commit-id: 7da1197e7a
Former-commit-id: 90ff2e938948e00e66ff7ecf8253586ab937eaee [formerly 3e9afe9bab]
Former-commit-id: 40eb34ac41
2013-09-30 13:10:08 -05:00
Greg Armendariz
9816057613 Merge "Issue #2033 - pde and rpm build updates" into development
Former-commit-id: c781e15ae7 [formerly 14fda3ff05] [formerly 32349a807b] [formerly 4c838ad045 [formerly 32349a807b [formerly c39016a5ce3f12e960b2419a8e3a7df6523791a3]]]
Former-commit-id: 4c838ad045
Former-commit-id: bc3a985a002c87784c0f6a1c6fc438e6f48c05c0 [formerly ab4c07dfdc]
Former-commit-id: 660f7bb52f
2013-09-30 12:11:59 -05:00
Steve Harris
430d088fae 13.5.2-7 baseline
Former-commit-id: cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]
Former-commit-id: a212c30bd7
Former-commit-id: 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782]
Former-commit-id: 06ba0dbf6c
2013-09-30 13:05:31 -04:00
Nate Jensen
3a4fc09777 Issue #2400 fix so active map editor is used if applicable
Change-Id: I642edc1bdc94eac871a07c26e900c2431f567ab1

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

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

Former-commit-id: b6cdbfa984 [formerly a966d4ce97] [formerly b5f0a52171435d1ac459213692c622604296485c [formerly 43e2b5c156]] [formerly b0fac5792b [formerly 43e2b5c156 [formerly 01d92017a3db5aafc4b6d6a9f00abbf64481cfe7]]]
Former-commit-id: b0fac5792b
Former-commit-id: 3c1e5b6577a1d21f08888d233d952d001cab7fd5 [formerly 708f60d5c0]
Former-commit-id: 095a9161f4
2013-09-30 09:40:08 -05:00
Lee Venable
02d2efbab4 Issue #2419 - fixed issue with DualList and how it was being used.
Former-commit-id: 03eded9a02 [formerly ae23948831] [formerly 0758d67964] [formerly 9c02d45802 [formerly 0758d67964 [formerly 7020ca52e6e22a68013de74bc9891ad44942c48a]]]
Former-commit-id: 9c02d45802
Former-commit-id: 10aea7943c14acb6d64234fe754bf95304637693 [formerly b9fd15122e]
Former-commit-id: abb0b0a7f1
2013-09-27 15:07:02 -05:00