Commit graph

1826 commits

Author SHA1 Message Date
Nate Jensen
8f195e0a7e Merge "Issue #1564 correct mosaic ordered shader shader." into development
Former-commit-id: 6aecbaef5b [formerly dcc3c43454] [formerly 6aecbaef5b [formerly dcc3c43454] [formerly 4f7b9dee8b [formerly 7ad29b0c523ec431d91f2a0340f4fc635564493d]]]
Former-commit-id: 4f7b9dee8b
Former-commit-id: 3e7349e404 [formerly 6154c18856]
Former-commit-id: 8858e72966
2013-01-31 15:57:55 -06:00
Lee Venable
57443eb443 Merge "Issue #1557 Added allowDuplicates XML element to point source configuration. Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b" into development
Former-commit-id: bc4b462c69 [formerly 3cc2665f41] [formerly bc4b462c69 [formerly 3cc2665f41] [formerly f2e7f7ff1b [formerly a7e3ea831a4cbd3e5ab04f3288b8eac8f74f70f3]]]
Former-commit-id: f2e7f7ff1b
Former-commit-id: f192004c51 [formerly 16bc40cec8]
Former-commit-id: f5919fdf64
2013-01-31 15:54:05 -06:00
Nate Jensen
7b3f056fa9 Merge "Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel" into development
Former-commit-id: 3daf6649dd [formerly a4255d89ae] [formerly 3daf6649dd [formerly a4255d89ae] [formerly 84a25b2c19 [formerly 429d48bfcc56a96b4ef4d0a2c498cf51d661973d]]]
Former-commit-id: 84a25b2c19
Former-commit-id: 74043613ed [formerly e2992d6344]
Former-commit-id: ff2d324817
2013-01-31 15:41:47 -06:00
Max Schenkelberg
23a67773f6 Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: d0c9157e2a [formerly ed4a9023da] [formerly d0c9157e2a [formerly ed4a9023da] [formerly 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]]]
Former-commit-id: 95d3706969
Former-commit-id: a1d92fa99f [formerly 0f9f51fb14]
Former-commit-id: 621f71977e
2013-01-31 15:34:46 -06:00
Ben Steffensmeier
c78627f525 Issue #1564 correct mosaic ordered shader shader.
Former-commit-id: 153b826ca9 [formerly ebae642c8a] [formerly 153b826ca9 [formerly ebae642c8a] [formerly 9bf9b1cc0d [formerly 514ae219a7e986ca420d28a0c480de4c4d31bbdb]]]
Former-commit-id: 9bf9b1cc0d
Former-commit-id: 723c4c87a7 [formerly c43bd1a5ab]
Former-commit-id: e57e54dbba
2013-01-31 15:26:16 -06:00
Nate Jensen
2ddb12e9ab Merge "Issue #1562 Made topo create colormap parameters off existing ones and moved to new tileset API" into development
Former-commit-id: 1928c8a329 [formerly 3f5e7f4eee] [formerly 1928c8a329 [formerly 3f5e7f4eee] [formerly fb122159c8 [formerly 2063a0d927451764f622e5fa08bff52bef124c14]]]
Former-commit-id: fb122159c8
Former-commit-id: 68d20efc52 [formerly 346ca8be1c]
Former-commit-id: e8860fd628
2013-01-31 15:25:49 -06:00
Bryan Kowal
fa38db1d45 Merge "Issue #1551 - adding maps to the Data Access Framework" into development
Former-commit-id: 776e7ab5c2 [formerly f585de398b] [formerly 776e7ab5c2 [formerly f585de398b] [formerly 73cf3ac730 [formerly d722b34158a74e922025804a2f0953226aae7a98]]]
Former-commit-id: 73cf3ac730
Former-commit-id: 6027369645 [formerly a65ccede20]
Former-commit-id: 59cbe4be3f
2013-01-31 15:24:30 -06:00
Jonathan Sanchez
db72c21e73 Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: c6a47fe8c9 [formerly 55b12dae25] [formerly c6a47fe8c9 [formerly 55b12dae25] [formerly ed0bce744e [formerly 9ba75c5a838b95ff09a64929c97492b97f4729f1]]]
Former-commit-id: ed0bce744e
Former-commit-id: 8d3188713b [formerly c8b8981804]
Former-commit-id: e3d4a66310
2013-01-31 15:11:17 -06:00
Roger Ferrel
f21a381e12 Issue #1563 Changes to force location of tooltip and always get the information for the line under the cursor.
Change-Id: I45b35e1db38335e6931086c99dbf3573a26f832b

Former-commit-id: 7dec3e3cd2 [formerly cbdf7e5e05] [formerly 7dec3e3cd2 [formerly cbdf7e5e05] [formerly 647f1e4da0 [formerly cd936e54aca3ef6a20ecd5c8b95e256b2443b907]]]
Former-commit-id: 647f1e4da0
Former-commit-id: e94e0b84f7 [formerly 09d83a2903]
Former-commit-id: 8cf617bd4c
2013-01-31 14:26:51 -06:00
Max Schenkelberg
5f2bc20ff7 Issue #1562 Made topo create colormap parameters off existing ones and moved to new tileset API
Change-Id: Iba534200e893a0e4febc2b14ec0161e2d8b0e6d3

Former-commit-id: 817bfcdb4b [formerly 44b3876738] [formerly 817bfcdb4b [formerly 44b3876738] [formerly a3efce7917 [formerly 51ad0f0a990f1238ba0ba01491e155eb5efb6012]]]
Former-commit-id: a3efce7917
Former-commit-id: 1ef69cd6e6 [formerly 0f4fbf614e]
Former-commit-id: 08015d63e0
2013-01-31 14:26:06 -06:00
David Gillingham
54e5481d09 Issue #1559: Fix port error in SmartScript.getGridCellSwath().
Change-Id: If435423a8277f852b3ceb0a7299332ece800696f

Former-commit-id: 6f6534649a [formerly 292bd811a0] [formerly 6f6534649a [formerly 292bd811a0] [formerly 49a4e1c39d [formerly 2e2be1d031a93f0fe13c17788eabff34ab428caa]]]
Former-commit-id: 49a4e1c39d
Former-commit-id: 3a13421305 [formerly 62f30014f0]
Former-commit-id: d8eb0b96dd
2013-01-31 12:00:38 -06:00
Steve Harris
2107a54161 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: c218786986 [formerly 658bea377b] [formerly c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65 [formerly 6383bf8ed2]
Former-commit-id: a74d58ce6f
2013-01-31 10:19:14 -06:00
Bryan Kowal
df8f224bde 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: 6ea0653c78 [formerly 964b30d5f2] [formerly 6ea0653c78 [formerly 964b30d5f2] [formerly 5d83f9f3d1 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: 0557ecfed3 [formerly e86fda2a6f]
Former-commit-id: c4e18dd6e6
2013-01-31 10:03:10 -06:00
Dustin Johnson
ba39807ebe Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: e64e36ecf2 [formerly f361f5a6a1] [formerly e64e36ecf2 [formerly f361f5a6a1] [formerly 5830a98a51 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]
Former-commit-id: 5830a98a51
Former-commit-id: 0185add187 [formerly d7077690d8]
Former-commit-id: 74f27ce9f8
2013-01-31 08:39:08 -06:00
Mike Duff
7b6f64506a Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 24e9ae73f0 [formerly fc24735297] [formerly 24e9ae73f0 [formerly fc24735297] [formerly f03e9cc5ce [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: f5ef2dc1fe [formerly a51d48db5e]
Former-commit-id: a0e2621664
2013-01-30 16:38:04 -06:00
Nate Jensen
283bffe639 Merge "Issue #1534 Check for null in initInternal to avoid exception" into 13.2.1_delivery
Former-commit-id: 8d07de6933 [formerly a0856d2f26] [formerly 8d07de6933 [formerly a0856d2f26] [formerly ca2d99c69a [formerly a89274c821276c8a5ef3b08a8c25aa03c391b766]]]
Former-commit-id: ca2d99c69a
Former-commit-id: 28535058f9 [formerly 1fa3c9cb3c]
Former-commit-id: 47c0e7bb04
2013-01-30 15:02:45 -06:00
Nate Jensen
c45484d7d9 Merge "Issue #1521 add extra validation and checks to grid factory Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c" into development
Former-commit-id: f1cf8bff45 [formerly 88b52e25f2] [formerly f1cf8bff45 [formerly 88b52e25f2] [formerly b765544b40 [formerly af723dd7ec322d586b7eb48381105c1043f32e67]]]
Former-commit-id: b765544b40
Former-commit-id: 2db9dc1130 [formerly 8952df8497]
Former-commit-id: fc60602a5d
2013-01-30 15:01:19 -06:00
Roger Ferrel
0d56bd5b25 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: 97b6a1a810 [formerly 7a7f86bfe6] [formerly 97b6a1a810 [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: 234b632c75 [formerly 4dbb053d65]
Former-commit-id: 82b029928e
2013-01-30 13:11:56 -06:00
Max Schenkelberg
7e999f018b Issue #1534 Check for null in initInternal to avoid exception
Change-Id: I9ccf341c3c04f08f88e5366009771f9cda510119

Former-commit-id: a574e13562 [formerly 5ed30a723e] [formerly a574e13562 [formerly 5ed30a723e] [formerly 23e3ad2382 [formerly 77d0d92f23325407292c5a048ba1276e7e0568ad]]]
Former-commit-id: 23e3ad2382
Former-commit-id: 50deaaaa79 [formerly 296186190a]
Former-commit-id: 74aa120014
2013-01-30 11:34:19 -06:00
Steve Harris
2374e69640 Issue #1542 throw out non-watches in watches resource
Former-commit-id: b651007bc7 [formerly 2f5d5f08ae] [formerly b651007bc7 [formerly 2f5d5f08ae] [formerly 97bd112438 [formerly e719c4112920802a7457ced7836a1c4a42140400]]]
Former-commit-id: 97bd112438
Former-commit-id: fbbf2f3cda [formerly 50565fee11]
Former-commit-id: dd7b9e1cf8
2013-01-30 11:26:20 -06:00
Ben Steffensmeier
31e9b542c1 Issue #1521 add extra validation and checks to grid factory
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

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

Former-commit-id: eaae098e29 [formerly 4fae854006] [formerly eaae098e29 [formerly 4fae854006] [formerly ad37f68537 [formerly c0f98136403a05755d1c7c640f264f1bafe64a4f]]]
Former-commit-id: ad37f68537
Former-commit-id: 88d5c2f793 [formerly 9d2a960cb4]
Former-commit-id: 2852e10076
2013-01-29 17:33:11 -06:00
Lee Venable
3de54778b2 Merge "Issue #1495 add ensemble to Subscription copy constructor" into 13.2.1_delivery
Former-commit-id: f88f8211e1 [formerly b82909bfb1] [formerly f88f8211e1 [formerly b82909bfb1] [formerly 29a25cbe10 [formerly f895f5b777a8fdb292a20820678417decfd67ff9]]]
Former-commit-id: 29a25cbe10
Former-commit-id: ede2bc6159 [formerly 70ed87a093]
Former-commit-id: 4bf1bf11f3
2013-01-29 16:46:31 -06:00
Lee Venable
0583d980e3 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: c9cd8c4c76 [formerly 9f222c9643] [formerly c9cd8c4c76 [formerly 9f222c9643] [formerly 52e10c8c8a [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]]
Former-commit-id: 52e10c8c8a
Former-commit-id: 0b005f08fb [formerly 56f4567566]
Former-commit-id: 6668070073
2013-01-29 16:44:53 -06:00
Steve Harris
99bc358644 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e655d297f7 [formerly 0505ed0a72] [formerly e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f [formerly 513d49939f]
Former-commit-id: ba97151132
2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb 13.2.1-3 baseline
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73 [formerly 3edfa1e0be]
Former-commit-id: dbaf4a3e39
2013-01-29 15:52:43 -06:00
Lee Venable
075a8582e8 Merge "Issue #1535 Fix GFE saving last block of grids twice" into 13.2.1_delivery
Former-commit-id: d6a674189b [formerly 9b793f195b] [formerly d6a674189b [formerly 9b793f195b] [formerly 8195fd7930 [formerly 444a78f0a007038b845946aec9ecfb88b4ae7b63]]]
Former-commit-id: 8195fd7930
Former-commit-id: bc93eff808 [formerly 154b428162]
Former-commit-id: 9843217d41
2013-01-29 14:54:14 -06:00
Ben Steffensmeier
b81b7c0d0e Issue #1495 add ensemble to Subscription copy constructor
Former-commit-id: c81ed396af [formerly d17afdc1fa] [formerly c81ed396af [formerly d17afdc1fa] [formerly 5db16973bd [formerly 9f7a3f505048009e076b81c2be9603cefe62577a]]]
Former-commit-id: 5db16973bd
Former-commit-id: f0fe3654c7 [formerly daf368ef21]
Former-commit-id: 703fa6695e
2013-01-29 13:42:01 -06:00
Mike Duff
45b5ce4fd6 Issue #1523 - Fix for count unit label.
Change-Id: Icc705a4bff143734b61fd11b8edc4d6337647015

Former-commit-id: ea5d953e80 [formerly 2772f83fc7] [formerly ea5d953e80 [formerly 2772f83fc7] [formerly 5cab77afb3 [formerly 5a3facb0b4cb6c15a458a44f97fe4ffece505523]]]
Former-commit-id: 5cab77afb3
Former-commit-id: 26768cd96d [formerly 9ff30b4934]
Former-commit-id: 18ac9ff2d3
2013-01-29 13:12:40 -06:00
Richard Peter
5deeb0fb6f Merge "Issue #1537 - fixed the edex-environment build" into development
Former-commit-id: 7fb59536c9 [formerly 36272799c6] [formerly 7fb59536c9 [formerly 36272799c6] [formerly b5b1ea923a [formerly aa7edb8004479dd71fb3863392ec78eb6830e657]]]
Former-commit-id: b5b1ea923a
Former-commit-id: 28c56766fb [formerly fa22dd1557]
Former-commit-id: 2826f3469d
2013-01-29 10:34:20 -06:00
Richard Peter
5a9287ceda Merge "Issue #1526 improved exception handling per code review comments" into development
Former-commit-id: 565fbd1630 [formerly 80a750a72a] [formerly 565fbd1630 [formerly 80a750a72a] [formerly a23fa4a1ae [formerly bb9789c558f6abf2f75a146edc7a197784e3711b]]]
Former-commit-id: a23fa4a1ae
Former-commit-id: b9b92baa12 [formerly 641ae0393a]
Former-commit-id: 95d14fbdf0
2013-01-29 10:29:00 -06:00
Dustin Johnson
64c335478a Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

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

Change-Id: I5265c1036bc31a87a8bacadfd7b3a9219922f073

Former-commit-id: 572733ff56 [formerly fc332a8b9a] [formerly 572733ff56 [formerly fc332a8b9a] [formerly e9ae4c62c1 [formerly 50a157e679cc16cc47653314d538738355aada49]]]
Former-commit-id: e9ae4c62c1
Former-commit-id: a5ecfa14a9 [formerly f6dfeb1823]
Former-commit-id: 2756a184f1
2013-01-29 10:05:52 -06:00
Lee Venable
68d5562118 Merge "Issue #1533 Update the calculated dataset size after loading subset xml" into 13.2.1_delivery
Former-commit-id: d5a0674873 [formerly 98f25434a9] [formerly d5a0674873 [formerly 98f25434a9] [formerly 21059af185 [formerly 4043ba3c71a85148bbd262fd5cd371c290b5bfd8]]]
Former-commit-id: 21059af185
Former-commit-id: 30ab7d00ff [formerly 18b96d33c6]
Former-commit-id: 66f7449b9c
2013-01-29 10:00:37 -06:00
Lee Venable
39a081b349 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: ef51b388d7 [formerly 06900ccbb7] [formerly ef51b388d7 [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]
Former-commit-id: f98e5b35e1
Former-commit-id: df5bcf64de [formerly fb942ec7c2]
Former-commit-id: b2cd64020d
2013-01-29 09:59:59 -06:00
Lee Venable
7ea5d27d7a Merge "Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids" into 13.2.1_delivery
Former-commit-id: 7d459d4d26 [formerly 85cff28b91] [formerly 7d459d4d26 [formerly 85cff28b91] [formerly 71da745d93 [formerly a997bb9673162b8860ec9bd61118a52a575d4693]]]
Former-commit-id: 71da745d93
Former-commit-id: df40bb8ed5 [formerly 2a4563bd14]
Former-commit-id: 7cace56085
2013-01-29 09:59:06 -06:00
Bryan Kowal
1377ae600f Issue #1537 - fixed the edex-environment build
Former-commit-id: a960b34230 [formerly 7116bb86ef] [formerly a960b34230 [formerly 7116bb86ef] [formerly fa511e980b [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]
Former-commit-id: fa511e980b
Former-commit-id: f4e7bead66 [formerly aefeada9d6]
Former-commit-id: 662f471e5e
2013-01-29 09:51:54 -06:00
Nate Jensen
2990d90bcb Issue #1526 improved exception handling per code review comments
Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

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

Former-commit-id: ed7784818a [formerly aa2c0ffb60] [formerly ed7784818a [formerly aa2c0ffb60] [formerly 5738910b71 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]
Former-commit-id: 5738910b71
Former-commit-id: 670f23e1c2 [formerly d61a24410a]
Former-commit-id: 3d1159c81f
2013-01-28 19:23:23 -06:00
Steve Harris
7395af8e56 Merge branch '13.2.1_delivery' into development
Former-commit-id: ef2526ed44 [formerly 6bd7e027b6] [formerly ef2526ed44 [formerly 6bd7e027b6] [formerly b5b1823104 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]
Former-commit-id: b5b1823104
Former-commit-id: 27725703d5 [formerly 0a31815c66]
Former-commit-id: fa305d03ba
2013-01-28 16:28:58 -06:00
Richard Peter
7a41e41ca9 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: 59ef7758f1 [formerly 6eb11703e4] [formerly 59ef7758f1 [formerly 6eb11703e4] [formerly 2946e97294 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 7c9b9b0237 [formerly 878cbe1695]
Former-commit-id: 4f61e88c6f
2013-01-28 15:27:23 -06:00
Max Schenkelberg
21d7fb592c 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: 796522b6d0 [formerly 95ccc76272] [formerly 796522b6d0 [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 0019b43582 [formerly 99c8a97f8c]
Former-commit-id: cfcffa3b2e
2013-01-28 14:30:53 -06:00
Dustin Johnson
4afc6cf363 Issue #1533 Update the calculated dataset size after loading subset xml
Change-Id: I9fd94485bed113c68663484fb19daadcbe962a8d

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

Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3

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

Former-commit-id: 3bc828f839 [formerly 5a23770931] [formerly 3bc828f839 [formerly 5a23770931] [formerly dd41c60e3f [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]
Former-commit-id: dd41c60e3f
Former-commit-id: d4667e3909 [formerly e6ff72765a]
Former-commit-id: 6a870cbd8d
2013-01-28 08:39:36 -06:00
Steve Harris
291bc12185 Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery
Former-commit-id: 2e6b21b299 [formerly 3bb4d338f6] [formerly 2e6b21b299 [formerly 3bb4d338f6] [formerly f0a495e095 [formerly a3d06df18373a0f8c69f07ef0eaf0b5c0ee76fd6]]]
Former-commit-id: f0a495e095
Former-commit-id: 089e0254d7 [formerly 9ac3e4eacf]
Former-commit-id: 0c50d05552
2013-01-25 17:41:23 -06:00
Bryan Kowal
01ba5e0b5c Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: 1f7f5932dd [formerly 2046255ef0] [formerly 1f7f5932dd [formerly 2046255ef0] [formerly 7e7b47d934 [formerly b65827ab53309433a66c3c5146bdfb6c41eec2f8]]]
Former-commit-id: 7e7b47d934
Former-commit-id: 0695fbbc8c [formerly fc6feb2329]
Former-commit-id: 3e9d683a7f
2013-01-25 16:19:54 -06:00
Steve Harris
687b789b6b Merge "Issue #1522 - disable Spring during installs and uninstalls" into development
Former-commit-id: 282acc3b41 [formerly ffb536cd46] [formerly 282acc3b41 [formerly ffb536cd46] [formerly e8e8106d42 [formerly de2829de069a3f3280b25fd8a8b7b831377aaebc]]]
Former-commit-id: e8e8106d42
Former-commit-id: fe4b27913c [formerly bac3f97ab6]
Former-commit-id: fe2ddb8fde
2013-01-25 16:02:47 -06:00
Richard Peter
f810e098d0 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: 094fab7d16 [formerly 116ed10973] [formerly 094fab7d16 [formerly 116ed10973] [formerly 81f14729ae [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]
Former-commit-id: 81f14729ae
Former-commit-id: 74b80fdc81 [formerly d0e3bbf826]
Former-commit-id: 1058dba963
2013-01-25 15:54:27 -06:00