Commit graph

4188 commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 . 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 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 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 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 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 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 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 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 : 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
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 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
Nate Jensen
57f237693e Issue speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: d4b6ad1eee [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]
Former-commit-id: cc2998b487
Former-commit-id: ce583a88fb
2013-11-07 11:44:07 -06:00
David Gillingham
50f9ad420b Issue : Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: e1df69e312 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]
Former-commit-id: 0e74638eb2
Former-commit-id: d0b188d577
2013-11-07 11:36:49 -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 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 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 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 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 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 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
Bryan Kowal
b04aa07437 13.5.3 build "fix"
Former-commit-id: 6692b985f3 [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]
Former-commit-id: a28133117c
Former-commit-id: ce6d80409d
2013-11-06 18:25:10 -06:00
Nate Jensen
0ae0e070c9 Merge "Issue 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 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
28e9ef5821 Merge "Issue : Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: aa82fb8c91 [formerly aa82fb8c91 [formerly a3130561e8705464873251575f569d6be95ade3d]]
Former-commit-id: cf7c70beac
Former-commit-id: 0e48596ca7
2013-11-06 16:04:20 -06:00
Richard Peter
c9f1b21c01 Issue : 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
Bryan Kowal
1c7e5b91b7 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: d26d6a396f [formerly d26d6a396f [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]
Former-commit-id: 100e14439e
Former-commit-id: 40c3059cc2
2013-11-06 15:58:06 -06:00
Bryan Kowal
46616c32eb Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 4f1c083032 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]
Former-commit-id: bb15605aa2
Former-commit-id: 0bc8cdc9be
2013-11-06 15:57:14 -06:00
Richard Peter
7dcd8afea2 Issue : Update log message
Former-commit-id: f9faa53eb4 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]
Former-commit-id: b0746db723
Former-commit-id: f1a67f4dc1
2013-11-06 15:45:23 -06:00
Lee Venable
5627ef0cc8 Merge "Issue - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 8585080cd1 [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]
Former-commit-id: 20726d4e7c
Former-commit-id: 0c4566c411
2013-11-06 15:42:40 -06:00