Commit graph

3078 commits

Author SHA1 Message Date
Nate Jensen
63b2fe798a Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f

Conflicts:

	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/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java


Former-commit-id: 0f66e6b3e5999f5f1f97b74b157838c598110cb2
2013-08-13 12:27:02 -05:00
Ben Steffensmeier
d1d3491aaf Issue #1869 Fix bufrua point data stationId.
Former-commit-id: 63146c966143e4690da0f7979a3fe217d5c6caa0
2013-08-09 13:00:18 -05:00
Bryan Kowal
5c6258e8c1 Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 0462ccb18fdd17b2d25a2c22b547d052ffe33aca
2013-08-08 18:38:21 -05:00
Lee Venable
69645f03dc Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: db71f51d18af219c2fdee6dcbe077be50d4e9e54
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
dad0681ae0 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26
2013-08-08 16:31:35 -05:00
Greg Armendariz
ffb2bea8ad Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: d79f0ffacc775ed4dc49bcf35adacf4fded994d3
2013-08-08 16:24:39 -05:00
Greg Armendariz
5577e686c1 13.5.1-13 baseline
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Greg Armendariz
fe51885ba7 13.5.1-12 baseline
Former-commit-id: eb9cd610891ce5830f4a169db036a49f32c1e63b
2013-08-08 15:34:01 -04:00
David Gillingham
f839ef6f3b Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35
2013-08-08 09:41:33 -05:00
Greg Armendariz
6b1989cb29 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: abb16b014694113cd7f2582542fd0d0f54a2da4e
2013-08-07 14:46:30 -05:00
Greg Armendariz
4ec04083bd 13.5.1-11 baseline
Former-commit-id: 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f
2013-08-07 14:34:27 -04:00
Greg Armendariz
acf7ced37b 13.5.1-10 baseline
Former-commit-id: c2c6882c462c34ce9cb9ea3399071c2a121ba0f7
2013-08-07 14:14:46 -04:00
Ben Steffensmeier
b06171b4f2 Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 5208c63e9c6eab03bc42736ffe2254fb802d566b
2013-08-07 12:08:13 -05:00
Steve Harris
97ef150656 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 64b7a7f6a035d5832f2338d854780b16d22306db
2013-08-01 08:27:10 -05:00
Steve Harris
6e60cd9a79 13.5.1-9 baseline
Former-commit-id: 06a1dd45adedbe259f9c30ebf93f2f90017fe945
2013-08-01 09:20:23 -04:00
Ron Anderson
47b977cdec Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: f4feae82505c29bc49113682d2cd584ec3ed6233
2013-07-31 09:00:07 -05:00
Nate Jensen
1c765670ea Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 49299504331c730ffe8a94f490f88337baf12233
2013-07-26 08:43:29 -05:00
Steve Harris
804270e3a2 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 5fca4065166ffd0e1d7a21f8463abd30657307b9
2013-07-26 08:28:54 -05:00
Steve Harris
dfbf9a5afe 13.5.1-8 baseline
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
David Gillingham
938f9cd7f7 Issue #1762: Fix Service Backup regression caused by last commit under this
ticket: NullPointerException caused by missing DynamicSerialize annotation and
disabled export configuration option caused by incomplete request.

Former-commit-id: 071f7e80fc09720a3b1763d4903eb75fb96ebcca
2013-07-22 17:24:00 -05:00
Richard Peter
c311adda88 Issue #1977: Fix NCEP Plugin issues due to merge
Former-commit-id: 3496de5dfddf84fb7130d993a17dcf973018d2f1
2013-07-22 16:12:01 -05:00
Bryan Kowal
75e9bdcb7a Issue #2206 - relocate ATBL directory change to 13.5
Former-commit-id: 5ba0ee80d25a5fe548d31f736eceb38a58f8ee90
2013-07-22 13:44:32 -05:00
Ron Anderson
249e7b1aaa Merge "Issue #1842: Fix issue where start time of in progress VTEC events was being set to 991130T0000Z." into omaha_13.5.1
Former-commit-id: 7e04107b602191703a8dbe19b7182ccb41a13eb1
2013-07-22 09:47:09 -05:00
Greg Armendariz
d5ea12d97f Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: d60e75576a5f80f8838330789c97e89788c7a057
2013-07-19 14:15:24 -05:00
David Gillingham
d0568ff347 Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: bf21f81dcad44880af5a3f988d15d4330b2b1d6b
2013-07-19 11:24:30 -05:00
Bryan Kowal
e9e3baa4df Issue #2153 - fix 13.5.1 build after merge
Former-commit-id: a70fac10e48f1fc258a7756acb4d48560a54248d
2013-07-19 10:28:30 -05:00
Richard Peter
cc7189fcb7 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.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/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7
2013-07-18 21:46:25 -05:00
Steve Harris
86ce1248c2 13.5.1-7 baseline
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Dustin Johnson
9aadc61ea5 Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: dd05e6c8f9c17ac331b137b9eb3d486c459144fb
2013-07-18 11:06:42 -05:00
Roger Ferrel
91ee1d36bf Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad
2013-07-18 10:02:05 -05:00
Nate Jensen
3649af1b71 Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: 7f9e83b42df42c1bec7946833e88a8916fc0c12d
2013-07-17 16:34:25 -05:00
Dave Hladky
bd03085f8d Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 251cf3cca7c6653300f115083aa860444fee0ea9
2013-07-17 15:18:49 -05:00
Ben Steffensmeier
4a25b32919 Issue #2107 Fix sampling of grid vector arrows.
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: eae0b3931a3f5888b32c49a8c7e5b97addb3201a
2013-07-15 15:51:41 -05:00
Greg Armendariz
b9044b1195 13.5.1-6 baseline
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Ben Steffensmeier
bbdd5cdc79 Issue #1869 Switch location hibernate type to use hibernate spatial.
Former-commit-id: b434131d412788c478ec45114a86abe925a79d4c
2013-07-09 18:25:11 -05:00
Dustin Johnson
9f6bd8b32b Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8

Former-commit-id: 198c9895608d22b3e3a616f2812628be32da514b
2013-07-09 14:55:22 -05:00
Ben Steffensmeier
c3f48bac0a Issue #1869 Format Calendar when making Constraint Mapping.
Former-commit-id: 58d020c1b09b4f5efc1fc9b558ef7defef80adba
2013-07-09 14:01:13 -05:00
Brad Gonzales
503d6d6cca Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly().
Amend: Update from peer review.

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: defb699314eec545eff3b3b603b059ef05ac1a23
2013-07-09 09:07:38 -05:00
Bryan Kowal
c3a87eadea Issue #2153 - fix commons-logging dependencies for wes2bridge
Former-commit-id: 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65
2013-07-08 20:14:11 -05:00
Ben Steffensmeier
21abe429ec Issue #1869 Fix goes sounding updates.
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: 127609cb0ced4b4554943ad78d4263cb70489a90
2013-07-08 11:47:08 -05:00
Greg Armendariz
ea7ac37930 13.5.1-5 baseline
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Bryan Kowal
dc177c90d1 Issue #2153 - 13.5.1 build update
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: 8a021ef97c67a4fc7325ce91808cd5878fbd2cda
2013-07-02 16:12:06 -05:00
Roger Ferrel
7d3362d2b5 Issue #1964 clean up of features and manifest.
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 2590369cb4aa0c3d9c3885acb0ef27de36744e6d
2013-07-02 11:14:56 -05:00
Nate Jensen
01efa33cb9 Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1
Former-commit-id: 5865b5ff9909ff00d047f41174b7e89ca921bb8b
2013-07-02 11:07:59 -05:00
Jonathan Sanchez
de24b8b431 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: 55cb110ba6f328d9fb68d3a9c46254f342299237
2013-07-02 11:04:26 -05:00
Roger Ferrel
68be9bd65f Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build.
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 01585ddb95a65686eada207aacbe6f12a512c7f3
2013-07-01 15:45:14 -05:00
Nate Jensen
001fba449f Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1
Former-commit-id: 8b91364fc675cfa8eb0cb6faefb2951cca1e365d
2013-07-01 11:29:47 -05:00
Bryan Kowal
9c1aaa2bf5 Issue #2153 - fix merge issue for build
Former-commit-id: 25560718fb861f13ff8701b9458a6b18adf523be
2013-07-01 10:52:29 -05:00
Jonathan Sanchez
7f74926bb4 Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22].


Former-commit-id: 765b5eea21f10ad1607aa99acb478eebf283e988
2013-07-01 10:40:48 -05:00
Richard Peter
582f38bdd4 Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9
2013-06-30 23:46:32 -05:00