Ron Anderson
c889da84c7
Issue #2287 Fix null pointer in GFEColorBarResource
...
Change-Id: I477a7d5cc58e61b9d521337a94801114cecde62a
Former-commit-id: 48e53df2c2
[formerly 59c8dc4fae
] [formerly 4e768e812d
] [formerly 8f8e041802
[formerly 4e768e812d
[formerly add48ba3bbf77e6e7cbfa756e6da75c78aab6f0f]]]
Former-commit-id: 8f8e041802
Former-commit-id: 7cfb29e315c4749c5fdc19a78dffa13be4b7c9d8 [formerly 316ba03c10
]
Former-commit-id: 4cbdeefa33
2013-08-29 16:53:55 -05:00
Ron Anderson
39cdff917f
Merge "Issue #2287 Fixed fitToDataColorTable for Single Grids" into omaha_13.5.2
...
Former-commit-id: 1c7890b692
[formerly 6a42802aba
] [formerly 9427060d683e9cfe78cba02f47d34f999f62e721 [formerly ef10d1aa13
]] [formerly 183d3944e4
[formerly ef10d1aa13
[formerly 72e14b106419a137075642c77a051fa82ddb91e1]]]
Former-commit-id: 183d3944e4
Former-commit-id: 2c7505d26edbe6b08be792f686a4bde5c6656966 [formerly e366726d06
]
Former-commit-id: 8b688aa10f
2013-08-29 14:25:45 -05:00
Steve Harris
b800b32b9e
Merge branch 'master_13.5.2' (13.5.2-2) into omaha_13.5.2
...
Conflicts:
msi/VizLauncher/VizLauncher.suo
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
msi/build/A2Staging/VisualStudio/VizLauncher.exe
Former-commit-id: b6df6f2aaa
[formerly 4a0604f28c
] [formerly 866885e3eb
] [formerly 347d1eaef4
[formerly 866885e3eb
[formerly c3a0913f289df802c65015686f877ca9c5e42bf5]]]
Former-commit-id: 347d1eaef4
Former-commit-id: 3fd03f9ee6b9805b2ebcb1741513edfb88c0e02f [formerly 9a6a2561fc
]
Former-commit-id: 539b51afc9
2013-08-29 14:19:17 -05:00
Steve Harris
c10c39b5d6
13.5.2-2 baseline
...
Former-commit-id: 8dcd159377
[formerly 8cde3b2b54
] [formerly 4a47fb97c5
] [formerly 9e4bf0cf2e
[formerly 4a47fb97c5
[formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 8411cf39c13b7f63f746f4a1b8806ba15bfa7510 [formerly 5de6d566f0
]
Former-commit-id: 12b0ab91fd
2013-08-29 15:01:29 -04:00
Ron Anderson
a960a14616
Issue #2287 Fixed fitToDataColorTable for Single Grids
...
Change-Id: I00325b40af3803bd0cfed601371904e5e24c1abe
Former-commit-id: c43f9b53b7
[formerly 344db44bc7
] [formerly 37795f1407
] [formerly 0b6ec808f2
[formerly 37795f1407
[formerly 1cffae67f0150e1a2b1509e560383aa506e4284f]]]
Former-commit-id: 0b6ec808f2
Former-commit-id: a550664bb651dd6a73d71cff9bda58ab55f5fb48 [formerly 561d4cce0b
]
Former-commit-id: 078a619cf8
2013-08-29 13:36:04 -05:00
Max Schenkelberg
279e1c5919
Issue #2300 Fixed NPE in TileSetRenderable with ConcurrentHashMap
...
Change-Id: I9d92e330c66364b2eb904d5858eb6d8a4a75a542
Former-commit-id: 6528df1ebd
[formerly 02cc4abf19
] [formerly dc6ed0a61e
] [formerly 6eedb5e26d
[formerly dc6ed0a61e
[formerly 34f9fdb02b82dd27d8f266bcd78291ebd9586bb5]]]
Former-commit-id: 6eedb5e26d
Former-commit-id: 3a285880333b23d324c21d685304b5e10b43400d [formerly 7175092cb9
]
Former-commit-id: d1d134697d
2013-08-28 14:03:13 -05:00
Ron Anderson
b336ad1bad
Merge "Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave." into omaha_13.5.2
...
Former-commit-id: 4d4077eac0
[formerly de2507a851
] [formerly 89c1f24ff8
] [formerly a78ebffdb5
[formerly 89c1f24ff8
[formerly 475d289ae5a3a024d5f52f7a2c8263533ada6e3f]]]
Former-commit-id: a78ebffdb5
Former-commit-id: 032444fcc52a3ceb8c31137e43347e52644dcf76 [formerly a7a4f9d60e
]
Former-commit-id: 0264f3dee8
2013-08-28 11:18:34 -05:00
Steve Harris
4ef41d2c35
Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: eb43afb042
[formerly 34e085ff97
] [formerly 0791be2b77
] [formerly cfe2ba88ad
[formerly 0791be2b77
[formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 727a02ca1cf8ee5783dc8270301e0e9ffbdc71dc [formerly 116daf48ff
]
Former-commit-id: 5abb143d01
2013-08-28 09:03:09 -05:00
Steve Harris
b4e006162f
13.5.2-1 baseline
...
Former-commit-id: 3cd0b2dfc6
[formerly 894d2425b2
] [formerly 73dd0f166c
] [formerly 542b2c3d18
[formerly 73dd0f166c
[formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]]
Former-commit-id: 542b2c3d18
Former-commit-id: 43ff166b6d3df833e29603f504019d7b3776a1d1 [formerly 4ecb349ed8
]
Former-commit-id: 43af1b227a
2013-08-28 09:43:48 -04:00
Ron Anderson
a5ed604867
Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave.
...
Change-Id: I3d9b8b2441a0b79d393ab4591450b084d24dafc3
Former-commit-id: 559e27a75f
[formerly 66032fcfd7
] [formerly f75dc91293
] [formerly ab4c1ebe5d
[formerly f75dc91293
[formerly 29e2ea5d61af71a366d3a81908b16b4c6a6850f6]]]
Former-commit-id: ab4c1ebe5d
Former-commit-id: 2ba0e690bd1e8ad733aed2a649ff316d58215905 [formerly 2670db83fd
]
Former-commit-id: 877f9b9bc3
2013-08-27 18:54:14 -05:00
Ron Anderson
8e26902f09
Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
...
Change-Id: Id12823256fc3c383005098b83e72249284a36f33
Former-commit-id: 04def1379d
[formerly df357588a0
] [formerly 77db16933e
] [formerly 803515f4ff
[formerly 77db16933e
[formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]
Former-commit-id: 803515f4ff
Former-commit-id: 5764de917b8e19b33bed0061d37a440fbc638101 [formerly 518e32206e
]
Former-commit-id: a1952b7c75
2013-08-27 13:51:17 -05:00
Bryan Kowal
1659386a9c
Issue #2198 - completely override the Path and PythonPath in the environment.
...
- PythonPath is specific to CAVE and will not normally be set
- What is currently set in Path is not relevant because we are running ported code
Former-commit-id: 3fa97d7819
[formerly 6b9ca89bbc
] [formerly f5c3b89dd2
] [formerly e1415e3689
[formerly f5c3b89dd2
[formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]]
Former-commit-id: e1415e3689
Former-commit-id: 47dedaefabeda6c6ca4ce57a08b9555bae5e9e89 [formerly 5458f6956b
]
Former-commit-id: 5b58abe854
2013-08-26 12:43:43 -05:00
Lee Venable
894dbe333c
Issue #2283 - cleaned up some synchronizrd code.
...
Former-commit-id: 6c390e5ffd
[formerly b8f94691c1
] [formerly 027dae1e9b
] [formerly ea4df9cb2d
[formerly 027dae1e9b
[formerly f162222be931d03c3a0401205869d48854703c36]]]
Former-commit-id: ea4df9cb2d
Former-commit-id: febc79faa2ce62e69731f24e1957e231711e9664 [formerly d3268de97a
]
Former-commit-id: b03ec5a6fe
2013-08-26 09:41:21 -05:00
Steve Harris
edd03a1cf1
Merge branch 'master_13.5.2' (13.5.1-18) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
nativeLib/edexBridge/edexBridge.cpp
Former-commit-id: abb7bdd7ed
[formerly decc9e4c36
] [formerly e361386eab
] [formerly 119af8a466
[formerly e361386eab
[formerly a3671ea2935178a28dce6d075dc2067a609e6725]]]
Former-commit-id: 119af8a466
Former-commit-id: 4e6f59fd5b911fc5753e9e8c4824360e1ab43c50 [formerly 5b11d137df
]
Former-commit-id: f56b906997
2013-08-23 11:36:43 -05:00
Jonathan Sanchez
1fefefe9d8
Issue #2176 Implemented emergency warning products.
...
Cherry picked from 13.6.1 e6bb79e45c989e4292b8485307ae239e491cb630 [formerly 67ce90c14a
] [formerly 46d5bd4f0a
[formerly c62de0d75f
] [formerly 7d74ba5ee1
] [formerly 67ce90c14a
[formerly 7d74ba5ee1
[formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]]] to 13.5.2
Change-Id: I80623a63abd495baf3e0004625732f26453a30d9
Former-commit-id: 4ff3193e89
[formerly 051cdc28c2
] [formerly e0bd81c0ae
] [formerly cf51ba9e9c
[formerly e0bd81c0ae
[formerly be486757ed36916c1c3a1e56ddf98754b900b693]]]
Former-commit-id: cf51ba9e9c
Former-commit-id: 1288c49579d7228f01cfd602e4cd73832a09bc32 [formerly 051c8103c7
]
Former-commit-id: c9026b5709
2013-08-22 12:25:42 -05:00
Lee Venable
6ef5a7c3f2
Merge "Issue #2177 Improve county portion descriptions." into omaha_13.5.2
...
Former-commit-id: fadc0d374c
[formerly a0437634dc
] [formerly 07f087013f
] [formerly 321ddebdde
[formerly 07f087013f
[formerly 1b7f1d8dce2cc1161ce06ca0c4a8df68803a12e1]]]
Former-commit-id: 321ddebdde
Former-commit-id: 1825a07f92bc280ec091a8ccab5f7014fa0d7773 [formerly 0af2308491
]
Former-commit-id: f5f1525809
2013-08-22 11:53:18 -05:00
Jonathan Sanchez
ee0f46321b
Issue #2177 Improve county portion descriptions.
...
Change-Id: I9b2326e0b57b2bba7223032e3f08846f0d2f121d
Former-commit-id: 833a869e69
[formerly 67602003cd
] [formerly 0c06112925
] [formerly 321799e07b
[formerly 0c06112925
[formerly a8e74ba813cc841c6cc6ff06df73080d1ce1fd8c]]]
Former-commit-id: 321799e07b
Former-commit-id: 09f6083745f373a9f45f183c6c6d17c10d6388bb [formerly edbc238355
]
Former-commit-id: e1663e7f8d
2013-08-22 10:49:09 -05:00
Steve Harris
ff31991527
13.5.1-18 baseline
...
Former-commit-id: 80d8236464
[formerly d931b80e70
] [formerly afb34814dd
] [formerly 0a7acf96c7
[formerly afb34814dd
[formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: bef853d6001eb232a3c91986195c4ab5e86bc9cd [formerly 2f9aa87a9f
]
Former-commit-id: 261b1da9d6
2013-08-22 09:12:43 -04:00
Steve Harris
ff241c56cc
Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into omaha_13.5.2
...
Former-commit-id: 582a064d32
[formerly e6b0fcf6c9
] [formerly cb1b7ecc55
] [formerly a1b6f8c50c
[formerly cb1b7ecc55
[formerly 37c80d08633e4ab0f7ba6ead07e4cb6fa54e1194]]]
Former-commit-id: a1b6f8c50c
Former-commit-id: 083b33e0f234f33e224fd84a229c56f0ec078317 [formerly a2f17e7af1
]
Former-commit-id: 617c51d5f6
2013-08-21 10:37:52 -05:00
Ben Steffensmeier
f558d240ba
Issue #2194 Fix site override.
...
Former-commit-id: 85c71b7714
[formerly de00b302b3
] [formerly 791c6a9890
] [formerly dac718634c
[formerly 791c6a9890
[formerly faba58780d497f8db564c0fa325c07b35326e010]]]
Former-commit-id: dac718634c
Former-commit-id: 1d5ea6677cdb2f75d1fabaa5d51f91e64314f0f3 [formerly 4e218e9e56
]
Former-commit-id: e757a184e1
2013-08-20 14:47:32 -05:00
Bryan Kowal
c350450024
Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
...
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.
Former-commit-id: 3e9c78b9e0
[formerly 013ba62af1
] [formerly a1fccaa598
] [formerly 21cfeb1b83
[formerly a1fccaa598
[formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: 28e6522f39684a2c80f4e36f7968404f94210af4 [formerly 6cf776926c
]
Former-commit-id: eec811c3b1
2013-08-20 13:56:07 -05:00
Bryan Kowal
ac9eca6b38
Issue #2213 - create the primary and backup exportgrids directories for GFESuite
...
- Amend: no longer create the exportgrids tmp directory
Change-Id: Id8aba47244c21d2d7e114ac1af6a29b9a8cd7059
Former-commit-id: 03d1bd1125
[formerly 684c350d12
] [formerly 72a841bcd5
] [formerly d58a720e38
[formerly 72a841bcd5
[formerly d3736e2b8d83616f0a7c35475c5a552fdae79674]]]
Former-commit-id: d58a720e38
Former-commit-id: 8a827404f7416c90d5e45663d6ac8815023e4167 [formerly e3b8567548
]
Former-commit-id: 525ec05c44
2013-08-20 11:43:18 -05:00
Ben Steffensmeier
fbf165f37f
Issue #2275 Add dataURI column back into bufrmos types.
...
Former-commit-id: c444a0c4ba
[formerly d6ab7d08be
] [formerly 4cb853ac39
] [formerly 9219db0069
[formerly 4cb853ac39
[formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]
Former-commit-id: 9219db0069
Former-commit-id: ababd150fc882dda0dca13854e3bf316e1aafa9b [formerly 8b9031719a
]
Former-commit-id: 3a8893846f
2013-08-19 16:00:01 -05:00
Steve Harris
4fd4093539
13.5.1-17 baseline
...
Former-commit-id: fb9ab08255
[formerly 2d882ccb54
] [formerly 9dd7dc5d20
] [formerly b210c90245
[formerly 9dd7dc5d20
[formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]]]
Former-commit-id: b210c90245
Former-commit-id: c4d2af6f3a1f86a3300795dc1db7d6c9323eac0b [formerly a192a3ebb1
]
Former-commit-id: 7c0cf13ea8
2013-08-19 16:34:24 -04:00
Steve Harris
61b0c9828a
Merge branch 'omaha_13.5.1' into omaha_13.5.2
...
Former-commit-id: 7064944bd4
[formerly 9d07ebdab6
] [formerly bc8af6e701
] [formerly dc44ca76fb
[formerly bc8af6e701
[formerly ab28f86a23e1c8b83204f57da9b8e7bd15cafe98]]]
Former-commit-id: dc44ca76fb
Former-commit-id: 3bff77e7ca1b42280f9bcc3367fa82e79e831485 [formerly e03750d5f9
]
Former-commit-id: 703a110473
2013-08-16 12:45:01 -05:00
Max Schenkelberg
53d4c9d9c2
Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
...
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611
Former-commit-id: f8e36bea6f
[formerly a6a44754c9
] [formerly 57a0df81a6
] [formerly 9e213438f4
[formerly 57a0df81a6
[formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]
Former-commit-id: 9e213438f4
Former-commit-id: e195d4590671cefaed22b31ff4f8a803d2f88877 [formerly b67a3033f9
]
Former-commit-id: 0703b5c772
2013-08-15 17:36:36 -05:00
Max Schenkelberg
39cdbf728f
Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
...
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7
Former-commit-id: 54b4b759fd
[formerly 5a4d880498
] [formerly e85d66f4e5
] [formerly 3800aec9e6
[formerly e85d66f4e5
[formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]
Former-commit-id: 3800aec9e6
Former-commit-id: ac74cfea7295b7cc3576674f8b131a9d316f9718 [formerly d89d13d029
]
Former-commit-id: 352e21ffd3
2013-08-15 15:50:40 -05:00
Bryan Kowal
f2f9b319a2
Issue #2257 - edexBridge now uses qpid 0.18 (64-bit)
...
- Amend: updated for 32-bit
- Amend: close sender, session, and connection independently
Change-Id: I9b8cafbc10d81782a812e9d2d57930e859fa29a5
Former-commit-id: fac61175b6
[formerly 14fc0aba77
] [formerly da29ff63f4
] [formerly 431dbaeaac
[formerly da29ff63f4
[formerly e8f8d498cd15855b72c170f2990fd4929eb636b2]]]
Former-commit-id: 431dbaeaac
Former-commit-id: b2c86076a9640772277bd4127df600a8866f4e44 [formerly 7c3c19f794
]
Former-commit-id: 00c47b4f24
2013-08-15 14:30:55 -05:00
Max Schenkelberg
43fc7e0b43
Issue #2189 Added a FontType option when initializing a font from a file.
...
Change-Id: I54973b7c380b1535dd1e1f7fb49fd0b74b3d1752
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments
Former-commit-id: 59f3945002
[formerly b07ed474e3
] [formerly eab65aab5a
] [formerly 570266eb7b
[formerly eab65aab5a
[formerly 473421a32f7c53453db1c5331714204a89bad4da]]]
Former-commit-id: 570266eb7b
Former-commit-id: 3b2d7d1617ff2d360cb22f44c042b38c9fe3c5e3 [formerly 5840d99a95
]
Former-commit-id: 72fbe0208e
2013-08-15 13:51:07 -05:00
Steve Harris
1c79df1f15
Merge branch 'omaha_13.5.1' into omaha_13.5.2
...
Former-commit-id: b9fbfe4b48
[formerly dfee8ca5d9
] [formerly 67f7a8db62
] [formerly 282577d168
[formerly 67f7a8db62
[formerly cfd93a48150e8c559622e806e98362a51f19aee0]]]
Former-commit-id: 282577d168
Former-commit-id: 458c6230be297d0d6293dff70ec0b5b8c49bc0db [formerly 877d672852
]
Former-commit-id: 1b31d1d62f
2013-08-15 12:55:24 -05:00
Steve Harris
27a5acb143
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: 8f0b0c1514
[formerly 08b105a492
] [formerly 727eba03b9
] [formerly a687da6075
[formerly 727eba03b9
[formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: d74946ee629b4883a0e073d9f37dae4d8ca4ed97 [formerly 522867f068
]
Former-commit-id: e5c50ad0b6
2013-08-15 12:46:48 -05:00
Steve Harris
ca5796e082
13.5.1-16 baseline
...
Former-commit-id: 47130c98a5
[formerly 6818d80085
] [formerly 34ed84336297f15bcf09076786d608ada5df2472 [formerly cd3b63d961
]] [formerly 7ce0234d76
[formerly cd3b63d961
[formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900
]
Former-commit-id: e881ff6271
2013-08-15 13:40:37 -04:00
Jonathan Sanchez
93efe34bc1
Issue #2243 Resolved timing issues.
...
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: 6902b263e5
[formerly 78b655fd1f
] [formerly 2b849d7003
] [formerly bc30396b63
[formerly 2b849d7003
[formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]
Former-commit-id: bc30396b63
Former-commit-id: 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca
]
Former-commit-id: 19853a4b57
2013-08-15 10:56:37 -05:00
David Gillingham
f886d99f18
Issue #2009 : Fix NullPointerException in SocketServer start up.
...
Change-Id: I07683ba74410234d162e058df0bb3ff6e00ee59e
Former-commit-id: bbd1a39f37
[formerly 8faf78d220
] [formerly 2d6c6cdd39
] [formerly 17a45cafe5
[formerly 2d6c6cdd39
[formerly 51a951bf190b7ca68121dc1630f3bc5d094b601b]]]
Former-commit-id: 17a45cafe5
Former-commit-id: 691b2f8318eef69e3a7cb2bcf7eb3a7e6249393b [formerly db0d0374b0
]
Former-commit-id: 64d4ecca53
2013-08-14 17:13:58 -05:00
David Gillingham
5205fe56a7
Issue #2009 : Implement dual-domain GFE export_grids solution. Update MHS
...
emulator program to support new directory structure and some code cleanup and
refactoring.
Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d
Former-commit-id: 31ae04c92a
[formerly 1d3f3da9cc
] [formerly 0f4f24beb8
] [formerly f8b6ec20c1
[formerly 0f4f24beb8
[formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 2eb604c37ee47829cda515d4a57729d8b240989d [formerly 751188ab5a
]
Former-commit-id: 3af47effc5
2013-08-14 17:10:04 -05:00
Richard Peter
309c524817
Issue #1977 : Fix merge issue with WarngenDialog
...
Former-commit-id: 4dc2cdd1d4
[formerly 8ba6abf642
] [formerly 7c03fc955b
] [formerly a5383dbfa4
[formerly 7c03fc955b
[formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]
Former-commit-id: a5383dbfa4
Former-commit-id: adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7
]
Former-commit-id: c8ad0e3317
2013-08-14 15:33:02 -05:00
Greg Armendariz
955f75647d
Merge "Issue #2257 - updated edex_com to use the qpid 0.18 messaging api" into omaha_13.5.1
...
Former-commit-id: 0578f67668
[formerly e254c838ea
] [formerly f02fef09a2
] [formerly edf12d4d4f
[formerly f02fef09a2
[formerly ced372967755b611158c213011132a353b72f421]]]
Former-commit-id: edf12d4d4f
Former-commit-id: 2b69fe3f0396919408641e48b2a327350177c289 [formerly e867472bf6
]
Former-commit-id: c9980c9d3f
2013-08-14 15:00:26 -05:00
Richard Peter
28a53c8a33
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9ff9054d7e
[formerly 2608dfe1d8
] [formerly c61afa1bfa
] [formerly ee6b9eb11a
[formerly c61afa1bfa
[formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080
]
Former-commit-id: 3f65eaf74b
2013-08-14 14:29:55 -05:00
Bryan Kowal
f2b5128ede
Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
...
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function
Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3
Former-commit-id: 67c9cbf70e
[formerly ec0ef7fe80
] [formerly fc8c3f540d
] [formerly 21893102bb
[formerly fc8c3f540d
[formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]
Former-commit-id: 21893102bb
Former-commit-id: 45802081a28e7bb32c87dfb2c52082cf8ae519fb [formerly c2c9d745af
]
Former-commit-id: e76b46487c
2013-08-14 11:21:33 -05:00
Steve Harris
6f1b6d494f
13.5.1-15 baseline
...
Former-commit-id: b05abcaec0
[formerly 535218c676
] [formerly 53e96e21db
] [formerly c6dc1817e7
[formerly 53e96e21db
[formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58
]
Former-commit-id: 4f9288e7c1
2013-08-14 10:24:26 -04:00
Steve Harris
4e75333155
13.5.1-14 baseline
...
Former-commit-id: c6465a3398
[formerly b848317203
] [formerly d695e5debe
] [formerly 80e5f7fbd4
[formerly d695e5debe
[formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f
]
Former-commit-id: 9bd983e2fe
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
aafcbe9520
Issue #2243 Resolved incorrect import.
...
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: 714982e96f
[formerly 52d7862d36
] [formerly c6b6576f01
] [formerly fd0f2f1c09
[formerly c6b6576f01
[formerly f79e7820ea010e0bc860b0033183147d7299221f]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: ea268f1966644425a392151655f4081fa9cf6ad5 [formerly 70bb266da7
]
Former-commit-id: 7189057682
2013-08-13 20:47:49 -05:00
Richard Peter
0c915ec5dc
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
...
Former-commit-id: 4dd1b27e44
[formerly 2b23cb871e
] [formerly 6efc27c1b1
] [formerly d5130432a8
[formerly 6efc27c1b1
[formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]
Former-commit-id: d5130432a8
Former-commit-id: 2a26f47bc2eef0af172637a67f611d6028ddb875 [formerly 2fc754b899
]
Former-commit-id: e28de494e9
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
3806121231
Issue #2243 Fixed update list bugs.
...
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: dc2363ffd7
[formerly 8d0ee7f5ca
] [formerly d685125b25
] [formerly 49f488a58f
[formerly d685125b25
[formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]
Former-commit-id: 49f488a58f
Former-commit-id: dd476c502c979c6b882524dd8959a4110265b20f [formerly 96c88ad28b
]
Former-commit-id: d33332bd58
2013-08-13 16:30:05 -05:00
Nate Jensen
e63e7120e5
Issue #2197 cherry picking 2197 into 13.5
...
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 9a01271f5f
[formerly a9815b0551
] [formerly 15405cab1b
] [formerly 63b2fe798a
[formerly 15405cab1b
[formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8
]
Former-commit-id: 464a104dc1
2013-08-13 12:27:02 -05:00
Ben Steffensmeier
b357fb0018
Issue #1869 Fix bufrua point data stationId.
...
Former-commit-id: c88e432d04
[formerly bf2dfbaca8
] [formerly 9e799b4df1
] [formerly d1d3491aaf
[formerly 9e799b4df1
[formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]
Former-commit-id: d1d3491aaf
Former-commit-id: 5ee45ce1a1eec70e460a54a9e98781bb2db78baa [formerly 761cb47f73
]
Former-commit-id: 20a7ba8e69
2013-08-09 13:00:18 -05:00
Bryan Kowal
0d1cf60269
Issue #2252 - remove file accidentally re-added by the merge.
...
Former-commit-id: 09546736f2
[formerly 0ba5c54688
] [formerly 3bdbf6d0cc
] [formerly 5c6258e8c1
[formerly 3bdbf6d0cc
[formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]
Former-commit-id: 5c6258e8c1
Former-commit-id: e0a4220ad22d5843e5444411defaa80103a9ae61 [formerly a35cbbf85c
]
Former-commit-id: 4f0b9b4cf3
2013-08-08 18:38:21 -05:00
Lee Venable
b46745eebb
Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
...
Former-commit-id: c314bf2092
[formerly ef5a7fb83a
] [formerly 69dd7b66fa
] [formerly 69645f03dc
[formerly 69dd7b66fa
[formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]
Former-commit-id: 69645f03dc
Former-commit-id: e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd
]
Former-commit-id: 696ee07b3f
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
1e64c5d491
Issue #2243 Prevented invalid follow ups.
...
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e
Former-commit-id: 7d34154d2c
[formerly 05f49219d3
] [formerly 4711226b21
] [formerly dad0681ae0
[formerly 4711226b21
[formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]
Former-commit-id: dad0681ae0
Former-commit-id: 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f
]
Former-commit-id: b467d0fd66
2013-08-08 16:31:35 -05:00
Greg Armendariz
d4840d3802
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 154539a4fe
[formerly 3cecb178cf
] [formerly b08ce25ac8
] [formerly ffb2bea8ad
[formerly b08ce25ac8
[formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d
]
Former-commit-id: 24dc722be4
2013-08-08 16:24:39 -05:00