Commit graph

1887 commits

Author SHA1 Message Date
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
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
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
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
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
Richard Peter
910464ea6a Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: fa7d77ae97 [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]
Former-commit-id: 93c776022a
Former-commit-id: 520dd57f02
2013-11-07 14:25:45 -06:00
Nate Jensen
e579b6e75b Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 852751784b [formerly 852751784b [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]]
Former-commit-id: 6abe031dfe
Former-commit-id: afcbc9e01a
2013-11-07 13:18:21 -06:00
Steve Harris
bf0d783e52 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: b93c4d7cd0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]
Former-commit-id: 47778131b0
Former-commit-id: 079a007217
2013-11-07 11:32:42 -06:00
Steve Harris
b816e9e555 13.5.3-5 baseline
Former-commit-id: 06b5e0e0ec [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]
Former-commit-id: f175680b89
Former-commit-id: 31b57882cb
2013-11-07 12:22:32 -05:00
Nate Jensen
0b5cc2920f Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: e84d6cf1b5 [formerly e84d6cf1b5 [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]
Former-commit-id: 3c335ed78f
Former-commit-id: 5866e416f6
2013-11-07 10:45:03 -06:00
Nate Jensen
ebdd3effe9 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: 0797f54a93 [formerly 0797f54a93 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]
Former-commit-id: 7b18c745d3
Former-commit-id: f3d235a3f8
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
dc607f89b1 Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: 7d605c471e [formerly 7d605c471e [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]
Former-commit-id: 3561293fdd
Former-commit-id: a9f8468c0e
2013-11-07 10:38:53 -06:00
Nate Jensen
acec588299 Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: f5feb9330f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 1b7ac545f8
2013-11-07 10:21:42 -06:00
Dave Hladky
a70f11148c Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: f6996f9f5a [formerly f6996f9f5a [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]
Former-commit-id: 5d3023d2f5
Former-commit-id: 5891412fb3
2013-11-07 10:08:01 -06:00
Nate Jensen
64f064e15f Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: 348a968aed [formerly 348a968aed [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]
Former-commit-id: 68c7d378cf
Former-commit-id: d1f45128aa
2013-11-07 09:15:02 -06:00
Nate Jensen
0ae0e070c9 Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 0f4ba6f90e [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]
Former-commit-id: 1da0e31b88
Former-commit-id: aef895c447
2013-11-06 17:07:10 -06:00
Brian Clements
80b395db55 Issue #2514 updated comments and history for OGC classes
removed dead and duplicate code from OGC


Former-commit-id: 308b06a47a [formerly 308b06a47a [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]
Former-commit-id: 525da47317
Former-commit-id: d1207aa0b5
2013-11-06 16:07:22 -06:00
Richard Peter
c9f1b21c01 Issue #2478: Remove blank lines in debug
Former-commit-id: 357eb79519 [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]
Former-commit-id: 18eff02d7a
Former-commit-id: 46f19c22ea
2013-11-06 16:03:45 -06:00