Commit graph

4342 commits

Author SHA1 Message Date
Richard Peter
bded464ccf Merge "Issue #2361 fix saving hydro table objects" into development
Former-commit-id: 8a326cda9dd0b801f0bbaf779d6548f42078c0a5
2013-11-08 13:26:06 -06:00
Nate Jensen
7a27264094 Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 0f406375b030a87d3fa12e46255897bfa469119d
2013-11-08 12:37:26 -06:00
Nate Jensen
02d26d0f84 Issue #2361 remove ISerializableObject from persistence path keys
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 044f4fd87a83d6b83eef7f46854f1b484536c825
2013-11-08 12:30:39 -06:00
Nate Jensen
c3b37bcb7b Issue #2361 remove SerializationUtil from SoundingPrefs
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: eab1cf126b79ec5708facf2b2c9a303fca8a24fe
2013-11-08 12:13:50 -06:00
Nate Jensen
ec319b7dd0 Issue #2361 fix map style preferences
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae
2013-11-08 10:38:11 -06:00
Richard Peter
214a72ac69 Merge "Issue #2361 remove viz.grid ISerializableObjects" into development
Former-commit-id: a227c2dcb2598f82756c3f6a9ac7999c06202177
2013-11-08 10:35:41 -06:00
Slav Korolev
59d1de165d Issue #2291. Fixed Shared Subscription Dialog.
Former-commit-id: f04678733c2368ca05b7b8fdbcfeb096940854df
2013-11-08 11:09:21 -05:00
Nate Jensen
88eb0aab5c Issue #2361 remove viz.grid ISerializableObjects
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92
2013-11-08 09:42:09 -06:00
Richard Peter
60b567eeae Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development
Former-commit-id: 003f889e8aa65c4f01287611518f92b7d8ef05dd
2013-11-08 09:35:08 -06:00
Benjamin Phillippe
b84235a80a Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: d7d985926351d933c0bd10a3a5fd88ef4305853b
2013-11-07 18:36:46 -06:00
Nate Jensen
db5ee537a8 Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development
Former-commit-id: cd816c1507ff5b413b6312fb6d7d83cff29436e1
2013-11-07 16:59:35 -06:00
Brian Clements
4f374688c8 Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround


Former-commit-id: afee27c0b6b574b7d664f47ca0f9369f2b920426
2013-11-07 16:56:25 -06:00
Nate Jensen
f4fcd9e604 Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development
Former-commit-id: 7c4748fa0348820f0cf65330889253a04b4fab28
2013-11-07 16:39:50 -06:00
Ron Anderson
12192b633f Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development
Former-commit-id: c5da4c8a79432aab321d42f94b9cff04866671aa
2013-11-07 14:39:06 -06:00
Ron Anderson
a5bc64473a Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b
2013-11-07 14:38:39 -06:00
Richard Peter
fa7d77ae97 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: d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30
2013-11-07 14:25:45 -06:00
Nate Jensen
852751784b Issue #2361 remove ISerializableObject from datadelivery.retrieval
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 0cc1dd3988f7d02d609246dba863552b46127db2
2013-11-07 13:18:21 -06:00
Greg Armendariz
da16b623e1 Merge branch 'development' into development_on_RHEL6
Former-commit-id: d12afc98a3fda9c186e87368c53ddc100d4bf2c1
2013-11-07 12:25:24 -06:00
Nate Jensen
d4b6ad1eee Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: 75c1037145b0aec9cd5e0c0707f0904f4b703bc3
2013-11-07 11:44:07 -06:00
Steve Harris
51ff88796c Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 2a95ac857fe960ed2147545731acc3c093bb73b5
2013-11-07 11:37:25 -06:00
David Gillingham
e1df69e312 Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 9e190cf63a11fa641a60f13f8f93baec649d4893
2013-11-07 11:36:49 -06:00
Steve Harris
b93c4d7cd0 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: 433ccf0db5946e18c81e20ec689c9911868fe4c2
2013-11-07 11:32:42 -06:00
Steve Harris
06b5e0e0ec 13.5.3-5 baseline
Former-commit-id: 427119d391ffb23c0db3fa0dab0a893322a60f8c
2013-11-07 12:22:32 -05:00
Steve Harris
2d36bc2c1f 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 07f7c24804028aed71fc29cdf6f163a9e9d15623
2013-11-07 12:09:23 -05:00
Nate Jensen
e84d6cf1b5 Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: 5e5b1b53cf79fd058f65451aee4f255a73252ca1
2013-11-07 10:45:03 -06:00
Nate Jensen
0797f54a93 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: ba63e0d32f333fb2acaee2b15253f7cffb7122d4
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
7d605c471e Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb
2013-11-07 10:38:53 -06:00
Nate Jensen
f5feb9330f 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: 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1
2013-11-07 10:21:42 -06:00
Dave Hladky
f6996f9f5a Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: cce7fc47a0a4cdb55712ee3af942e93cb8a7c797
2013-11-07 10:08:01 -06:00
Nate Jensen
348a968aed Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: c2ca50713aa5e69aecdc6a5a0b04c7261305514c
2013-11-07 09:15:02 -06:00
Steve Harris
108a4d908d Merge branch 'development' into development_on_RHEL6
Former-commit-id: b0aa5782ea932919ad3e67d460c4809a664b1e08
2013-11-06 18:31:05 -06:00
Bryan Kowal
6692b985f3 13.5.3 build "fix"
Former-commit-id: 084e906e9f85ebd11cabf6e14e94ac75d25a0af2
2013-11-06 18:25:10 -06:00
Nate Jensen
0f4ba6f90e Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 2c506552014e60344c5b2014bed32edab2630f47
2013-11-06 17:07:10 -06:00
Brian Clements
308b06a47a Issue #2514 updated comments and history for OGC classes
removed dead and duplicate code from OGC


Former-commit-id: c13d5788a39898ef746b535d959bc845b6acad9c
2013-11-06 16:07:22 -06:00
Richard Peter
aa82fb8c91 Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: a3130561e8705464873251575f569d6be95ade3d
2013-11-06 16:04:20 -06:00
Richard Peter
357eb79519 Issue #2478: Remove blank lines in debug
Former-commit-id: 489528b7869254f69ea65391b576e82e67cbfc8f
2013-11-06 16:03:45 -06:00
Bryan Kowal
d26d6a396f Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: b171b7e66031ef05d98cb9a0819df6717acf0ba6
2013-11-06 15:58:06 -06:00
Bryan Kowal
4f1c083032 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 8a1605e74c716ae070028df42d61953a19ffefd6
2013-11-06 15:57:14 -06:00
Richard Peter
f9faa53eb4 Issue #2478: Update log message
Former-commit-id: ab993718b7e4f2b77461226a49bee76813166dbb
2013-11-06 15:45:23 -06:00
Lee Venable
8585080cd1 Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 13672783e6a5e452cb4105669a98708329b35541
2013-11-06 15:42:40 -06:00
Nate Jensen
4309555b45 Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development
Former-commit-id: a6cf090becd6da2c3fba1a2d46297c475be9d610
2013-11-06 15:41:29 -06:00
Lee Venable
ea5470af90 Merge "Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects." into development
Former-commit-id: 10789718f6ece30c3d766ec95b9fff0a5c03ee2c
2013-11-06 15:41:02 -06:00
Nate Jensen
1020b453f2 Merge "Issue #2522 removing WCS and WMS from baseline" into development
Former-commit-id: c4f29baf5ac830404a7e7739626b9a861844ec06
2013-11-06 15:40:16 -06:00
Dave Hladky
b0d929231c Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 03cfdbd4c8c74da4200781b8b716181eac759195
2013-11-06 15:23:02 -06:00
Max Schenkelberg
3369fbec2d 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
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: ae724ecce3d4c65f8845f3278f9b5eeb5b04908a
2013-11-06 15:07:18 -06:00
Richard Peter
22bd1521be Merge "Issue #2494 Updated to use thread logger" into development
Former-commit-id: 8eb668a14e1674b3a67816c26b2baeb7c8f45fba
2013-11-06 14:03:34 -06:00
Richard Peter
2e162de539 Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development
Former-commit-id: e52828f36303bd39521381149b0f585b6eb38439
2013-11-06 14:02:51 -06:00
Richard Peter
27aa0dd6ba Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 5dce49310b5a78e9895bade2ba3ebd48320593a0
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
d0b7966458 Issue #2493 remove mesowest.
Former-commit-id: 9a2fe6fa13d424c254b4ed071b743837dfb2e702
2013-11-06 13:42:38 -06:00
Slav Korolev
076865bb61 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: 04a119deb8248366e9efe9b5ac19c76e60a925e2
2013-11-06 14:38:55 -05:00