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

1258 commits

Author SHA1 Message Date
Lee Venable
90c1aec4ca Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1 
Former-commit-id: c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly 69645f03dc [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]]
Former-commit-id: 69645f03dc
Former-commit-id: b46745eebb [formerly 696ee07b3f] [formerly e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd]]
Former-commit-id: eada16a20c494be474850c2dc84119382e3590d1 [formerly a0e0b81a81]
Former-commit-id: 33177a8711
 2013-08-08 16:40:59 -05:00
Jonathan Sanchez
231cedc656 Issue #2243 Prevented invalid follow ups. 
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]]
Former-commit-id: dad0681ae0
Former-commit-id: 1e64c5d491 [formerly b467d0fd66] [formerly 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]]
Former-commit-id: 8a26fc85e651fdc70a339fe1b11109ae175e19ba [formerly 9be546dab8]
Former-commit-id: 21368ade28
 2013-08-08 16:31:35 -05:00
Greg Armendariz
a118b8f70a 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: 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: d4840d3802 [formerly 24dc722be4] [formerly 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d]]
Former-commit-id: 510970cf69f7524db648757a728ea8385ea55d47 [formerly 172bc300ca]
Former-commit-id: e51e51c625
 2013-08-08 16:24:39 -05:00
Greg Armendariz
b264a9d841 13.5.1-13 baseline 
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac [formerly 9f2f62427b] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5]
Former-commit-id: 0c61b62d24
 2013-08-08 17:00:36 -04:00
Greg Armendariz
d37c94464b 13.5.1-12 baseline 
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b [formerly f777a744e5] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21]
Former-commit-id: 244bc3ac37
 2013-08-08 15:34:01 -04:00
Greg Armendariz
1a04182d44 Merge branch 'master_13.5.1' into omaha_13.5.1 
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223 [formerly fc6195bbf6] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc]
Former-commit-id: 4b29a16298
 2013-08-07 14:46:30 -05:00
Greg Armendariz
7fb928e967 13.5.1-11 baseline 
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977 [formerly 75f9f8df3f] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260]
Former-commit-id: 8bf2c1cc07
 2013-08-07 14:34:27 -04:00
Ben Steffensmeier
a6a4075f13 Issue #2242 Optimize FFMP NavigableMap memory. 
Former-commit-id: 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly 42c551bb7a [formerly 74a5f09cd1] [formerly f0ceddacf1] [formerly b06171b4f2 [formerly f0ceddacf1 [formerly 5208c63e9c6eab03bc42736ffe2254fb802d566b]]]]
Former-commit-id: b06171b4f2
Former-commit-id: 6d60a18a2d [formerly 7de39a58bb] [formerly 638ab88007fb4ccfc259d1c8e3cfadd1bdb30ab1 [formerly 3eb869c65e]]
Former-commit-id: caeba084d0723bb0ee2b76813919bcea8b28e44d [formerly 7e3835fd0a]
Former-commit-id: 7a95a653aa
 2013-08-07 12:08:13 -05:00
Steve Harris
dded20dc93 13.5.1-8 baseline 
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
 2013-07-26 09:02:34 -04:00
David Gillingham
380b13d352 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: e96c2962a5 [formerly 9fa6048f38] [formerly 881566d46b] [formerly e96c2962a5 [formerly 9fa6048f38] [formerly 881566d46b] [formerly 938f9cd7f7 [formerly 881566d46b [formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: f22922eaca [formerly 72e808cb1c] [formerly 148b8c40d4c89da3d04e1f5c6a0dc0ba21499d31 [formerly 42f096abe8]]
Former-commit-id: 059d65f359518574a4d1fa4376a7b2dbfb491997 [formerly 274ca5a740]
Former-commit-id: 888a61c520
 2013-07-22 17:24:00 -05:00
Richard Peter
69af3f93ca 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: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]]
Former-commit-id: cc7189fcb7
Former-commit-id: e46425cd8d [formerly eefaf2c836] [formerly d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]]
Former-commit-id: fcddfd2ee1c278a22544ea6d0efd7a301de67fff [formerly 3a573f4256]
Former-commit-id: 374879df01
 2013-07-18 21:46:25 -05:00
Steve Harris
adf2f89d57 13.5.1-7 baseline 
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
 2013-07-18 12:07:22 -04:00
Roger Ferrel
df37274974 Issue #1966 Relocation of configuration files and checks for bad configuration files. 
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly e5cd0e7599 [formerly e225bd674b] [formerly c002045a87] [formerly 91ee1d36bf [formerly c002045a87 [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 1f56a1179e [formerly 97e4dc3633] [formerly e674edd4dd9db03d4b9f31499b37657af33debd7 [formerly 95cb3439a4]]
Former-commit-id: 4285173926a19c787c964793fdd7bd9e860c0e29 [formerly 47ac9a9147]
Former-commit-id: 8d6092bbf0
 2013-07-18 10:02:05 -05:00
Dave Hladky
ffe58606fe Issue #2184 Removed all other HUCs other than ALL from storage 
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]]
Former-commit-id: bd03085f8d
Former-commit-id: 6f43853101 [formerly 4556798697] [formerly a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30]]
Former-commit-id: 1d2fbac9ecdf8c1c0fa1cc39f8c710dab63ba6bc [formerly f5ea1f0327]
Former-commit-id: 779ebd5db3
 2013-07-17 15:18:49 -05:00
Greg Armendariz
df73c0e2e9 13.5.1-6 baseline 
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]]
Former-commit-id: b9044b1195
Former-commit-id: f23d42e977 [formerly 93b71934c0] [formerly 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]]
Former-commit-id: cca9e123a3f6f9da3810eec2cc36ef7c717f111a [formerly ec2637676d]
Former-commit-id: b601345c9f
 2013-07-10 10:04:22 -04:00
Ben Steffensmeier
7b48c5038a Issue #1869 Switch location hibernate type to use hibernate spatial. 
Former-commit-id: 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly 9d1910ba9d [formerly f8596f1f5a] [formerly 7a31fbb386] [formerly bbdd5cdc79 [formerly 7a31fbb386 [formerly b434131d412788c478ec45114a86abe925a79d4c]]]]
Former-commit-id: bbdd5cdc79
Former-commit-id: 87cc8f9112 [formerly a524c3f17d] [formerly 4c381305878cb140792b9d6b0b8239024c1f483f [formerly d0b0d981cc]]
Former-commit-id: abce4baedd0fd36fcdcf80fdb8b4981ea85727b7 [formerly db54975911]
Former-commit-id: c02d27fe9e
 2013-07-09 18:25:11 -05:00
Dustin Johnson
e46cb588f2 Issue #2038 Correct unregisterFromBandwidthEventBus() to actually do it 
Change-Id: Ic82c974dcf354d9fb871b1b2f81cea52e2502fe8

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

Change-Id: Ia58b75f8f8be62f3aaddbe46aed5558714d276bd

Former-commit-id: cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly cc89d3939d [formerly 2ced007de9] [formerly b462162996] [formerly 503d6d6cca [formerly b462162996 [formerly defb699314eec545eff3b3b603b059ef05ac1a23]]]]
Former-commit-id: 503d6d6cca
Former-commit-id: 2a3706a8f1 [formerly 222965ca7f] [formerly ece70e73a38f366159776702fbedeee0c1c366ee [formerly 4f80abebaa]]
Former-commit-id: 84d33297e2e3c72a87a8cbf7c52ee2f49f1d1d66 [formerly 6de2098f63]
Former-commit-id: 1405b1f061
 2013-07-09 09:07:38 -05:00
Greg Armendariz
5e1549062b 13.5.1-5 baseline 
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06 [formerly d899faec3d] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8]
Former-commit-id: 13ac0b1062
 2013-07-03 12:20:27 -04:00
Roger Ferrel
9eb3cffa65 Issue #1964 clean up of features and manifest. 
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 559a54ea8f [formerly 3c31d8c2ac] [formerly 41c46e14c0] [formerly 7d3362d2b5 [formerly 41c46e14c0 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 56b1a0713c [formerly b3437266d7] [formerly 8c2a8d0c95f2cee23027bf633469a1a45f0b1e94 [formerly 201e62a4ad]]
Former-commit-id: ead9e92b266c6bc5d2a1e8b5c9c7e8b4d7cb051d [formerly ea00a52ebe]
Former-commit-id: 1d3ee09895
 2013-07-02 11:14:56 -05:00
Richard Peter
6434a4025d 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: 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 4ee66ab1f0 [formerly da54766cc8] [formerly 53258be797] [formerly 582f38bdd4 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]]
Former-commit-id: 582f38bdd4
Former-commit-id: 0da7509e6d [formerly 69f8807963] [formerly ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee]]
Former-commit-id: 1478532c079d144368b91a4562993c9aac0b7cd4 [formerly 7ceb1bb9ab]
Former-commit-id: da3eb1e75c
 2013-06-30 23:46:32 -05:00
Brad Gonzales
7c8f8a018c Issue #1965 added edex archive to the build.edex build.xml. 
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: f95cf443d5 [formerly 2d1c6a0ec5] [formerly ba661b9e39] [formerly f95cf443d5 [formerly 2d1c6a0ec5] [formerly ba661b9e39] [formerly add108398a [formerly ba661b9e39 [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]]
Former-commit-id: add108398a
Former-commit-id: fb8caf6e22 [formerly bc766efb7a] [formerly 15de9e7faee3482eda51d0109f76645b35fd25bc [formerly 5c9ce05ce3]]
Former-commit-id: 795e5b8c49c2e0a6a652dcc5f274ef5fb1e2f348 [formerly c4daf04c32]
Former-commit-id: 245de9c408
 2013-06-28 13:25:46 -05:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline 
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
 2013-06-28 09:46:25 -04:00
Brad Gonzales
8e22010180 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: aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly aca1486801 [formerly 65507d4424] [formerly c28d1e5d4d] [formerly f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]]]
Former-commit-id: f4bb78381c
Former-commit-id: 1c6ca60919 [formerly 6e99019a25] [formerly 5f9272a26bf176a83743b4b654221c8613a071d6 [formerly d842d8d9d0]]
Former-commit-id: 41beba358fca549dca62c32eff3862ee1f765033 [formerly f51c74e2d4]
Former-commit-id: 33dc495040
 2013-06-27 17:40:07 -05:00
Brad Gonzales
d706ff2334 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: 90f363d722 [formerly 67b4a2e202] [formerly 137c66539e] [formerly 90f363d722 [formerly 67b4a2e202] [formerly 137c66539e] [formerly 276f05233f [formerly 137c66539e [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]]
Former-commit-id: 276f05233f
Former-commit-id: df7670676b [formerly d6fb315096] [formerly ca13651aece598f209306490fbd73fd98936b032 [formerly 4f54596904]]
Former-commit-id: 450a3eb9f6de7a580368b452e78efb57b1066c68 [formerly d047e6a137]
Former-commit-id: 9a5c3e259d
 2013-06-27 11:46:44 -05:00
Roger Ferrel
667104c43e Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up. 
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly 713f39c429 [formerly 6f07f6f3bd] [formerly ee409c0819] [formerly f66681f62b [formerly ee409c0819 [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]]]
Former-commit-id: f66681f62b
Former-commit-id: 79c0bbb140 [formerly 5f35643c2d] [formerly 91667b1a98b4d6dfebf3dbfd34ceea45670f8fe7 [formerly 45dcfe3ad8]]
Former-commit-id: d681469cf5de2614b883cebf316eab2fd929d808 [formerly bec6928ea9]
Former-commit-id: 6261e65829
 2013-06-27 07:51:56 -05:00
Roger Ferrel
2033689544 Issue #1966 Initial Base configuration files for Dale Morris to test. 
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly 89d4d0e00f [formerly 1e5d68fa1b] [formerly 2cfff5c563] [formerly c10f5c8d65 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]]
Former-commit-id: c10f5c8d65
Former-commit-id: 4b10182a2e [formerly 318de198e5] [formerly d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c]]
Former-commit-id: 1a640f5700b34cc1839d0294b48e0f419bc80aa2 [formerly b681d07346]
Former-commit-id: 3419cbaddd
 2013-06-25 13:44:30 -05:00
Richard Peter
7ef16a186e 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: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7 [formerly be094a1745] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50]
Former-commit-id: 9acddf6eeb
 2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline 
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
 2013-06-24 09:29:43 -04:00
Dustin Johnson
a7a5ea4b35 Issue #1802 Fix event processing in regards to transaction commits/rollbacks 
Change-Id: If5988d96b7e7382e04879ca6126a61237d70bd22

Former-commit-id: de8c9a4915 [formerly a606508cd4] [formerly ecae75ecd8] [formerly de8c9a4915 [formerly a606508cd4] [formerly ecae75ecd8] [formerly a331cd2958 [formerly ecae75ecd8 [formerly 25398fcce99b15d3fda71cad34f39222e30458dd]]]]
Former-commit-id: a331cd2958
Former-commit-id: bf2f6eebd8 [formerly cf36003f12] [formerly b97c78d83811f1218347ce87ea5843be3bb4e72f [formerly d2faa3b600]]
Former-commit-id: 1c8ca91ae0182e9e685222962120c92d3ee918d3 [formerly 87e4d9269d]
Former-commit-id: a6c7287a74
 2013-06-20 13:53:04 -05:00
Ben Steffensmeier
b7641bec29 Issue #2128 ensure setDataURI sets the dataURI. 
Former-commit-id: 2598b08d69 [formerly b507b6b1fd] [formerly f02b073cc8] [formerly 2598b08d69 [formerly b507b6b1fd] [formerly f02b073cc8] [formerly 68bb07f5fa [formerly f02b073cc8 [formerly 1fc3d7fb1ec9be3d34791cda89a1e808846dd82b]]]]
Former-commit-id: 68bb07f5fa
Former-commit-id: f318fef863 [formerly 38f7211e99] [formerly 8ff11c8549d6d75928d3a0627db7abad67a6caeb [formerly 69f1d9d812]]
Former-commit-id: 60dc08c76a62e06ee1c86fc7361c9cd7ceb55e9b [formerly be0c2f2a6f]
Former-commit-id: 6a500f68ab
 2013-06-20 11:11:37 -05:00
Roger Ferrel
d0d18ff416 Issue #2110 RequestRouter.route(req) changed the class returned. 
Change-Id: I720402a177850a4ca798719aaace8bf3a42e552f

Former-commit-id: 90c20a0418 [formerly c6b4424fb7] [formerly f3a1c68d40] [formerly 90c20a0418 [formerly c6b4424fb7] [formerly f3a1c68d40] [formerly 4443dfd11a [formerly f3a1c68d40 [formerly cda40b66492abf6a0064d28484b03e05500f7bed]]]]
Former-commit-id: 4443dfd11a
Former-commit-id: fef68ac4b6 [formerly a2db3ff22c] [formerly 2863f767cd091957133e715c06b8ee4a29858c9f [formerly 7c7b1264d1]]
Former-commit-id: 46f8cb0d6c54c9eae1050b250fb0be417939df13 [formerly b9244cb214]
Former-commit-id: 83081bebe2
 2013-06-19 11:25:55 -05:00
Nate Jensen
d2ef59e9ad 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: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]]
Former-commit-id: c4283b0336
Former-commit-id: ff64bf589b [formerly afae330d8a] [formerly 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]]
Former-commit-id: 9cbc7ddc24e78fbf205d00560788cdfa1249462a [formerly 73c0514c3d]
Former-commit-id: 8091cae89d
 2013-06-19 10:16:06 -05:00
Dustin Johnson
7ca11e99a7 Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa 
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

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

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

Former-commit-id: 9fd68957ab [formerly e16bfeee80] [formerly f175b19a93] [formerly 9fd68957ab [formerly e16bfeee80] [formerly f175b19a93] [formerly c7c27c4cbb [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]]]
Former-commit-id: c7c27c4cbb
Former-commit-id: 5153afecf9 [formerly 28342fdfed] [formerly d71c1b150fba58dabc2a498d16fe41be9f173bcf [formerly cc39af5044]]
Former-commit-id: 712d918bdb6f38e7adc7a9acffe6b62216ccd456 [formerly 2b36404b6c]
Former-commit-id: 0899652c38
 2013-06-18 08:56:54 -05:00
Steve Harris
173bcd08e1 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: dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d [formerly 0e4504c0fa] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493]
Former-commit-id: c27136275f
 2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline 
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
 2013-06-17 15:01:22 -04:00
Richard Peter
b0eb3b7d5d Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1 
Former-commit-id: a8998ba493 [formerly 16201b8155] [formerly bee6ba6698] [formerly a8998ba493 [formerly 16201b8155] [formerly bee6ba6698] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: dff4f07024 [formerly 7d773e02ca] [formerly 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6]]
Former-commit-id: 639ca2c4c504591489deb97309e220c1d260993a [formerly 6851718b7e]
Former-commit-id: b6dc024e78
 2013-06-14 10:06:34 -05:00
Nate Jensen
d045893591 Issue #2102 improve error handling on thrift or http errors 
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

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

Former-commit-id: cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly a405684c7b [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]]
Former-commit-id: a405684c7b
Former-commit-id: 0954bf6d54 [formerly ab93641992] [formerly 62d48cc824e8c115ac1613fb585e1323080737dd [formerly f64db73aef]]
Former-commit-id: 83b62dcf2e0f30e62ea132f1d213596d0ee89274 [formerly 09e36152db]
Former-commit-id: fa9c9258cd
 2013-06-13 10:57:19 -05:00
Dustin Johnson
010458e6d2 Issue #2038 Correct required size estimations for subscription updates 
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: 7a196095cb [formerly e383aa83e1] [formerly a02c9d52556a7097e15119b2711569548c47a69b [formerly c227436a3e]]
Former-commit-id: 9a2f0831aef2aea83818d7bca5ee9fc9cc5099df [formerly f6b7d97fd2]
Former-commit-id: 89b926e15e
 2013-06-12 14:52:49 -05:00
Nate Jensen
e661155551 Issue #1989 fix wrapper.conf 
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

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

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

Former-commit-id: 82523d84c4 [formerly 2b5daedc75] [formerly f361c49484] [formerly 82523d84c4 [formerly 2b5daedc75] [formerly f361c49484] [formerly 14c7d2d81e [formerly f361c49484 [formerly de9efbe2f2a74f5c2b2d730153f4831f0c17336e]]]]
Former-commit-id: 14c7d2d81e
Former-commit-id: fa2ebeebb8 [formerly b0658fda21] [formerly 70a55bfe422d0b5ae314fca120998327360852d3 [formerly 582c618ace]]
Former-commit-id: 1255f5255ef90423baa2a761e05e4b37fd63f835 [formerly 27120c17f0]
Former-commit-id: 1425620cce
 2013-06-10 15:36:47 -05:00
Steve Harris
97a4c59662 13.5.1-1 baseline 
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
 2013-06-10 15:17:17 -04:00
Richard Peter
2bdeac6b45 Merge "Issue #2038 Add support for point data type subscriptions to BandwidthManager" into development 
Former-commit-id: 557a051e93 [formerly 9c3d79ad8e] [formerly 05c82feceb] [formerly 557a051e93 [formerly 9c3d79ad8e] [formerly 05c82feceb] [formerly 286d19c182 [formerly 05c82feceb [formerly a64228266a146ecb9a27381d9422c7b9bef56dac]]]]
Former-commit-id: 286d19c182
Former-commit-id: 568741e896 [formerly 3eeaf1db8b] [formerly cd0d917e43bfc2830ac6f82fe2721abac4a6bba7 [formerly 11ebd89a2c]]
Former-commit-id: 55f6ffbcbc585dcb6091ef06580e555c2142ee69 [formerly 7dc49f0a5d]
Former-commit-id: ac4e4b0658
 2013-06-10 11:46:13 -05:00
Dustin Johnson
54b1032d6f 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: 8cb1003277 [formerly 63f8ff76c3] [formerly 7c4a6261fc] [formerly 8cb1003277 [formerly 63f8ff76c3] [formerly 7c4a6261fc] [formerly c677ae32d7 [formerly 7c4a6261fc [formerly f7ed3ec86188635eb069878ac490af06ea98e4a2]]]]
Former-commit-id: c677ae32d7
Former-commit-id: ced2e3c267 [formerly ebf61027ff] [formerly 457cb107ce779c0a15b15e7282c6d84bed9e4756 [formerly 3ec421b779]]
Former-commit-id: 528fec8fc585cc8d5766aada5ced803619c4a3d4 [formerly b56641d370]
Former-commit-id: 0fcd66162e
 2013-06-10 11:37:37 -05:00
Nate Jensen
29664e7f4a 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: 3150572a9f [formerly d9c0800441] [formerly aced5003a4] [formerly 3150572a9f [formerly d9c0800441] [formerly aced5003a4] [formerly aeee0ffbbd [formerly aced5003a4 [formerly 417d339cc96fdafb6e55287494aaf6276fea01a6]]]]
Former-commit-id: aeee0ffbbd
Former-commit-id: f11448490a [formerly 7b7e96cedc] [formerly d0903d48b4f680fc42fb437036b35bd40ef9c0de [formerly 096e5fc2a6]]
Former-commit-id: 64a524065ce9ee0c9528b321b4d895342adb2ae6 [formerly 8c3d8a8197]
Former-commit-id: 8039da0546
 2013-06-10 11:04:21 -05:00