Commit graph

4099 commits

Author SHA1 Message Date
Lee Venable
e4a7b72c9e Issue #2437 - fixed color memory leak.
Former-commit-id: 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly 4f5ee0dbcd [formerly 615fcc7f8e] [formerly 604f8f86a4] [formerly a4be7633a6 [formerly 604f8f86a4 [formerly f081bea82ced5931f8424d51994571d5a9971cfe]]]]
Former-commit-id: a4be7633a6
Former-commit-id: 9502d31555 [formerly 046a0a764d] [formerly e3d05cf966b9b910eaf401e19cf70c624f4713f0 [formerly b3efbb97c1]]
Former-commit-id: 7e2f5ee8acd402f4b53f733aef6203fa20af913f [formerly 27a4e1ef75]
Former-commit-id: d07fc36b0c
2013-10-07 13:55:54 -05:00
Nate Jensen
48115ef8ae Issue #2361 remove XML annotations from IHFS table classes
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939

Former-commit-id: 64a5f390c8 [formerly f2dd7d28e1] [formerly 55a39d6458] [formerly 64a5f390c8 [formerly f2dd7d28e1] [formerly 55a39d6458] [formerly ded2e8a852 [formerly 55a39d6458 [formerly 137b91fdad93d661243ecfbb60e28dc0c77b5b76]]]]
Former-commit-id: ded2e8a852
Former-commit-id: 8358e38636 [formerly e40465105c] [formerly c859edc26db34632f9698fc027f825d83211ccd0 [formerly 1d3b896c05]]
Former-commit-id: 092a3fef5b9be8e85d4f9c722430314c58821cb1 [formerly e267e0336b]
Former-commit-id: e86afaee6d
2013-10-07 13:06:05 -05:00
Richard Peter
20f1569e97 Issue #2357: Remove edex jms resource reuse by other threads.
Change-Id: I73f5a01f2d943bb9f7f4e51028cc16bfcee3d823

Former-commit-id: d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly d68188c3c2 [formerly c146f90a09] [formerly be99174b65] [formerly 802ab87e57 [formerly be99174b65 [formerly a13a027b07a8d080c4506748afe5882575ae6532]]]]
Former-commit-id: 802ab87e57
Former-commit-id: 681f174d88 [formerly 7dc61aceee] [formerly a391c7d1d91621bfca9c5deeb80e3d2239e0295a [formerly 5320536f54]]
Former-commit-id: 0af0b7c04dbb08e74aefe806a6e6a398a4a099fa [formerly 91bf400b6a]
Former-commit-id: 74b976232c
2013-10-07 12:38:08 -05:00
Bryan Kowal
74607bfac3 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 b64ff3e5b0 [formerly 5f72ab9b4e] [formerly 73ccd8245d] [formerly c3a65f9882 [formerly 73ccd8245d [formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]]
Former-commit-id: c3a65f9882
Former-commit-id: 6d41496563 [formerly 0f9d525ac1] [formerly 6318bd34a70adec7bacce93dbc889b1c6350df7e [formerly e27bfa7c27]]
Former-commit-id: 9b503867b3bc3cb0c68df17ca895e1a78b627a49 [formerly 2f2c57b448]
Former-commit-id: f7c5884c21
2013-10-07 12:22:50 -05:00
Ben Steffensmeier
99262c2e11 Issue #2421 optimize color map loading.
Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304

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

Former-commit-id: 1a10852cbf [formerly ce3e85e4d4] [formerly 2759456eb4] [formerly 1a10852cbf [formerly ce3e85e4d4] [formerly 2759456eb4] [formerly 5e72b8fa2e [formerly 2759456eb4 [formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: 1d645a975b [formerly 4fef3dad20] [formerly d30302cf9dd37231ec21ef2abe22da13e1537916 [formerly 323d9f40da]]
Former-commit-id: 5487bc58007722ca37c4746a603b25179f82ee6a [formerly b25530ea61]
Former-commit-id: dc4b2c7ac3
2013-10-07 09:52:47 -05:00
Lee Venable
5f79b3a696 Merge "Issue #2436 - disposed of the sort color" into development
Former-commit-id: 3235852e78 [formerly 0eff818ede] [formerly c1991c5c66] [formerly 3235852e78 [formerly 0eff818ede] [formerly c1991c5c66] [formerly 7bd1fec82e [formerly c1991c5c66 [formerly a087a06f19df47edc2b818d2f68e2eff5aab2b50]]]]
Former-commit-id: 7bd1fec82e
Former-commit-id: 82dc36a619 [formerly a55d310ebe] [formerly 562ab2641867c75dba6e4590b19f96ce08f546ee [formerly bdd28e1e09]]
Former-commit-id: 2597bffd2a0184918fa41234b6c1289430d0e28c [formerly 9d07c6428b]
Former-commit-id: 7ac56a3b59
2013-10-07 09:30:45 -05:00
Nate Jensen
dc284785db 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 8ed4f41938 [formerly be1385b705] [formerly adc774bee9] [formerly c36c50d189 [formerly adc774bee9 [formerly a686d702002a5e01389be1fd5e72558239687080]]]]
Former-commit-id: c36c50d189
Former-commit-id: b91262e079 [formerly 01997dd1fb] [formerly c894f0c1c606778947fd465b7a239d04dcad6edd [formerly 10ba6f231a]]
Former-commit-id: fd12eac52dd8e1053b0249ebe69cb1c76c125748 [formerly 315026f786]
Former-commit-id: 3d36bc8ee5
2013-10-07 09:30:31 -05:00
Lee Venable
c328869516 Issue #2436 - disposed of the sort color
Former-commit-id: f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]]
Former-commit-id: c4ddd46b44
Former-commit-id: ccbc44f9d3 [formerly 2ed106cac4] [formerly b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6]]
Former-commit-id: d130264f10b1958114f77cf64c39663d19c8c154 [formerly 1000147d0c]
Former-commit-id: b0af7745a6
2013-10-07 09:11:25 -05:00
David Gillingham
802c6978c9 Issue #2418: Add display support for pSurge 2.0 data in GFE.
Change-Id: Ifbd6df0247c26ea250cd52430211c51cf71c7381

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

Former-commit-id: 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 7d43c5b7f9 [formerly 4d4d93fc0a] [formerly e0ec10d073] [formerly 1733834e74 [formerly e0ec10d073 [formerly cdf2b6dd5a5b4a12cf12e6d4d254b5e40acfcef5]]]]
Former-commit-id: 1733834e74
Former-commit-id: 87574fd68a [formerly 21239525ea] [formerly 965f4a1eb5886ed77447541de327726ef9ab34a7 [formerly 89c341509c]]
Former-commit-id: b6b1dc8bacb08fc8a37391ca8c9d065363a89f96 [formerly 3ba8fd56f7]
Former-commit-id: ab9c5af250
2013-10-04 10:36:27 -05:00
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
Steve Harris
91a0ae5f6d Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.java/1.6/component.spec

Former-commit-id: 1afefb5f6f [formerly 96f30b4793] [formerly 8622cc6efa] [formerly 1afefb5f6f [formerly 96f30b4793] [formerly 8622cc6efa] [formerly df206f83bb [formerly 8622cc6efa [formerly d1246136b73673acd22df53fee02adbd51022b4b]]]]
Former-commit-id: df206f83bb
Former-commit-id: d7cd8984aa [formerly 00cc9bc926] [formerly c0033d06ec93f101a6cee850c2f667d20f652759 [formerly 05ac206277]]
Former-commit-id: fe1cc7d1c0c024538e7a6418610255a065df51cb [formerly b225dffea0]
Former-commit-id: a9d0caa9d7
2013-10-03 16:04:21 -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
ea88581637 Issue #2432 - fix qpid build
Former-commit-id: 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 20cf44791d [formerly fdf31a8a6e] [formerly 5db663c2ae] [formerly 6736231873 [formerly 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]]
Former-commit-id: 6736231873
Former-commit-id: 51cf9ed479 [formerly bd93d164c7] [formerly f0d8690b42b34a08e3cc25f03f917bd6fd863575 [formerly f100a9c96a]]
Former-commit-id: 27430e9ec9200cfdcd7eee31ec3a7954ca40324c [formerly 751cd48248]
Former-commit-id: e874f182ef
2013-10-03 08:33:15 -05:00
Bryan Kowal
ef1e7311a0 Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly f092ee3d76 [formerly efd377f12f] [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 61527c0b80 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]]
Former-commit-id: 87087a5ea4
Former-commit-id: c5df92f4eb [formerly af4b729522] [formerly b91956819bff7666a317ceb10eb717ae268cbcff [formerly fe4e9ca3f8]]
Former-commit-id: 67768811b42e628c1bd76006584ee4a3345d538e [formerly 297ee050ca]
Former-commit-id: a249b45111
2013-10-02 18:41:11 -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
Steve Harris
995b29e33c Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/python.site-packages/Installer.qpid/component.spec

kept the omaha_14.1.1 versions of the .so files


Former-commit-id: 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 42cf95b398 [formerly 59f753ee0d] [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: 7fbcfe7e31 [formerly c2fa80310e] [formerly fdd4df5abe5cb73e831f675a386f04a37e52c5b9 [formerly c6a4241c5b]]
Former-commit-id: 88d1ef7b773b7f227f1e41ee678ac1173e134ee6 [formerly 9aa19b42b5]
Former-commit-id: 160a5819f9
2013-10-01 15:34:01 -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
Bryan Kowal
87750ddaef Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 3b7573154c [formerly bb5acf7c11] [formerly c125b5b053] [formerly 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15 [formerly 0f825df590] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50]
Former-commit-id: 7bd9ea3d30
2013-09-30 18:00:31 -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