Commit graph

1966 commits

Author SHA1 Message Date
Steve Harris
41b14f0fa2 Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]
Former-commit-id: 73d9455c65
2013-01-31 10:19:14 -06:00
Bryan Kowal
46fb2fcfcc Issue #1551 - adding maps to the Data Access Framework
- initial commit of Maps Geometry Factory
- re-factored geometry factory code
- addressing peer review comments
- cast to Timestamp

Change-Id: Ie12177b5ae1a8d8d9151d061682730841cfcc807

Former-commit-id: 832094f721 [formerly 6ea0653c78] [formerly 964b30d5f2] [formerly 5d83f9f3d1 [formerly 964b30d5f2 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: 3ee1df2f447ab32d118f3e09a714122496b12556 [formerly e86fda2a6f]
Former-commit-id: 0557ecfed3
2013-01-31 10:03:10 -06:00
Dustin Johnson
d3dfd0d13e Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: 1a5b0db18a [formerly e64e36ecf2] [formerly f361f5a6a1] [formerly 5830a98a51 [formerly f361f5a6a1 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]
Former-commit-id: 5830a98a51
Former-commit-id: 8e1ba93b749807b664b2caa682b0ba179d0ff600 [formerly d7077690d8]
Former-commit-id: 0185add187
2013-01-31 08:39:08 -06:00
Mike Duff
fca5b04fa4 Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 1f71b3c0df [formerly 24e9ae73f0] [formerly fc24735297] [formerly f03e9cc5ce [formerly fc24735297 [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: 1c778dd8ecedb2260d7a955f5176aacd9fddd3c9 [formerly a51d48db5e]
Former-commit-id: f5ef2dc1fe
2013-01-30 16:38:04 -06:00
Nate Jensen
91aac7bfed Merge "Issue #1534 Check for null in initInternal to avoid exception" into 13.2.1_delivery
Former-commit-id: 65e07954f3 [formerly 8d07de6933] [formerly a0856d2f26] [formerly ca2d99c69a [formerly a0856d2f26 [formerly a89274c821276c8a5ef3b08a8c25aa03c391b766]]]
Former-commit-id: ca2d99c69a
Former-commit-id: f4706a1e1a32258dc2325221b01ad0d3fe1e9dcd [formerly 1fa3c9cb3c]
Former-commit-id: 28535058f9
2013-01-30 15:02:45 -06:00
Nate Jensen
98e25ac4fd Merge "Issue #1521 add extra validation and checks to grid factory Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c" into development
Former-commit-id: 8b357a94b0 [formerly f1cf8bff45] [formerly 88b52e25f2] [formerly b765544b40 [formerly 88b52e25f2 [formerly af723dd7ec322d586b7eb48381105c1043f32e67]]]
Former-commit-id: b765544b40
Former-commit-id: bc5226b98911daa3e9701c761e635697371d4ba2 [formerly 8952df8497]
Former-commit-id: 2db9dc1130
2013-01-30 15:01:19 -06:00
Roger Ferrel
b14548f572 Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.)
Changes to use fewer synchronized blocks.

Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a

Former-commit-id: 2db9c6d959 [formerly 97b6a1a810] [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7a7f86bfe6 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: e97f47d41962af0f093d3656148674e9f19fe55b [formerly 4dbb053d65]
Former-commit-id: 234b632c75
2013-01-30 13:11:56 -06:00
Max Schenkelberg
326e96ff07 Issue #1534 Check for null in initInternal to avoid exception
Change-Id: I9ccf341c3c04f08f88e5366009771f9cda510119

Former-commit-id: f5d7c0788b [formerly a574e13562] [formerly 5ed30a723e] [formerly 23e3ad2382 [formerly 5ed30a723e [formerly 77d0d92f23325407292c5a048ba1276e7e0568ad]]]
Former-commit-id: 23e3ad2382
Former-commit-id: 535b4635d1e849ee4518722c9c29c0c9bf382296 [formerly 296186190a]
Former-commit-id: 50deaaaa79
2013-01-30 11:34:19 -06:00
Steve Harris
11042fc60c Issue #1542 throw out non-watches in watches resource
Former-commit-id: 4c0e37a050 [formerly b651007bc7] [formerly 2f5d5f08ae] [formerly 97bd112438 [formerly 2f5d5f08ae [formerly e719c4112920802a7457ced7836a1c4a42140400]]]
Former-commit-id: 97bd112438
Former-commit-id: 64003f818d010d0e9ef46b0f08de3ba66cac4046 [formerly 50565fee11]
Former-commit-id: fbbf2f3cda
2013-01-30 11:26:20 -06:00
Ben Steffensmeier
7e8791ae6f Issue #1521 add extra validation and checks to grid factory
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

Former-commit-id: 206c06669a [formerly 9f5a0a1f58] [formerly 52337a2e6e] [formerly 437e6ae690 [formerly 52337a2e6e [formerly 3023799852acfb932f2afcb0c4ed1cf764add776]]]
Former-commit-id: 437e6ae690
Former-commit-id: 7641964f34d6f2992b3c4b7cd6d97f0a437e6cf4 [formerly 449dcb2df2]
Former-commit-id: dcb8a26ca2
2013-01-29 17:37:39 -06:00
Max Schenkelberg
5d59242f46 Issue #1541 Fixed tool activation so always happens in part activated/deactivated listener.
Change-Id: I515bfe867c4ad9c74280173badae408d0ee5dab9

Former-commit-id: 1255469084 [formerly eaae098e29] [formerly 4fae854006] [formerly ad37f68537 [formerly 4fae854006 [formerly c0f98136403a05755d1c7c640f264f1bafe64a4f]]]
Former-commit-id: ad37f68537
Former-commit-id: 44472abf492b5c54704e9e81afafe3a668b3bfa3 [formerly 9d2a960cb4]
Former-commit-id: 88d5c2f793
2013-01-29 17:33:11 -06:00
Lee Venable
d25d858a66 Merge "Issue #1495 add ensemble to Subscription copy constructor" into 13.2.1_delivery
Former-commit-id: 1006b27149 [formerly f88f8211e1] [formerly b82909bfb1] [formerly 29a25cbe10 [formerly b82909bfb1 [formerly f895f5b777a8fdb292a20820678417decfd67ff9]]]
Former-commit-id: 29a25cbe10
Former-commit-id: c1c55ff56072f22d82c0594793c1ce48f62a40d9 [formerly 70ed87a093]
Former-commit-id: ede2bc6159
2013-01-29 16:46:31 -06:00
Lee Venable
71154555c8 Merge "Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon." into 13.2.1_delivery
Former-commit-id: 2342b84f34 [formerly c9cd8c4c76] [formerly 9f222c9643] [formerly 52e10c8c8a [formerly 9f222c9643 [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]]
Former-commit-id: 52e10c8c8a
Former-commit-id: 7e2adce84c3f59d8322483b0899c3a739f477c13 [formerly 56f4567566]
Former-commit-id: 0b005f08fb
2013-01-29 16:44:53 -06:00
Steve Harris
c9bc690eca Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]
Former-commit-id: 75f6e61e6f
2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]
Former-commit-id: daca1c3e73
2013-01-29 15:52:43 -06:00
Mike Duff
ac13852b92 Issue #1550 - Add ability for MPE to preload maps on perspective open.
Former-commit-id: 1740e14fa9 [formerly 944c5a4732] [formerly f9fec9668c] [formerly 5940423ac8 [formerly f9fec9668c [formerly 779ff3238cd9aba2980f589721a0f5ccfff4a15e]]]
Former-commit-id: 5940423ac8
Former-commit-id: 199352144e883563c5a96c9514598f1ea31d4c67 [formerly b55adb3cce]
Former-commit-id: 2edb4f1117
2013-01-29 15:39:40 -06:00
Lee Venable
0de3e4c755 Merge "Issue #1535 Fix GFE saving last block of grids twice" into 13.2.1_delivery
Former-commit-id: 27234eb99d [formerly d6a674189b] [formerly 9b793f195b] [formerly 8195fd7930 [formerly 9b793f195b [formerly 444a78f0a007038b845946aec9ecfb88b4ae7b63]]]
Former-commit-id: 8195fd7930
Former-commit-id: 9d6286e0eb9ffe3594df9d913c23ad32340ced84 [formerly 154b428162]
Former-commit-id: bc93eff808
2013-01-29 14:54:14 -06:00
Ben Steffensmeier
d1f3af83cc Issue #1495 add ensemble to Subscription copy constructor
Former-commit-id: 769f666f45 [formerly c81ed396af] [formerly d98ce9b9135373e84c866df1cd06b380db2b8d14 [formerly d17afdc1fa]] [formerly 5db16973bd [formerly d17afdc1fa [formerly 9f7a3f505048009e076b81c2be9603cefe62577a]]]
Former-commit-id: 5db16973bd
Former-commit-id: 500339d4ade6e63dc5f9ae3b3b376ca4c94d77db [formerly daf368ef21]
Former-commit-id: f0fe3654c7
2013-01-29 13:42:01 -06:00
Mike Duff
53d75d7657 Issue #1523 - Fix for count unit label.
Change-Id: Icc705a4bff143734b61fd11b8edc4d6337647015

Former-commit-id: bdb8f51912 [formerly ea5d953e80] [formerly 2772f83fc7] [formerly 5cab77afb3 [formerly 2772f83fc7 [formerly 5a3facb0b4cb6c15a458a44f97fe4ffece505523]]]
Former-commit-id: 5cab77afb3
Former-commit-id: 80c61d9cabde88f0649bba7a3dc9b69f1952c590 [formerly 9ff30b4934]
Former-commit-id: 26768cd96d
2013-01-29 13:12:40 -06:00
Richard Peter
e652289c8a Merge "Issue #1537 - fixed the edex-environment build" into development
Former-commit-id: b45502cd45 [formerly 7fb59536c9] [formerly 36272799c6] [formerly b5b1ea923a [formerly 36272799c6 [formerly aa7edb8004479dd71fb3863392ec78eb6830e657]]]
Former-commit-id: b5b1ea923a
Former-commit-id: 9a6c3b0cc337364ee6f7c9e478e95bd025e553a1 [formerly fa22dd1557]
Former-commit-id: 28c56766fb
2013-01-29 10:34:20 -06:00
Richard Peter
4d43c7518d Merge "Issue #1526 improved exception handling per code review comments" into development
Former-commit-id: 72021587e7 [formerly 565fbd1630] [formerly 80a750a72a] [formerly a23fa4a1ae [formerly 80a750a72a [formerly bb9789c558f6abf2f75a146edc7a197784e3711b]]]
Former-commit-id: a23fa4a1ae
Former-commit-id: 264f19cf2483ed87134297a74d668673d20b183c [formerly 641ae0393a]
Former-commit-id: b9b92baa12
2013-01-29 10:29:00 -06:00
Dustin Johnson
4c323a7bf8 Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: 8897d2b302 [formerly c8302eb9f8] [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly b0125d6d7e [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: 696f9cd7deb51ded1ebc38bd99f68f88ea3f520b [formerly 150c5275ca]
Former-commit-id: a463f7ef2b
2013-01-29 10:10:54 -06:00
Dustin Johnson
98eef2ce93 Issue #1529 Disable menu items when no subscriptions selected
Amend:
  Rebase to 13.2.1

Change-Id: I5265c1036bc31a87a8bacadfd7b3a9219922f073

Former-commit-id: ed7ef13c69 [formerly 572733ff56] [formerly fc332a8b9a] [formerly e9ae4c62c1 [formerly fc332a8b9a [formerly 50a157e679cc16cc47653314d538738355aada49]]]
Former-commit-id: e9ae4c62c1
Former-commit-id: ea79fd854c3807f3e6d063e302912815004f8879 [formerly f6dfeb1823]
Former-commit-id: a5ecfa14a9
2013-01-29 10:05:52 -06:00
Lee Venable
0c39a73eac Merge "Issue #1533 Update the calculated dataset size after loading subset xml" into 13.2.1_delivery
Former-commit-id: 3f8f1a6996 [formerly d5a0674873] [formerly 98f25434a9] [formerly 21059af185 [formerly 98f25434a9 [formerly 4043ba3c71a85148bbd262fd5cd371c290b5bfd8]]]
Former-commit-id: 21059af185
Former-commit-id: aee921e6178c46187280f47148d9731cfc8c75cc [formerly 18b96d33c6]
Former-commit-id: 30ab7d00ff
2013-01-29 10:00:37 -06:00
Lee Venable
b865087c22 Merge "Issue #1528 Fix subscription priorities to be the same from domain object to GUI Fix incorrect use of enum ordinal value mappings to priorities. Fix broken bandwidth priority scheduling." into 13.2.1_delivery
Former-commit-id: b35b20a245 [formerly ef51b388d7] [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 06900ccbb7 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]
Former-commit-id: f98e5b35e1
Former-commit-id: 4ec38d9e476c5f723089251bd22d992fcc9b56df [formerly fb942ec7c2]
Former-commit-id: df5bcf64de
2013-01-29 09:59:59 -06:00
Lee Venable
b4385740f6 Merge "Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids" into 13.2.1_delivery
Former-commit-id: 9493ce7146 [formerly 7d459d4d26] [formerly 85cff28b91] [formerly 71da745d93 [formerly 85cff28b91 [formerly a997bb9673162b8860ec9bd61118a52a575d4693]]]
Former-commit-id: 71da745d93
Former-commit-id: 0497629b3690f00dc20242a70dabc2157a821bb8 [formerly 2a4563bd14]
Former-commit-id: df40bb8ed5
2013-01-29 09:59:06 -06:00
Bryan Kowal
a8d1496454 Issue #1537 - fixed the edex-environment build
Former-commit-id: 792230a38e [formerly a960b34230] [formerly 7116bb86ef] [formerly fa511e980b [formerly 7116bb86ef [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]
Former-commit-id: fa511e980b
Former-commit-id: 7a615a201ed2fac7d12eeef3455b28a530f92660 [formerly aefeada9d6]
Former-commit-id: f4e7bead66
2013-01-29 09:51:54 -06:00
Nate Jensen
894b6a574f Issue #1526 improved exception handling per code review comments
Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

Former-commit-id: 8e90784e71 [formerly d155f573c9] [formerly 471dd02143] [formerly 530fdbe151 [formerly 471dd02143 [formerly 6abffb7aeb4011db9f6380fc644312b408bb75fa]]]
Former-commit-id: 530fdbe151
Former-commit-id: ad1fb77c31579ecb8b7b6e3561db673a9d9913f2 [formerly d233055696]
Former-commit-id: 2c85ed97e3
2013-01-29 09:25:19 -06:00
Lee Venable
a4a40b2fa9 Merge "Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes)." into development
Former-commit-id: fd325027a8 [formerly 73e44d87fa] [formerly 1c61671766] [formerly 078cc84047 [formerly 1c61671766 [formerly 9e32ad8949af4f1e1a4d163056d510c2572f0aec]]]
Former-commit-id: 078cc84047
Former-commit-id: 42c4d71b42c286fb8b9898e7dbbd82f66a2e8380 [formerly 0ee108f806]
Former-commit-id: 65fc68e586
2013-01-29 09:19:56 -06:00
Ron Anderson
5ffbbdd699 Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c

Former-commit-id: c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly 5738910b71 [formerly aa2c0ffb60 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: 5738910b71
Former-commit-id: 9ad86a93f01dfa8394e229e86a96b7f7e7dcd020 [formerly d61a24410a]
Former-commit-id: 670f23e1c2
2013-01-28 19:23:23 -06:00
Steve Harris
51c02cbee7 Merge branch '13.2.1_delivery' into development
Former-commit-id: 8b3a3f0325 [formerly ef2526ed44] [formerly cc0cfaa165c374895aa9647e3fb34fce2187f60e [formerly 6bd7e027b6]] [formerly b5b1823104 [formerly 6bd7e027b6 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]
Former-commit-id: b5b1823104
Former-commit-id: be8acf0a7b8afdcee2035efbe867156750b66ce4 [formerly 0a31815c66]
Former-commit-id: 27725703d5
2013-01-28 16:28:58 -06:00
Richard Peter
0ae1b55321 Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]
Former-commit-id: 7c9b9b0237
2013-01-28 15:27:23 -06:00
Max Schenkelberg
18411217a1 Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon.
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d

Former-commit-id: 681a2a6ec4 [formerly 796522b6d0] [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 95ccc76272 [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 659fd21b93254587addaccc93ad503a195b98bd4 [formerly 99c8a97f8c]
Former-commit-id: 0019b43582
2013-01-28 14:30:53 -06:00
Dustin Johnson
1c51e474c5 Issue #1533 Update the calculated dataset size after loading subset xml
Change-Id: I9fd94485bed113c68663484fb19daadcbe962a8d

Former-commit-id: dd4fc414aa [formerly 7dae10b701] [formerly 2c068589aa] [formerly 9f7e9692c2 [formerly 2c068589aa [formerly 747395cffd90554eea099c05affe75487ec304a3]]]
Former-commit-id: 9f7e9692c2
Former-commit-id: 00f7b4c48c234063529b5a901bb23fe92e7c6885 [formerly 0fe2711273]
Former-commit-id: 8a2ac02862
2013-01-28 12:47:45 -06:00
Bryan Kowal
f8e120a219 Issue #1503 - initial commit for build of Qpid 0.18 rpms
-created a qpid service script

Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3

Former-commit-id: 7b4935a0ef [formerly ec584b4d4b] [formerly ff34587e94] [formerly 54697ff658 [formerly ff34587e94 [formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]]
Former-commit-id: 54697ff658
Former-commit-id: 32df1491d555132dea478823ea8d5513fb36a0d5 [formerly 0cf405d8d9]
Former-commit-id: 45dd0b02ff
2013-01-28 11:21:24 -06:00
Roger Ferrel
5951b04a4f Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes).
Change-Id: Icce03032714b09c67bbb4ec23a426ad1dcdd244b

Former-commit-id: 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly dd41c60e3f [formerly 5a23770931 [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]
Former-commit-id: dd41c60e3f
Former-commit-id: 27165535226953b58522aeb5bae5425c31f9b2fa [formerly e6ff72765a]
Former-commit-id: d4667e3909
2013-01-28 08:39:36 -06:00
Steve Harris
c1ed23241b Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery
Former-commit-id: 6b74a9a34a [formerly 2e6b21b299] [formerly 3bb4d338f6] [formerly f0a495e095 [formerly 3bb4d338f6 [formerly a3d06df18373a0f8c69f07ef0eaf0b5c0ee76fd6]]]
Former-commit-id: f0a495e095
Former-commit-id: 5c24c3bca39a0e2f2f1775ff7a5a155253370404 [formerly 9ac3e4eacf]
Former-commit-id: 089e0254d7
2013-01-25 17:41:23 -06:00
Bryan Kowal
9476e45881 Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: 71866bc98e [formerly 1f7f5932dd] [formerly 2046255ef0] [formerly 7e7b47d934 [formerly 2046255ef0 [formerly b65827ab53309433a66c3c5146bdfb6c41eec2f8]]]
Former-commit-id: 7e7b47d934
Former-commit-id: e666bdb02a0ffd5583e5c764ffe9c1384f870cba [formerly fc6feb2329]
Former-commit-id: 0695fbbc8c
2013-01-25 16:19:54 -06:00
Steve Harris
ed42a5c55e Merge "Issue #1522 - disable Spring during installs and uninstalls" into development
Former-commit-id: 98665a9caa [formerly 282acc3b41] [formerly ffb536cd46] [formerly e8e8106d42 [formerly ffb536cd46 [formerly de2829de069a3f3280b25fd8a8b7b831377aaebc]]]
Former-commit-id: e8e8106d42
Former-commit-id: 044d35fb735acb469bfe8681ef7f37367cf2ac62 [formerly bac3f97ab6]
Former-commit-id: fe4b27913c
2013-01-25 16:02:47 -06:00
Richard Peter
5071a1181e Issue #1408: Merge branch 'ss_builds' (13.2.1) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.datadelivery.feature/feature.xml
	cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/UserSelectComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/services/DataDeliveryServices.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/DeleteGroupDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/GroupAddDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/RequestFromServerPermissionsService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubApprovalTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/presenter/CreateSubscriptionDlgPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/VerticalSubsetTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/presenter/GriddedTimingSelectionPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/xml/SubsetXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/OperatorAdapter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/CreateEditRuleDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/Operator.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemLatencyTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemManagementDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemPriorityTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemRuleManager.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataSetFrequency.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/NotificationHandler.java
	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/FFMPResource.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFELegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/DiscreteColorbar.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/MenuLoader.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/utility/common_static/base/datadelivery/systemManagement/rules/latencyRules.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Ensemble.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSet.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSetMetaData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Parameter.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Provider.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/DataSizeUtils.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/LookupManager.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ExtensibleObjectType.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/SubscriptionNotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/MainSequenceCrawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/OPENDAPServiceConfig.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/harvester/NOMADS-harvester.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtility.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRequestBuilder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalGenerator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	nativeLib/org.apache.qpid/lib/libqpidclient.so
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	tests/.classpath
	tests/unit/com/raytheon/uf/common/datadelivery/registry/OpenDapGriddedDataSetFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderTest.java
	tests/unit/com/raytheon/uf/common/localization/TestPathManager.java
	tests/unit/com/raytheon/uf/common/registry/RegistryManagerTest.java
	tests/unit/com/raytheon/uf/common/stats/data/DataPointTest.java
	tests/unit/com/raytheon/uf/common/stats/data/StatsDataTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/harvester/CrawlerTest.java
	tests/unit/com/raytheon/uf/edex/stats/data/StatsDataAccumulatorTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXMLTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/utils/DataSizeUtilTest.java

Former-commit-id: b2ebea951c [formerly 094fab7d16] [formerly 116ed10973] [formerly 81f14729ae [formerly 116ed10973 [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]
Former-commit-id: 81f14729ae
Former-commit-id: 6d92a3ebba31fa453ea1f58923ba6feb92785d9f [formerly d0e3bbf826]
Former-commit-id: 74b80fdc81
2013-01-25 15:54:27 -06:00
Dustin Johnson
dac4c429e7 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]
Former-commit-id: f88a5c1b95
Former-commit-id: a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b [formerly 4465094fe9]
Former-commit-id: 4ab288ae75
2013-01-25 14:30:04 -06:00
Brad Gonzales
bf242d7443 Issue #1448 added updated i386-pc-linux-gnu.tar
Change-Id: I183703485a11cc2a1c074a692870f3fcdf308870

Former-commit-id: 96b01dca30 [formerly 86f1b0468a] [formerly 98e13b532f] [formerly 5953d64009 [formerly 98e13b532f [formerly e25a8de4563afdac9b53430f61ab81db1bcca2b2]]]
Former-commit-id: 5953d64009
Former-commit-id: 96bbf76cb66b4162c9ec154de227c7e4d79b688b [formerly aafb4c3d48]
Former-commit-id: 0efff32b53
2013-01-25 11:37:43 -06:00
Dave Hladky
16286868df Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids
Change-Id: I326a25c3608d934d1b0183f2ad34109ab68e59f8

Former-commit-id: 01331e8d69 [formerly fe864302d2] [formerly b1dddd37a6] [formerly 04a955ff53 [formerly b1dddd37a6 [formerly d29ebdf1323d836b2f1e254cdcb1da06fdb5da61]]]
Former-commit-id: 04a955ff53
Former-commit-id: f8115fb5a00858c1eefeb6e8372086fe5bc84c2c [formerly 2e396e04f7]
Former-commit-id: 308ed4c69b
2013-01-25 10:58:22 -06:00
Steve Harris
1397f8a811 Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]
Former-commit-id: a85c81289e
2013-01-25 10:54:51 -06:00
Lee Venable
fccba2eb96 Merge "Issue #1495 fix fens regex." into 13.2.1_delivery
Former-commit-id: 5759947256 [formerly 8d19ab695a] [formerly 79fca0b122] [formerly e49a718462 [formerly 79fca0b122 [formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]]
Former-commit-id: e49a718462
Former-commit-id: 25562daeb4ca7d1904a42978195b51ed2158e7a3 [formerly d04924fd3a]
Former-commit-id: 4c07c59837
2013-01-25 10:46:40 -06:00
Steve Harris
0f4fcd0ba8 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]
Former-commit-id: 251a9c0195
2013-01-25 09:07:12 -06:00
Lee Venable
e2f088c003 Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly e4142b63c9 [formerly 9756c431fd [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]
Former-commit-id: e4142b63c9
Former-commit-id: 3db7896ccb9207afe3cea12b611de87c2bb0fbeb [formerly 063ffa26eb]
Former-commit-id: 4bf28dd204
2013-01-24 16:52:17 -06:00
Nate Jensen
9fb144f73e Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]
Former-commit-id: 04a397866a
2013-01-24 16:41:02 -06:00
Bryan Kowal
7214b65ccf Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: b4945796a3 [formerly ab7f75ad73] [formerly 09735415c5] [formerly 117028c632 [formerly 09735415c5 [formerly 293dd0c762884f285e455d94708b6e9fcc82023f]]]
Former-commit-id: 117028c632
Former-commit-id: 042aa3503e2052385e138273b071ed7d19fad917 [formerly a90266a49f]
Former-commit-id: 473368e0c8
2013-01-24 15:50:09 -06:00
Lee Venable
aaaa26e749 Merge "Issue #1357 - fix for data plotting in the x direction." into 13.2.1_delivery
Former-commit-id: a6f3236f18 [formerly 4bc2a37f0c] [formerly bf8517d554] [formerly e271e38bb3 [formerly bf8517d554 [formerly a202522b96ddcbca7eb39c14ba8a40073f13cf6e]]]
Former-commit-id: e271e38bb3
Former-commit-id: 34979c3b9a0bcee8647c7b647094a77c12fca29c [formerly 931c1454cd]
Former-commit-id: e3f5c9f08c
2013-01-24 15:37:51 -06:00