Commit graph

1266 commits

Author SHA1 Message Date
Ben Steffensmeier
02d3f28c06 Issue #2275 Add dataURI column back into bufrmos types.
Former-commit-id: d6ab7d08be [formerly 4cb853ac39] [formerly d6ab7d08be [formerly 4cb853ac39] [formerly 9219db0069 [formerly 1b883da972ac915252c256b63c881d23121f3ac6]]]
Former-commit-id: 9219db0069
Former-commit-id: 3a8893846f [formerly 8b9031719a]
Former-commit-id: 7668fdbde7
2013-08-19 16:00:01 -05:00
Max Schenkelberg
16232ee8c7 Issue #2189 Fixing java 6 and 7 compatibility issue in 13.5.2 branch.
Change-Id: Ia800aee8f4e027630293b074d0b7e8d93d424611

Former-commit-id: a6a44754c9 [formerly 57a0df81a6] [formerly a6a44754c9 [formerly 57a0df81a6] [formerly 9e213438f4 [formerly 0603b0bd77a9463abaa9020bf1bcb97befd7b161]]]
Former-commit-id: 9e213438f4
Former-commit-id: 0703b5c772 [formerly b67a3033f9]
Former-commit-id: f720f78f4c
2013-08-15 17:36:36 -05:00
Max Schenkelberg
6709242e36 Issue #2255 Made TransformFactory loop to find true base crs in worldToCRS and worldToGrid.
Change-Id: I0cbb4ce0446ab4080ee0dc0f87c1de2ffc77a5a7

Former-commit-id: 5a4d880498 [formerly e85d66f4e5] [formerly 5a4d880498 [formerly e85d66f4e5] [formerly 3800aec9e6 [formerly d132d2ec2fc296518765d78b04ed942ec246b2e0]]]
Former-commit-id: 3800aec9e6
Former-commit-id: 352e21ffd3 [formerly d89d13d029]
Former-commit-id: ee68615786
2013-08-15 15:50:40 -05:00
David Gillingham
a2a4d1fbcf Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS
emulator program to support new directory structure and some code cleanup and
refactoring.

Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d

Former-commit-id: 1d3f3da9cc [formerly 0f4f24beb8] [formerly 1d3f3da9cc [formerly 0f4f24beb8] [formerly f8b6ec20c1 [formerly ad7acb2d563c79d92d84ec62405b492907191af3]]]
Former-commit-id: f8b6ec20c1
Former-commit-id: 3af47effc5 [formerly 751188ab5a]
Former-commit-id: 4bd40cd544
2013-08-14 17:10:04 -05:00
Richard Peter
a7075027be Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 2608dfe1d8 [formerly c61afa1bfa] [formerly 2608dfe1d8 [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 3f65eaf74b [formerly 58a4aaa080]
Former-commit-id: 7ca1edf371
2013-08-14 14:29:55 -05:00
Steve Harris
d0be6956e9 13.5.1-15 baseline
Former-commit-id: 535218c676 [formerly 53e96e21db] [formerly 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 4f9288e7c1 [formerly 65beefde58]
Former-commit-id: 9ea3f0c215
2013-08-14 10:24:26 -04:00
Nate Jensen
7e35afdd49 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: a9815b0551 [formerly 15405cab1b] [formerly a9815b0551 [formerly 15405cab1b] [formerly 63b2fe798a [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 464a104dc1 [formerly 3be446fca8]
Former-commit-id: 96214e9554
2013-08-13 12:27:02 -05:00
Ben Steffensmeier
7a2cde76d5 Issue #1869 Fix bufrua point data stationId.
Former-commit-id: bf2dfbaca8 [formerly 9e799b4df1] [formerly bf2dfbaca8 [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]
Former-commit-id: d1d3491aaf
Former-commit-id: 20a7ba8e69 [formerly 761cb47f73]
Former-commit-id: b5332f3eb5
2013-08-09 13:00:18 -05:00
Lee Venable
33177a8711 Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: ef5a7fb83a [formerly 69dd7b66fa] [formerly ef5a7fb83a [formerly 69dd7b66fa] [formerly 69645f03dc [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]
Former-commit-id: 69645f03dc
Former-commit-id: 696ee07b3f [formerly d9e82e20fd]
Former-commit-id: a0e0b81a81
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
21368ade28 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 05f49219d3 [formerly 4711226b21] [formerly 05f49219d3 [formerly 4711226b21] [formerly dad0681ae0 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]
Former-commit-id: dad0681ae0
Former-commit-id: b467d0fd66 [formerly d068b5d61f]
Former-commit-id: 9be546dab8
2013-08-08 16:31:35 -05:00
Greg Armendariz
e51e51c625 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: 3cecb178cf [formerly b08ce25ac8] [formerly 3cecb178cf [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 24dc722be4 [formerly 566532c40d]
Former-commit-id: 172bc300ca
2013-08-08 16:24:39 -05:00
Greg Armendariz
0c61b62d24 13.5.1-13 baseline
Former-commit-id: f0b62a22bf [formerly 29b823fee4] [formerly f0b62a22bf [formerly 29b823fee4] [formerly 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]
Former-commit-id: 5577e686c1
Former-commit-id: 9f2f62427b [formerly 8bfac41add]
Former-commit-id: b66fcc40a5
2013-08-08 17:00:36 -04:00
Greg Armendariz
244bc3ac37 13.5.1-12 baseline
Former-commit-id: 01d067cff9 [formerly c9898ba8d1] [formerly 01d067cff9 [formerly c9898ba8d1] [formerly fe51885ba7 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: f777a744e5 [formerly 9892a1a262]
Former-commit-id: cbf9e42c21
2013-08-08 15:34:01 -04:00
Greg Armendariz
4b29a16298 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: d1fb06feb7 [formerly ecc9f77f42] [formerly d1fb06feb7 [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]
Former-commit-id: 6b1989cb29
Former-commit-id: fc6195bbf6 [formerly c46f04dd72]
Former-commit-id: 9a1b44efdc
2013-08-07 14:46:30 -05:00
Greg Armendariz
8bf2c1cc07 13.5.1-11 baseline
Former-commit-id: c402dbf6e9 [formerly ea7b22500e] [formerly c402dbf6e9 [formerly ea7b22500e] [formerly 4ec04083bd [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 75f9f8df3f [formerly 26e58d8cdb]
Former-commit-id: f06ee47260
2013-08-07 14:34:27 -04:00
Ben Steffensmeier
7a95a653aa Issue #2242 Optimize FFMP NavigableMap memory.
Former-commit-id: 74a5f09cd1 [formerly f0ceddacf1] [formerly 74a5f09cd1 [formerly f0ceddacf1] [formerly b06171b4f2 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]
Former-commit-id: b06171b4f2
Former-commit-id: 7de39a58bb [formerly 3eb869c65e]
Former-commit-id: 7e3835fd0a
2013-08-07 12:08:13 -05:00
Steve Harris
767b7fdb4d 13.5.1-8 baseline
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: a7d4c6274e [formerly 2afb46f814]
Former-commit-id: 1a3197efdf
2013-07-26 09:02:34 -04:00
David Gillingham
888a61c520 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: 9fa6048f38 [formerly 881566d46b] [formerly 9fa6048f38 [formerly 881566d46b] [formerly 938f9cd7f7 [formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: 72e808cb1c [formerly 42f096abe8]
Former-commit-id: 274ca5a740
2013-07-22 17:24:00 -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
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
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
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
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
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
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
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
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
Nate Jensen
8091cae89d Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: c0f95eb55a [formerly 81fc4fa753] [formerly c0f95eb55a [formerly 81fc4fa753] [formerly c4283b0336 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: afae330d8a [formerly a9c077f0a9]
Former-commit-id: 73c0514c3d
2013-06-19 10:16:06 -05:00
Dustin Johnson
89d5b4327d Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

Former-commit-id: 1e7c85a592 [formerly 6f8246262b] [formerly 1e7c85a592 [formerly 6f8246262b] [formerly 314331c9a4 [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]]]
Former-commit-id: 314331c9a4
Former-commit-id: a0d8e1dc0c [formerly dab308afc8]
Former-commit-id: aa2c2516ee
2013-06-19 08:56:43 -05:00
Dustin Johnson
b0c2c25598 Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: b9d8e444b3 [formerly 9bc7c854ab] [formerly b9d8e444b3 [formerly 9bc7c854ab] [formerly 7ee918a548 [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]
Former-commit-id: 7ee918a548
Former-commit-id: e7a679ebc7 [formerly 50cb2e26a2]
Former-commit-id: cd12316060
2013-06-18 12:34:25 -05:00
Roger Ferrel
0899652c38 Issue #1966 Column sort added; bug fixes to size estimates and saving files.
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa

Former-commit-id: e16bfeee80 [formerly f175b19a93] [formerly e16bfeee80 [formerly f175b19a93] [formerly c7c27c4cbb [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: 28342fdfed [formerly cc39af5044]
Former-commit-id: 2b36404b6c
2013-06-18 08:56:54 -05:00
Steve Harris
c27136275f Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: 41748175b6 [formerly 97631f9c62] [formerly 41748175b6 [formerly 97631f9c62] [formerly 40359c27c3 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: 0e4504c0fa [formerly 41fb06e6ea]
Former-commit-id: 9c75ca8493
2013-06-17 15:25:32 -05:00
Steve Harris
afc02d5731 13.5.1-2 baseline
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ccd66c0724 [formerly 3926dc20f7]
Former-commit-id: 332a74c4de
2013-06-17 15:01:22 -04:00
Richard Peter
b6dc024e78 Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: 16201b8155 [formerly bee6ba6698] [formerly 16201b8155 [formerly bee6ba6698] [formerly 8cdc6993d5 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: 7d773e02ca [formerly 20b7af86f6]
Former-commit-id: 6851718b7e
2013-06-14 10:06:34 -05:00
Nate Jensen
c5d88a6dce Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: f55b3cbdbe [formerly c2faa0e3bf] [formerly f55b3cbdbe [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 4a39d586d2 [formerly 2200c7cded]
Former-commit-id: 853f5c7546
2013-06-13 11:39:30 -05:00
Roger Ferrel
fa9c9258cd Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd

Former-commit-id: d2ac7bd433 [formerly 753f19b309] [formerly d2ac7bd433 [formerly 753f19b309] [formerly a405684c7b [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]
Former-commit-id: a405684c7b
Former-commit-id: ab93641992 [formerly f64db73aef]
Former-commit-id: 09e36152db
2013-06-13 10:57:19 -05:00