xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3055 commits 31 branches 40 tags 3.8 GiB
Commit graph

3055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Peter
573bf9465e Issue #1977: Fix NCEP Plugin issues due to merge 
Former-commit-id: 61455f533b [formerly 82f3d26700] [formerly 61455f533b [formerly 82f3d26700] [formerly c311adda88 [formerly 3496de5dfddf84fb7130d993a17dcf973018d2f1]]]
Former-commit-id: c311adda88
Former-commit-id: 6e895375bb [formerly 14748bda85]
Former-commit-id: f2846e2051
 2013-07-22 16:12:01 -05:00
Bryan Kowal
27c868f201 Issue #2206 - relocate ATBL directory change to 13.5 
Former-commit-id: aeb80aa780 [formerly b8de269bd0] [formerly aeb80aa780 [formerly b8de269bd0] [formerly 75e9bdcb7a [formerly 5ba0ee80d25a5fe548d31f736eceb38a58f8ee90]]]
Former-commit-id: 75e9bdcb7a
Former-commit-id: 9bfdd9121d [formerly b45ee945b3]
Former-commit-id: ee99d6f73d
 2013-07-22 13:44:32 -05:00
Ron Anderson
89ef1f295b 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: ecf1cfe4ed [formerly 02dbc313c8] [formerly ecf1cfe4ed [formerly 02dbc313c8] [formerly 249e7b1aaa [formerly 7e04107b602191703a8dbe19b7182ccb41a13eb1]]]
Former-commit-id: 249e7b1aaa
Former-commit-id: 188ae55396 [formerly d62ba6c852]
Former-commit-id: ff6f9def32
 2013-07-22 09:47:09 -05:00
Greg Armendariz
6c35eb215a Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1 
Former-commit-id: fda3ba6d5b [formerly a3b77f2623] [formerly fda3ba6d5b [formerly a3b77f2623] [formerly d5ea12d97f [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: c8c2a3d636 [formerly 3947baa02d]
Former-commit-id: e1092b5725
 2013-07-19 14:15:24 -05:00
David Gillingham
6415691028 Issue #1842: Fix issue where start time of in progress VTEC events was being set 
to 991130T0000Z.


Former-commit-id: 62d740b2ed [formerly 1fc7c3197a] [formerly 62d740b2ed [formerly 1fc7c3197a] [formerly d0568ff347 [formerly bf21f81dcad44880af5a3f988d15d4330b2b1d6b]]]
Former-commit-id: d0568ff347
Former-commit-id: 988a705e81 [formerly 4b9edbdcb4]
Former-commit-id: e52a6caa0e
 2013-07-19 11:24:30 -05:00
Bryan Kowal
21902a3edb Issue #2153 - fix 13.5.1 build after merge 
Former-commit-id: b49ddfe75a [formerly 914f2f7e2f] [formerly b49ddfe75a [formerly 914f2f7e2f] [formerly e9e3baa4df [formerly a70fac10e48f1fc258a7756acb4d48560a54248d]]]
Former-commit-id: e9e3baa4df
Former-commit-id: d67aa10275 [formerly a7f431e526]
Former-commit-id: 9af77e045c
 2013-07-19 10:28:30 -05:00
Richard Peter
374879df01 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: 85fb4c3940 [formerly 7e08c04383] [formerly 85fb4c3940 [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: eefaf2c836 [formerly ea2b372343]
Former-commit-id: 3a573f4256
 2013-07-18 21:46:25 -05:00
Steve Harris
513c089375 13.5.1-7 baseline 
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
 2013-07-18 12:07:22 -04:00
Dustin Johnson
f342d10b14 Issue #2205 Fix cancelling adhoc queries 
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: 584e427e81 [formerly 58ab4e5cfc] [formerly 584e427e81 [formerly 58ab4e5cfc] [formerly 9aadc61ea5 [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 520d539a44 [formerly 54ff2b87c6]
Former-commit-id: 865d1d88fc
 2013-07-18 11:06:42 -05:00
Roger Ferrel
8d6092bbf0 Issue #1966 Relocation of configuration files and checks for bad configuration files. 
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: e225bd674b [formerly c002045a87] [formerly e225bd674b [formerly c002045a87] [formerly 91ee1d36bf [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 97e4dc3633 [formerly 95cb3439a4]
Former-commit-id: 47ac9a9147
 2013-07-18 10:02:05 -05:00
Nate Jensen
1df8a39cd9 Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1 
Former-commit-id: 96ae856660 [formerly 09cae0cba3] [formerly 96ae856660 [formerly 09cae0cba3] [formerly 3649af1b71 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]]]
Former-commit-id: 3649af1b71
Former-commit-id: a9f0243e01 [formerly cb9b26a380]
Former-commit-id: c6c8c3c2d0
 2013-07-17 16:34:25 -05:00
Dave Hladky
779ebd5db3 Issue #2184 Removed all other HUCs other than ALL from storage 
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 840b44b1e1 [formerly 84dae0a6b8] [formerly 840b44b1e1 [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]
Former-commit-id: bd03085f8d
Former-commit-id: 4556798697 [formerly 15738a4d30]
Former-commit-id: f5ea1f0327
 2013-07-17 15:18:49 -05:00
Ben Steffensmeier
e6b5f4f6a6 Issue #2107 Fix sampling of grid vector arrows. 
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: fb1a0a203a [formerly 767915b318] [formerly fb1a0a203a [formerly 767915b318] [formerly 4a25b32919 [formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]]]
Former-commit-id: 4a25b32919
Former-commit-id: a82bb6e999 [formerly abedf0f23a]
Former-commit-id: 5b68e9d57c
 2013-07-15 15:51:41 -05:00
Greg Armendariz
b601345c9f 13.5.1-6 baseline 
Former-commit-id: 5894853996 [formerly 7e09fa5a0b] [formerly 5894853996 [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0 [formerly 12a09f9aa7]
Former-commit-id: ec2637676d
 2013-07-10 10:04:22 -04:00
Ben Steffensmeier
c02d27fe9e Issue #1869 Switch location hibernate type to use hibernate spatial. 
Former-commit-id: f8596f1f5a [formerly 7a31fbb386] [formerly f8596f1f5a [formerly 7a31fbb386] [formerly bbdd5cdc79 [formerly b434131d412788c478ec45114a86abe925a79d4c]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: a524c3f17d [formerly d0b0d981cc]
Former-commit-id: db54975911
 2013-07-09 18:25:11 -05:00
Dustin Johnson
06ce541b67 Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it 
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8

Former-commit-id: 2cfe1506a4 [formerly 0393cec5d5] [formerly 2cfe1506a4 [formerly 0393cec5d5] [formerly 9f6bd8b32b [formerly 198c9895608d22b3e3a616f2812628be32da514b]]]
Former-commit-id: 9f6bd8b32b
Former-commit-id: 617fdd6b44 [formerly 3cb8e1336c]
Former-commit-id: b9f992626c
 2013-07-09 14:55:22 -05:00
Ben Steffensmeier
364a7ec1b6 Issue #1869 Format Calendar when making Constraint Mapping. 
Former-commit-id: 2cccbc8e0d [formerly f53f702b9e] [formerly 2cccbc8e0d [formerly f53f702b9e] [formerly c3f48bac0a [formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]]
Former-commit-id: c3f48bac0a
Former-commit-id: 4bdec4b2bb [formerly 1017dfae5b]
Former-commit-id: 236ec98da1
 2013-07-09 14:01:13 -05:00
Brad Gonzales
1405b1f061 Issue #1965 Changed to use File.delete() instead of Apache FileUtil.deleteQuietly(). 
Amend: Update from peer review.

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: 2ced007de9 [formerly b462162996] [formerly 2ced007de9 [formerly b462162996] [formerly 503d6d6cca [formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 222965ca7f [formerly 4f80abebaa]
Former-commit-id: 6de2098f63
 2013-07-09 09:07:38 -05:00
Bryan Kowal
259a7d99b1 Issue #2153 - fix commons-logging dependencies for wes2bridge 
Former-commit-id: 8485164fa2 [formerly 650509604a] [formerly 8485164fa2 [formerly 650509604a] [formerly c3a87eadea [formerly 3eab5b0c2ae5ed93526edd0b13c40180d6d7cc65]]]
Former-commit-id: c3a87eadea
Former-commit-id: bdabcac203 [formerly 2dc96499d0]
Former-commit-id: b3a93df1df
 2013-07-08 20:14:11 -05:00
Ben Steffensmeier
812a14c5cc Issue #1869 Fix goes sounding updates. 
Change-Id: Ib974c8e88bea021e0e8505e6fb2974f4e108dc80

Former-commit-id: 309624cb7b [formerly dbe74b56e5] [formerly 309624cb7b [formerly dbe74b56e5] [formerly 21abe429ec [formerly 127609cb0ced4b4554943ad78d4263cb70489a90]]]
Former-commit-id: 21abe429ec
Former-commit-id: 0b9c18aa23 [formerly e92d1e9cad]
Former-commit-id: c74c93af71
 2013-07-08 11:47:08 -05:00
Greg Armendariz
13ac0b1062 13.5.1-5 baseline 
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
 2013-07-03 12:20:27 -04:00
Bryan Kowal
c0905c536e Issue #2153 - 13.5.1 build update 
Change-Id: Ia57fe9a6ae3f31826eec1eede1c2b46c5c4fae05

Former-commit-id: 2e46748156 [formerly 6a6cdd7f6d] [formerly 2e46748156 [formerly 6a6cdd7f6d] [formerly dc177c90d1 [formerly 8a021ef97c67a4fc7325ce91808cd5878fbd2cda]]]
Former-commit-id: dc177c90d1
Former-commit-id: 94ecc8119c [formerly 6bbe51aca9]
Former-commit-id: a89ff261d0
 2013-07-02 16:12:06 -05:00
Roger Ferrel
1d3ee09895 Issue #1964 clean up of features and manifest. 
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 3c31d8c2ac [formerly 41c46e14c0] [formerly 3c31d8c2ac [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: b3437266d7 [formerly 201e62a4ad]
Former-commit-id: ea00a52ebe
 2013-07-02 11:14:56 -05:00
Nate Jensen
6c95177bdf Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1 
Former-commit-id: c68cf47883 [formerly e4955f094c] [formerly c68cf47883 [formerly e4955f094c] [formerly 01efa33cb9 [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]]
Former-commit-id: 01efa33cb9
Former-commit-id: 058e47192a [formerly 150203f5cc]
Former-commit-id: d288dded44
 2013-07-02 11:07:59 -05:00
Jonathan Sanchez
28849d2a53 Issue #2139 Loaded maps at cave start up. 
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: 58fcc4c896 [formerly a2328f0e06] [formerly 58fcc4c896 [formerly a2328f0e06] [formerly de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]]
Former-commit-id: de24b8b431
Former-commit-id: ab2e2f9a17 [formerly 4e1b0674e4]
Former-commit-id: 5431e5915d
 2013-07-02 11:04:26 -05:00
Roger Ferrel
5eee41410c Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build. 
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: 82b1712714 [formerly c3ebc0cc1c] [formerly 82b1712714 [formerly c3ebc0cc1c] [formerly 68be9bd65f [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]]
Former-commit-id: 68be9bd65f
Former-commit-id: ff84f293fd [formerly 933009605a]
Former-commit-id: 68c22b7073
 2013-07-01 15:45:14 -05:00
Nate Jensen
89f8162e2b Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1 
Former-commit-id: b23dcab913 [formerly f7e743f388] [formerly b23dcab913 [formerly f7e743f388] [formerly 001fba449f [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]]
Former-commit-id: 001fba449f
Former-commit-id: 47d3441930 [formerly 0cb9726554]
Former-commit-id: 57d1375eed
 2013-07-01 11:29:47 -05:00
Bryan Kowal
29f21e56ee Issue #2153 - fix merge issue for build 
Former-commit-id: 756fb4be59 [formerly f052982f8e] [formerly 756fb4be59 [formerly f052982f8e] [formerly 9c1aaa2bf5 [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 08bb604ced [formerly 37a5eb6c69]
Former-commit-id: e6516def2a
 2013-07-01 10:52:29 -05:00
Jonathan Sanchez
23fe9db31b Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen." 
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]].


Former-commit-id: 70ab67c3e5 [formerly c883b4e636] [formerly 70ab67c3e5 [formerly c883b4e636] [formerly 7f74926bb4 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]]
Former-commit-id: 7f74926bb4
Former-commit-id: fa0887429d [formerly 41e94abee3]
Former-commit-id: a08032627c
 2013-07-01 10:40:48 -05:00
Richard Peter
da3eb1e75c 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: da54766cc8 [formerly 53258be797] [formerly da54766cc8 [formerly 53258be797] [formerly 582f38bdd4 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 69f8807963 [formerly 1757da59ee]
Former-commit-id: 7ceb1bb9ab
 2013-06-30 23:46:32 -05:00
Brad Gonzales
245de9c408 Issue #1965 added edex archive to the build.edex build.xml. 
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: 2d1c6a0ec5 [formerly ba661b9e39] [formerly 2d1c6a0ec5 [formerly ba661b9e39] [formerly add108398a [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]
Former-commit-id: add108398a
Former-commit-id: bc766efb7a [formerly 5c9ce05ce3]
Former-commit-id: c4daf04c32
 2013-06-28 13:25:46 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline 
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
 2013-06-28 09:46:25 -04:00
Brad Gonzales
33dc495040 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive. 
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: 65507d4424 [formerly c28d1e5d4d] [formerly 65507d4424 [formerly c28d1e5d4d] [formerly f4bb78381c [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]
Former-commit-id: f4bb78381c
Former-commit-id: 6e99019a25 [formerly d842d8d9d0]
Former-commit-id: f51c74e2d4
 2013-06-27 17:40:07 -05:00
Brad Gonzales
9a5c3e259d Issue #1965 added File filtering by file date extension in archive purge. 
Amend: updated purge cron time to once every hour.
       moved archive.purge.cron to cron.properties.
       removed purge code from DataArchiver.
       added back isHoursToKeep in DataArchiver.
       updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
       updates from peer review.
       updated test cases to work with Roger's refactoring.
       fixes for ArchiveConfigManager createArchive.
       clean up of ArchiveConfigManager purgeFile.

Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519

Former-commit-id: 67b4a2e202 [formerly 137c66539e] [formerly 67b4a2e202 [formerly 137c66539e] [formerly 276f05233f [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]
Former-commit-id: 276f05233f
Former-commit-id: d6fb315096 [formerly 4f54596904]
Former-commit-id: d047e6a137
 2013-06-27 11:46:44 -05:00
Roger Ferrel
6261e65829 Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up. 
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 6f07f6f3bd [formerly ee409c0819] [formerly 6f07f6f3bd [formerly ee409c0819] [formerly f66681f62b [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]
Former-commit-id: f66681f62b
Former-commit-id: 5f35643c2d [formerly 45dcfe3ad8]
Former-commit-id: bec6928ea9
 2013-06-27 07:51:56 -05:00
Richard Peter
2952f2b56d Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1 
Former-commit-id: e3886246fd [formerly 3a3dc3d208] [formerly e3886246fd [formerly 3a3dc3d208] [formerly 67d052307c [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]]
Former-commit-id: 67d052307c
Former-commit-id: 1b00dd48ec [formerly 208b01a167]
Former-commit-id: 575405b14e
 2013-06-26 13:25:39 -05:00
Ben Steffensmeier
6cb77b1793 Issue #1869 Fix plot sampling. 
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 570da6f0d5 [formerly 8c14a34f46] [formerly 570da6f0d5 [formerly 8c14a34f46] [formerly 6db28c32a5 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]]
Former-commit-id: 6db28c32a5
Former-commit-id: 2ce266f7e7 [formerly f26a72afe9]
Former-commit-id: 0d2f556144
 2013-06-26 13:24:13 -05:00
Nate Jensen
586cb967aa Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1 
Former-commit-id: 8cc7eefd84 [formerly a60afe6640] [formerly 8cc7eefd84 [formerly a60afe6640] [formerly 10baafed63 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]]
Former-commit-id: 10baafed63
Former-commit-id: 9374463bac [formerly 214fd8689c]
Former-commit-id: b4c6a79741
 2013-06-26 11:14:03 -05:00
Jonathan Sanchez
acad56f72b Issue #2139 Run async job for loading maps in warngen. 
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

Former-commit-id: ab8acf06e1 [formerly 81aad09d06] [formerly ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]]
Former-commit-id: e4c0188c14
Former-commit-id: d1b63b5a25 [formerly 47505aa013]
Former-commit-id: c4ce4831c2
 2013-06-25 15:29:08 -05:00
Roger Ferrel
3419cbaddd Issue #1966 Initial Base configuration files for Dale Morris to test. 
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 1e5d68fa1b [formerly 2cfff5c563] [formerly 1e5d68fa1b [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 318de198e5 [formerly ee52f0281c]
Former-commit-id: b681d07346
 2013-06-25 13:44:30 -05:00
Richard Peter
9acddf6eeb Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 0fa3bf800d [formerly 744eb64856] [formerly 0fa3bf800d [formerly 744eb64856] [formerly 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: be094a1745 [formerly a7594f8c93]
Former-commit-id: 4b582fef50
 2013-06-24 18:36:15 -05:00
Steve Harris
50d4376af7 13.5.1-3 baseline 
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: deebdb874a [formerly 810388f00a]
Former-commit-id: 1e939939b5
 2013-06-24 09:29:43 -04:00
Dustin Johnson
a6c7287a74 Issue #1802 Fix event processing in regards to transaction commits/rollbacks 
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22

Former-commit-id: a606508cd4 [formerly ecae75ecd8] [formerly a606508cd4 [formerly ecae75ecd8] [formerly a331cd2958 [formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]
Former-commit-id: a331cd2958
Former-commit-id: cf36003f12 [formerly d2faa3b600]
Former-commit-id: 87e4d9269d
 2013-06-20 13:53:04 -05:00
Ben Steffensmeier
6a500f68ab Issue #2128 ensure setDataURI sets the dataURI. 
Former-commit-id: b507b6b1fd [formerly f02b073cc8] [formerly b507b6b1fd [formerly f02b073cc8] [formerly 68bb07f5fa [formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]]
Former-commit-id: 68bb07f5fa
Former-commit-id: 38f7211e99 [formerly 69f1d9d812]
Former-commit-id: be0c2f2a6f
 2013-06-20 11:11:37 -05:00
Lee Venable
6a4d6fb933 Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1 
Former-commit-id: 3248909c85 [formerly 377bc28f63] [formerly 3248909c85 [formerly 377bc28f63] [formerly 8b92b564d5 [formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]]
Former-commit-id: 8b92b564d5
Former-commit-id: 953ad96305 [formerly 9b564bef6a]
Former-commit-id: ae73cbab32
 2013-06-20 09:22:36 -05:00
Nate Jensen
9e333d9988 Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1 
Former-commit-id: a029fa7e57 [formerly b7b2602271] [formerly a029fa7e57 [formerly b7b2602271] [formerly ba5c49fa61 [formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]]
Former-commit-id: ba5c49fa61
Former-commit-id: d1b3b0f000 [formerly 622e1298d2]
Former-commit-id: 65157cd1de
 2013-06-19 17:45:41 -05:00
Richard Peter
bd9cf3c849 Merge "Issue #1966 Check for modifications on close." into omaha_13.5.1 
Former-commit-id: c75874364d [formerly 36ed7d5d2b] [formerly c75874364d [formerly 36ed7d5d2b] [formerly 1fd38812ec [formerly 3c19aebeb235e8bf24e286007b27d5e8263731c6]]]
Former-commit-id: 1fd38812ec
Former-commit-id: bfd5e0929a [formerly fd3cdedf8e]
Former-commit-id: 71e960607d
 2013-06-19 16:41:27 -05:00
Ben Steffensmeier
c5567fa3d5 Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective. 
Former-commit-id: f238131378 [formerly 0e6f3ff5e6] [formerly f238131378 [formerly 0e6f3ff5e6] [formerly 6de9e86090 [formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]]
Former-commit-id: 6de9e86090
Former-commit-id: deacc7c250 [formerly accd308f8b]
Former-commit-id: fa9d23798e
 2013-06-19 16:35:41 -05:00
Roger Ferrel
a4bee23421 Issue #2119 Added check when no selected lid. 
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac

Former-commit-id: 541b7fbc93 [formerly dc5059f06b] [formerly 541b7fbc93 [formerly dc5059f06b] [formerly e7dc1184b1 [formerly 4a64a5b44a05a1c91b9a3d878ea0806e68c6d788]]]
Former-commit-id: e7dc1184b1
Former-commit-id: dc0e31fcdd [formerly 440ea0fc25]
Former-commit-id: c549efa0c1
 2013-06-19 16:25:01 -05:00
Roger Ferrel
83081bebe2 Issue #2110 RequestRouter.route(req) changed the class returned. 
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f

Former-commit-id: c6b4424fb7 [formerly f3a1c68d40] [formerly c6b4424fb7 [formerly f3a1c68d40] [formerly 4443dfd11a [formerly cda40b66492abf6a0064d28484b03e05500f7bed]]]
Former-commit-id: 4443dfd11a
Former-commit-id: a2db3ff22c [formerly 7c7b1264d1]
Former-commit-id: b9244cb214
 2013-06-19 11:25:55 -05:00