Commit graph

1248 commits

Author SHA1 Message Date
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
Dustin Johnson
89b926e15e Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: 757c711d2e [formerly 9156ec8c2d] [formerly 757c711d2e [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: e383aa83e1 [formerly c227436a3e]
Former-commit-id: f6b7d97fd2
2013-06-12 14:52:49 -05:00
Nate Jensen
ce7068cbad Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: dae8945d1a [formerly 30f9bba5c4] [formerly dae8945d1a [formerly 30f9bba5c4] [formerly 08eb034abc [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]]
Former-commit-id: 08eb034abc
Former-commit-id: 8516c28fdf [formerly 53784c5a86]
Former-commit-id: 9b42439288
2013-06-12 14:05:15 -05:00
Mike Duff
ce60afe8db Issue #2064 - Corrected Time object storage on subscriptions
Change-Id: I7cb4f53fd8dcdb2fc93ffd15c3a0c72e7eeb57d0

Former-commit-id: 5aabcd3001 [formerly a7f277c67b] [formerly 5aabcd3001 [formerly a7f277c67b] [formerly 0846f7c79a [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]]
Former-commit-id: 0846f7c79a
Former-commit-id: 1357c03113 [formerly ec08442f5d]
Former-commit-id: 0912f5e85e
2013-06-12 11:12:05 -05:00
Dustin Johnson
1425620cce Issue #2038 Delta script should also update providers in the database
Change-Id: I07f058af1702d43f3aa60f0a8646b016f6866b3b

Former-commit-id: 2b5daedc75 [formerly f361c49484] [formerly 2b5daedc75 [formerly f361c49484] [formerly 14c7d2d81e [formerly de9efbe2f2a74f5c2b2d730153f4831f0c17336e]]]
Former-commit-id: 14c7d2d81e
Former-commit-id: b0658fda21 [formerly 582c618ace]
Former-commit-id: 27120c17f0
2013-06-10 15:36:47 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Richard Peter
ac4e4b0658 Merge "Issue #2038 Add support for point data type subscriptions to BandwidthManager" into development
Former-commit-id: 9c3d79ad8e [formerly 05c82feceb] [formerly 9c3d79ad8e [formerly 05c82feceb] [formerly 286d19c182 [formerly a64228266a146ecb9a27381d9422c7b9bef56dac]]]
Former-commit-id: 286d19c182
Former-commit-id: 3eeaf1db8b [formerly 11ebd89a2c]
Former-commit-id: 7dc49f0a5d
2013-06-10 11:46:13 -05:00
Dustin Johnson
0fcd66162e Issue #2038 Add support for point data type subscriptions to BandwidthManager
Amend: Peer review comments, improve time considerations for Point subscriptions

Change-Id: I9dde7f7da9dab9c8f3163a87b1ebe64303fc7dc2

Former-commit-id: 63f8ff76c3 [formerly 7c4a6261fc] [formerly 63f8ff76c3 [formerly 7c4a6261fc] [formerly c677ae32d7 [formerly f7ed3ec86188635eb069878ac490af06ea98e4a2]]]
Former-commit-id: c677ae32d7
Former-commit-id: ebf61027ff [formerly 3ec421b779]
Former-commit-id: b56641d370
2013-06-10 11:37:37 -05:00
Nate Jensen
8039da0546 Merge "Issue #1638 Made DataURIUtil populate all fields in the data map and using the dataURI cached accessors when applicable." into development
Former-commit-id: d9c0800441 [formerly aced5003a4] [formerly d9c0800441 [formerly aced5003a4] [formerly aeee0ffbbd [formerly 417d339cc96fdafb6e55287494aaf6276fea01a6]]]
Former-commit-id: aeee0ffbbd
Former-commit-id: 7b7e96cedc [formerly 096e5fc2a6]
Former-commit-id: 8c3d8a8197
2013-06-10 11:04:21 -05:00
Nate Jensen
676f62e39f Merge "Issue #1981 - OUPRequest is now a privileged request. Also proctecting TafQueueRequest" into development
Former-commit-id: 965ac61515 [formerly 2b823f6758] [formerly 965ac61515 [formerly 2b823f6758] [formerly 474e0ac925 [formerly 35b47a9d54273ae8f9edcec731837cb85e928faf]]]
Former-commit-id: 474e0ac925
Former-commit-id: 3b4c9decfd [formerly beee941ae5]
Former-commit-id: bf3ba1e764
2013-06-10 11:02:01 -05:00
Max Schenkelberg
413ccb70d7 Issue #1638 Made DataURIUtil populate all fields in the data map and using the dataURI cached accessors when applicable.
Change-Id: I2659ff03a934df90e8af7491bf46ff80148b267e

Former-commit-id: fe3142bb36 [formerly 15f406c366] [formerly fe3142bb36 [formerly 15f406c366] [formerly 2160f5a524 [formerly 7521bf8c90c8066d6797b29c5115818921270615]]]
Former-commit-id: 2160f5a524
Former-commit-id: 038d370895 [formerly f907ad9785]
Former-commit-id: da41df2bb3
2013-06-10 10:41:42 -05:00
Mike Duff
1fd24b44e2 Issue #1981 - OUPRequest is now a privileged request.
Also proctecting TafQueueRequest

Change-Id: I3a05a407a21b8f9d2e6426c4f456e2218479242a

Former-commit-id: 386cdeeba6 [formerly ee5e9c1435] [formerly 386cdeeba6 [formerly ee5e9c1435] [formerly 37cdcc0b0b [formerly acc1b993db8d78f7edfc3bd287b7d3ca39c0d391]]]
Former-commit-id: 37cdcc0b0b
Former-commit-id: a614c16aba [formerly c293c466c1]
Former-commit-id: add586bb26
2013-06-07 15:52:02 -05:00
Richard Peter
57c6d49597 Merge "Issue #1966 Working case generation without compression. Changes to Retention to remove compile errors." into development
Former-commit-id: a24c41e40e [formerly 794b9a70f3] [formerly a24c41e40e [formerly 794b9a70f3] [formerly 878435ddd9 [formerly dd8e9aa61642ba6498bbf5871ed6c8372ec468d0]]]
Former-commit-id: 878435ddd9
Former-commit-id: d3913f5da9 [formerly 22ac30e0a6]
Former-commit-id: 7b3d65eb40
2013-06-07 15:05:08 -05:00
Bryan Kowal
5679726334 Issue #1927 - webapps will now self-identify themselves
Former-commit-id: 1a083a2cfc [formerly 9bd2741e22] [formerly 1a083a2cfc [formerly 9bd2741e22] [formerly 5056e2a0fa [formerly 67787a77b4211ff74d34be7e33d26fa439cc9492]]]
Former-commit-id: 5056e2a0fa
Former-commit-id: 16bf16c04d [formerly baffa90082]
Former-commit-id: d143d33045
2013-06-07 13:47:20 -05:00
Greg Armendariz
0bf01b9b09 Merge "Issue #1927 - remove obsolete files" into development
Former-commit-id: e220ed1ae4 [formerly 367d9850b3] [formerly e220ed1ae4 [formerly 367d9850b3] [formerly afed5f12a0 [formerly e19a1da294b9d0e34c126537a13a12e8aba8f35f]]]
Former-commit-id: afed5f12a0
Former-commit-id: e9aea7130e [formerly 61d6d42121]
Former-commit-id: 3c25f8969d
2013-06-06 16:49:05 -05:00
Nate Jensen
64983bb91d Merge "Issue #2023: Pure python client implementation of Data Access Framework." into development
Former-commit-id: 4c9e7eb885 [formerly cc7f3d9cf6] [formerly 4c9e7eb885 [formerly cc7f3d9cf6] [formerly 78b33b57d1 [formerly f5cc02c442077789e19bf615ec15a7b2e4195721]]]
Former-commit-id: 78b33b57d1
Former-commit-id: 9ee84c0d97 [formerly 479a15ab85]
Former-commit-id: 465f0640d4
2013-06-06 16:42:00 -05:00
Bryan Kowal
6e1273ed38 Issue #1927 - remove obsolete files
Former-commit-id: 6aecf2370f [formerly 6d642232dd] [formerly 6aecf2370f [formerly 6d642232dd] [formerly 4962310360 [formerly 00f7ba0212f84db3b36805e2dcc2790d67fcfaac]]]
Former-commit-id: 4962310360
Former-commit-id: fa1add535d [formerly fee1818521]
Former-commit-id: 1f320ec6b4
2013-06-06 16:35:04 -05:00
Steve Harris
18fdb31920 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: 64cf1aedb1 [formerly 571757b2a6] [formerly 64cf1aedb1 [formerly 571757b2a6] [formerly 2327205cb7 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: 8b78f538d3 [formerly 035d74b348]
Former-commit-id: abfd0b9ead
2013-06-06 15:46:23 -05:00
Steve Harris
7d8ae66ddf Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: b0c0e2e7cf [formerly 1e4c538e58] [formerly b0c0e2e7cf [formerly 1e4c538e58] [formerly 56e04554e9 [formerly 2e1e30df32ef00523dbcd995457b854cbcad3d41]]]
Former-commit-id: 56e04554e9
Former-commit-id: 1d4e65d435 [formerly 72a559120f]
Former-commit-id: 4b06eb1152
2013-06-06 15:43:34 -05:00