Ben Steffensmeier
|
ab72e2c8e6
|
Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c
Former-commit-id: fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 4a92feba62 [formerly 794d41a8f7] [formerly 77c845fde31945d0fea149cfd3d18a9817475c57 [formerly 15ddd45995]]
Former-commit-id: e71b70c57b2cf0a04f5c2c818aac7f6dfc5e753c [formerly 16c0832b4f]
Former-commit-id: 7a597c7223
|
2013-08-06 18:27:21 -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 |
|
Nate Jensen
|
88f9c45cf0
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
de2f575c94
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
|
2013-05-23 11:20:40 -05:00 |
|
Steve Harris
|
f2a81e18e9
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
|
2013-03-27 22:16:15 -05:00 |
|
Steve Harris
|
43942dad11
|
13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
81a8604bfe
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]]
Former-commit-id: a23cecdb26
Former-commit-id: 5be2208aaf [formerly 02105701a0] [formerly 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]]
Former-commit-id: 1234c0205c914f2be5f36fcfc47900e46f0e87db [formerly e6ab1deba2]
Former-commit-id: feba54ac83
|
2013-03-26 10:12:34 -05:00 |
|
Steve Harris
|
fd735b8ff8
|
13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
0929de5965
|
Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 96ba08115a [formerly d00dc0d174] [formerly 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]]
Former-commit-id: b81ab6022fde7cae7ff4586a3467e9e741b445f7 [formerly 6d4512fa3a]
Former-commit-id: 352c267fc9
|
2013-03-20 13:45:11 -05:00 |
|
Dave Hladky
|
c290073444
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: a7462a5125 [formerly 01c6ff12a0] [formerly d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]]
Former-commit-id: 230698475e3964c6e08fa5002b60e4edb7657b26 [formerly 8299b2872a]
Former-commit-id: 1aef08f449
|
2013-03-20 12:41:33 -05:00 |
|
Steve Harris
|
5411621351
|
13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3c492badbc [formerly 7e96d841d9] [formerly 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]]
Former-commit-id: e83406d2275f6117c72406e8ae7298dd5995a819 [formerly 65f522fc87]
Former-commit-id: 37beeaab69
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
4c10c7a5be
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
|
2013-03-18 16:52:00 -05:00 |
|
Dave Hladky
|
b111edeb8b
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2 [formerly 9e97fc9efe] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8]
Former-commit-id: b85e19282b
|
2013-03-13 13:56:33 -05:00 |
|
Steve Harris
|
352658125b
|
13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
|
2013-03-13 09:50:28 -05:00 |
|
Max Schenkelberg
|
9b89da117c
|
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]]
Former-commit-id: e0ba97d547
Former-commit-id: 2aef608c3f [formerly 5617dfaa67] [formerly c22d83de78a7efcb6e70f98b882e95d6a6e64ae6 [formerly 6b1426dd34]]
Former-commit-id: 3e1df0aa7db6eca9855386f240baade979e24e3a [formerly 453ac44050]
Former-commit-id: 1073393fbb
|
2013-02-27 11:50:38 -06:00 |
|
Steve Harris
|
34d0f59592
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
fac2d20002
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
|
2013-02-20 16:19:40 -06:00 |
|
Ron Anderson
|
46248d1c10
|
Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 12f2ac0171 [formerly d69d628450] [formerly 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]]
Former-commit-id: af2b3c67dc766d6b95ad299a4853ebd80437f7e4 [formerly 45627edcc7]
Former-commit-id: 80df624bb3
|
2013-02-15 09:03:41 -06:00 |
|
Steve Harris
|
b92dfd1b62
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
|
2013-01-23 11:18:44 -05:00 |
|
Bryan Kowal
|
d9c01fe8a0
|
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 49b121ed3a [formerly 38480e46b1] [formerly 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]]
Former-commit-id: 64fa164a62368e1ef375932fe20cd65b2d0ba6fb [formerly 290167ac16]
Former-commit-id: 89cc2bdf57
|
2013-01-15 14:56:01 -06:00 |
|
Ben Steffensmeier
|
6899085fb5
|
Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly 474a8dcf65 [formerly b312bce5ad] [formerly 521924904a] [formerly fe0a8b60c6 [formerly 521924904a [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: 2a86c290c7 [formerly ca4e39df79] [formerly 4c95d1279cc2d643fa5e3100b8491e31f64b88bb [formerly c6032b1950]]
Former-commit-id: f316ad8c2fe2fba44aa3af884a66b4942b9301ca [formerly 7d19f5e38f]
Former-commit-id: f62c7fde9b
|
2012-12-19 11:26:40 -06:00 |
|