4209 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nate Jensen	983afa0eea	Merge "Issue #2361 better logging of viz spring initialization of bundles" into development ... Former-commit-id: 8cf1b752e0 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]] Former-commit-id: b1d376e238 Former-commit-id: 645e816d5d	2013-11-12 16:48:32 -06:00
Nate Jensen	a53cf1a079	Merge "Issue #2539 removed java 7 specific code from exception subclass" into development ... Former-commit-id: 5e02427d6e [formerly 5e02427d6e [formerly 685d0f17845c90d4bd5a6d81da66f47285b08c8e]] Former-commit-id: c60228c854 Former-commit-id: a1315f1072	2013-11-12 14:41:34 -06:00
Richard Peter	0cf51fce74	Merge "Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes." into development ... Former-commit-id: 9af1de07d4 [formerly 9af1de07d4 [formerly 116b4409d4657b5dba8c9e3e52e2198661cb9691]] Former-commit-id: f12839a9e5 Former-commit-id: c8ff79a7f5	2013-11-12 13:47:04 -06:00
Nate Jensen	5c7be238a0	Issue #2361 better logging of viz spring initialization of bundles ... Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b Former-commit-id: 692ea76d75 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]] Former-commit-id: a4ece1d116 Former-commit-id: 2e86520b53	2013-11-12 13:02:49 -06:00
Nate Jensen	f618186c69	Merge "Issue #2448 fix scheduling for start/stop of subscription." into development ... Former-commit-id: 88af1ddfcb [formerly 88af1ddfcb [formerly 12c5fff1cc460acc0f800edf0597a5b7aecb5cbb]] Former-commit-id: 64aa00bad6 Former-commit-id: 39679b0608	2013-11-12 12:46:38 -06:00
Brad Gonzales	bad9b3242a	Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes. ... Amend: Separate update from create notifications in LifecycleManagerImpl. Refactored notification sending in EdexBandwidthManager. Fixed error in LifecycleManagerImpl refactor. Added comment to isRecurringSubscription. Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77 Former-commit-id: 8f70fb1d0c [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]] Former-commit-id: aea0e847aa Former-commit-id: 866a11a9f0	2013-11-12 12:42:16 -06:00
Brian Clements	94a9ea2ff0	Issue #2539 removed java 7 specific code from exception subclass ... Former-commit-id: 8b0e85f82c [formerly 8b0e85f82c [formerly 5ea90c5f6e6a95a2f063908e0f117973f5cce584]] Former-commit-id: 4050eb5f3e Former-commit-id: ba12c7467d	2013-11-12 12:41:50 -06:00
Nate Jensen	1f4af0c06a	Merge "Issue #2361 static lazy initialization of SubscriptionOverlapService's JAXBManager" into development ... Former-commit-id: 3f86a3735e [formerly 3f86a3735e [formerly 2279e785ab3e47008afee489c1a4e96972f26b79]] Former-commit-id: eed4c8604b Former-commit-id: 18d790a423	2013-11-12 12:13:58 -06:00
Richard Peter	c60b0849b3	Merge "Issue #2506 Added subscription notification service to bandwidth manager." into development ... Former-commit-id: 8afc87e570 [formerly 8afc87e570 [formerly adb5c06b63444331d7d470ddb6e7aff038cc40c1]] Former-commit-id: 61fc3eba44 Former-commit-id: b8b01f6305	2013-11-12 11:18:56 -06:00
Nate Jensen	66ff41e961	Issue #2361 static lazy initialization of SubscriptionOverlapService's ... JAXBManager Change-Id: Iccf41435f8dfc9d3b7ad556fce14937fe66785ac Former-commit-id: 1ee5d91af2 [formerly 1ee5d91af2 [formerly f42d92e543ab2ecf516e159a0756de7cb3417b88]] Former-commit-id: 2cdc7e5e63 Former-commit-id: 368d73449e	2013-11-12 11:03:51 -06:00
Dave Hladky	e410d1f44b	Issue #2448 fix scheduling for start/stop of subscription. ... Former-commit-id: b6f1468b7e [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]] Former-commit-id: 976eece1b1 Former-commit-id: 753b36cfea	2013-11-12 10:58:50 -06:00
Nate Jensen	f1b25ed227	Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development ... Former-commit-id: bca5793e3d [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]] Former-commit-id: da8a858727 Former-commit-id: d758e5ab57	2013-11-12 10:55:40 -06:00
Brad Gonzales	1b084e4efa	Issue #2506 Added subscription notification service to bandwidth manager. ... Change-Id: I3aad52887532f9a16dd6ea396458803890916d92 Former-commit-id: cd221e5263 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]] Former-commit-id: ff5edde334 Former-commit-id: efdc64b7b3	2013-11-12 10:50:06 -06:00
Nate Jensen	f55aa5aea0	Merge "Issue #2377 fixed error handling in QPF config" into development ... Former-commit-id: 3054868350 [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]] Former-commit-id: d8f2ffbceb Former-commit-id: 68866c322c	2013-11-12 10:39:51 -06:00
Nate Jensen	81749eac08	Merge "Issue #2539 added GZIP support to WFS REST" into development ... Former-commit-id: f1b8eecca7 [formerly f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]] Former-commit-id: 8c4608630d Former-commit-id: b87efc6860	2013-11-12 10:39:44 -06:00
Nate Jensen	80c38e1433	Issue #2361 remove using SerializationUtil for processing XML colormaps ... Change-Id: I25409474972eb94a928bde61fca3af88630a82b7 Former-commit-id: b52bdb1cec [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]] Former-commit-id: 7a73c65430 Former-commit-id: 5427e68fd2	2013-11-12 10:37:54 -06:00
Nate Jensen	da95b6f03e	Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development ... Former-commit-id: 3ed50ff500 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]] Former-commit-id: 23fe7de462 Former-commit-id: 90320ab47a	2013-11-12 09:29:46 -06:00
Bryan Kowal	2565306c95	Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later. ... Amend: addressed review comments Amend: update DR number Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0 Former-commit-id: 8e1c0fb8eb [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]] Former-commit-id: 75e6914df1 Former-commit-id: 5c38f0bfd6	2013-11-11 17:00:17 -06:00
Brian Clements	6b051e1513	Issue #2377 fixed error handling in QPF config ... Former-commit-id: e2ac7ae212 [formerly e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]] Former-commit-id: 684bd4dc50 Former-commit-id: c6f8609b39	2013-11-11 16:18:16 -06:00
Nate Jensen	5c30fd5b5c	Issue #2361 undo earlier changes that potentially break uengine based ... local apps Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65 Former-commit-id: 8628b7755e [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]] Former-commit-id: a2935193b5 Former-commit-id: 9dc69e316f	2013-11-11 16:14:35 -06:00
Brian Clements	587c9ad61c	Issue #2539 added GZIP support to WFS REST ... small code cleanup in providers Former-commit-id: 36a0be2db1 [formerly 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]] Former-commit-id: 061515b485 Former-commit-id: 24905af3c4	2013-11-11 16:08:09 -06:00
Steve Harris	92cf79a7cc	Merge branch 'omaha_13.5.3' into development ... Former-commit-id: 9dabbc7b8e [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]] Former-commit-id: 66f99f3974 Former-commit-id: 9f1d93a2cf	2013-11-11 15:40:45 -06:00
Steve Harris	f4638935b7	Merge branch 'master_13.5.3' into omaha_13.5.3 ... Former-commit-id: c1dcded2bd [formerly c1dcded2bd [formerly d55e0256167a6b61728d77403805ccc1c3eafdf7]] Former-commit-id: e0d2de3a19 Former-commit-id: 0d4e6712f8	2013-11-11 15:39:27 -06:00
Steve Harris	0c54c50443	13.5.3-7 baseline ... Former-commit-id: 21bed95fa4 [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]] Former-commit-id: 47102ee47b Former-commit-id: 3599d7f09b	2013-11-11 16:33:51 -05:00
Nate Jensen	175cc8dd74	Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development ... Former-commit-id: 7dda17a660 [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]] Former-commit-id: 05ee46c4bc Former-commit-id: 64df0d8d8f	2013-11-11 14:05:11 -06:00
Richard Peter	a40c837424	Merge "Issue #2506 Refactored RegistryEvent constructors." into development ... Former-commit-id: 13989d9c6e [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]] Former-commit-id: 51649b56e5 Former-commit-id: 8db2d589e3	2013-11-11 13:09:24 -06:00
Steve Harris	76ca0835e7	Merge branch 'omaha_13.5.3' (13.5.3-6) into development ... Former-commit-id: fbfe1a5faf [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]] Former-commit-id: 8a2e9f1725 Former-commit-id: b4fe17406f	2013-11-11 11:45:35 -06:00
Steve Harris	d4f5c58a4c	Merge branch 'master_13.5.3' into omaha_13.5.3 ... Former-commit-id: b62ab264f0 [formerly b62ab264f0 [formerly 9d433d2ae29831903e8da23a4b96aee29ee8f5bd]] Former-commit-id: 4190ddf39b Former-commit-id: 590d7de15d	2013-11-11 11:40:03 -06:00
Steve Harris	49b0919cf0	13.5.3-6 baseline ... Former-commit-id: 77a45660d5 [formerly 77a45660d5 [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]] Former-commit-id: 5fa893d37b Former-commit-id: f31112871c	2013-11-11 12:34:10 -05:00
Max Schenkelberg	60616f7ef0	Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing. ... Change-Id: Ic82f45447113425a08909be4c5229502882db022 Former-commit-id: e58a5df04b [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]] Former-commit-id: bd903f6641 Former-commit-id: c85532a180	2013-11-11 11:09:00 -06:00
Nate Jensen	f15ae53437	Merge "Issue #1314 removed common.spatial plugin" into development ... Former-commit-id: 0dbc31b756 [formerly 0dbc31b756 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]] Former-commit-id: 06acf1b8a0 Former-commit-id: de2623e273	2013-11-11 08:48:44 -06:00
Brad Gonzales	0e64d5f7fd	Issue #2506 Refactored RegistryEvent constructors. ... Amend: Added call to default constructor in Event initialization constructor. Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454 Former-commit-id: 9e8420b216 [formerly 9e8420b216 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]] Former-commit-id: d80183edc1 Former-commit-id: 86f5c2b6ec	2013-11-08 15:46:40 -06:00
Brad Gonzales	f017bee2f2	Issue #2506 fixed issues with shared distributed ingest. ... Amend: Updated comment in StoreRetrievedData. Removed separate messageing to clear BandwidthSubscriptions. Add fix and test case for SBN deserialization with content following the ending xml tag. Removed unneeded changes. Added XmlWMOMessage class. Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd Former-commit-id: fe15e874f7 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]] Former-commit-id: e2fb158757 Former-commit-id: 28d8aa5151	2013-11-08 15:29:05 -06:00
Nate Jensen	027b5419b8	Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development ... Former-commit-id: 89a650d94a [formerly 89a650d94a [formerly 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb]] Former-commit-id: f57cc4ab8f Former-commit-id: 24d83fcb9a	2013-11-08 14:45:22 -06:00
Brian Clements	9f5209d544	Issue #1314 removed common.spatial plugin ... Moved KeyLocker to common.util Updated query store to use read write lock Former-commit-id: 8142ff770f [formerly 8142ff770f [formerly 4f3d7e982a34f17fdf8cd80f025da176f939a3b1]] Former-commit-id: 04791b7939 Former-commit-id: f96f92df0b	2013-11-08 13:43:52 -06:00
Richard Peter	e6544523f3	Merge "Issue #2361 fix saving hydro table objects" into development ... Former-commit-id: bded464ccf [formerly bded464ccf [formerly 8a326cda9dd0b801f0bbaf779d6548f42078c0a5]] Former-commit-id: cf261df489 Former-commit-id: 9bb4f8dd7f	2013-11-08 13:26:06 -06:00
Nate Jensen	7a70c5ecce	Issue #2361 fix saving hydro table objects ... Change-Id: I38e6cd44359c60e88132b297beee66cede0437de Former-commit-id: 7a27264094 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]] Former-commit-id: 08441efbb7 Former-commit-id: 4958732cb2	2013-11-08 12:37:26 -06:00
Nate Jensen	0693e9366e	Issue #2361 remove ISerializableObject from persistence path keys ... Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16 Former-commit-id: 02d26d0f84 [formerly 02d26d0f84 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]] Former-commit-id: 44a6d5b302 Former-commit-id: 3ea850b9da	2013-11-08 12:30:39 -06:00
Nate Jensen	9a7b2e0246	Issue #2361 remove SerializationUtil from SoundingPrefs ... Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991 Former-commit-id: c3b37bcb7b [formerly c3b37bcb7b [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]] Former-commit-id: e9ca44ee64 Former-commit-id: 56335703ac	2013-11-08 12:13:50 -06:00
Nate Jensen	f836fe065e	Issue #2361 fix map style preferences ... Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049 Former-commit-id: ec319b7dd0 [formerly ec319b7dd0 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]] Former-commit-id: 43bbf31347 Former-commit-id: 5ecde78b02	2013-11-08 10:38:11 -06:00
Richard Peter	7725d0ee3e	Merge "Issue #2361 remove viz.grid ISerializableObjects" into development ... Former-commit-id: 214a72ac69 [formerly 214a72ac69 [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]] Former-commit-id: bb0dcf6d4a Former-commit-id: 1909b0d06b	2013-11-08 10:35:41 -06:00
Slav Korolev	52807d248b	Issue #2291. Fixed Shared Subscription Dialog. ... Former-commit-id: 59d1de165d [formerly 59d1de165d [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]] Former-commit-id: 7b7754982c Former-commit-id: c4a633acde	2013-11-08 11:09:21 -05:00
Nate Jensen	fc79c7053d	Issue #2361 remove viz.grid ISerializableObjects ... Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8 Former-commit-id: 88eb0aab5c [formerly 88eb0aab5c [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]] Former-commit-id: 10548cd1c7 Former-commit-id: 48a479d2dc	2013-11-08 09:42:09 -06:00
Richard Peter	7a316f69ef	Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development ... Former-commit-id: 60b567eeae [formerly 60b567eeae [formerly 003f889e8aa65c4f01287611518f92b7d8ef05dd]] Former-commit-id: 6fd6fd0725 Former-commit-id: 65628daf36	2013-11-08 09:35:08 -06:00
Benjamin Phillippe	093b5eda6f	Issue #1678 Added support for stored query publishing and invocation on the registry ... Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f Former-commit-id: b84235a80a [formerly b84235a80a [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]] Former-commit-id: b5db1f38c3 Former-commit-id: 1a492a564b	2013-11-07 18:36:46 -06:00
Nate Jensen	526b900d17	Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development ... Former-commit-id: db5ee537a8 [formerly db5ee537a8 [formerly cd816c1507ff5b413b6312fb6d7d83cff29436e1]] Former-commit-id: f677dd6415 Former-commit-id: 1b7b698c31	2013-11-07 16:59:35 -06:00
Brian Clements	6772e50e80	Issue #2515 upgraded camel from 2.11.0 to 2.11.2 ... removed log showBody workaround Former-commit-id: 4f374688c8 [formerly 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]] Former-commit-id: ea6b162369 Former-commit-id: a5b61b6d22	2013-11-07 16:56:25 -06:00
Nate Jensen	90bb5aa285	Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development ... Former-commit-id: f4fcd9e604 [formerly f4fcd9e604 [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]] Former-commit-id: 7877229eac Former-commit-id: 1de52a9ea8	2013-11-07 16:39:50 -06:00
Ron Anderson	4e8df8ea5b	Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development ... Former-commit-id: 12192b633f [formerly 12192b633f [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]] Former-commit-id: c1bda09fd9 Former-commit-id: d2cd7c1257	2013-11-07 14:39:06 -06:00
Ron Anderson	298f4abbae	Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development ... Former-commit-id: a5bc64473a [formerly a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]] Former-commit-id: 42229b8eee Former-commit-id: 6442e2e933	2013-11-07 14:38:39 -06:00