Commit graph

2217 commits

Author SHA1 Message Date
Bryan Kowal
a9dd3bd622 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462 [formerly ac0ef6e7b9] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -05:00
Bryan Kowal
acfe04a074 Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 0479eb0cc1 [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]]
Former-commit-id: 3baebb684b
Former-commit-id: a71e14882e [formerly 63f7abc798] [formerly 5b50182da9b1d1bc0dc78315de3a77804b604894 [formerly 374bd51fb0]]
Former-commit-id: 90f1be518ad1b2127ca77166e14502c623f1acb5 [formerly 5eae24b949]
Former-commit-id: ddf4c04e59
2013-03-20 16:53:18 -05:00
Steve Harris
616cddf60c Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
4a8a63253a Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: 9f4b102dc7 [formerly 43341e7ad3] [formerly c6db3ce43b] [formerly 9f4b102dc7 [formerly 43341e7ad3] [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 8732e302f7 [formerly ec27a16858] [formerly 1d0bcac64713d401322363f780281a663de8cdab [formerly 2e10fd83f6]]
Former-commit-id: 0ea78b9e51d9a9b783beb7ba00499485ffe88ecd [formerly 924e27f51f]
Former-commit-id: a25ccc8c5c
2013-03-20 14:10:52 -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
Richard Peter
4e87891a64 Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 8805c42d14 [formerly 53d8ef7ed1] [formerly 377061882220d7ca7878a9f6095ebe2307dd7ab4 [formerly 3bad342dca]]
Former-commit-id: a0d88bffdd2faa06fdd928fd3e8866b77e34ba8c [formerly ff1b1598e6]
Former-commit-id: 403879b5cf
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
ce8d190a49 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 82499f839d [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]]
Former-commit-id: 82499f839d
Former-commit-id: d67d0ec674 [formerly 1b363a547c] [formerly 048a16f2b52da3414fc5d576059d5543b43f69f9 [formerly 3e2a41d1d2]]
Former-commit-id: ce0f7dafa19ff3c41040e73684d15a758d74d293 [formerly 57d19b0d66]
Former-commit-id: a01b552f89
2013-03-20 13:26:33 -05:00
Dustin Johnson
0a4c9a3d33 Merge "Issue #1796 updated some headers, general cleanup" into development
Former-commit-id: 28cd17759e [formerly d584a7fb38] [formerly e5bcff21cb] [formerly 28cd17759e [formerly d584a7fb38] [formerly e5bcff21cb] [formerly e7bfdebd41 [formerly e5bcff21cb [formerly 327283da3d779b976d1fdc118c74f00047d79062]]]]
Former-commit-id: e7bfdebd41
Former-commit-id: 3e3717c6db [formerly 45ea31f4a6] [formerly d9ebf39289a57c3f87f863b6f513154ab23c1b26 [formerly e3f3ce2773]]
Former-commit-id: a1957d227976dc603301d94993a39f0b3d6dd558 [formerly 4481b1e830]
Former-commit-id: f1337b3561
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
a503ef0938 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]]
Former-commit-id: ed544fc17c
Former-commit-id: 4b0e7e77d3 [formerly b201d9dee2] [formerly b850b70906a6763277fa77ce5a2f3e638139e35a [formerly 646b61f653]]
Former-commit-id: 054b143635c076ebd5e79c9bbfe409552cff76ec [formerly 498d153e40]
Former-commit-id: 4cde2bd826
2013-03-20 13:05:54 -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
Dave Hladky
6e7e9a653b Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: c0250bb4e0 [formerly 958b897c21] [formerly 5362771743] [formerly c0250bb4e0 [formerly 958b897c21] [formerly 5362771743] [formerly 38494cec16 [formerly 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]]]
Former-commit-id: 38494cec16
Former-commit-id: 1dcf1cd260 [formerly 69c6fdd887] [formerly e6da29d245a87c028da77d809a837030c9a35209 [formerly 8a46d43216]]
Former-commit-id: 4c1441e90920503c6c0241e46989c32fc0db41cd [formerly 7046f31351]
Former-commit-id: 03219ce56a
2013-03-20 12:17:08 -05:00
Richard Peter
b0a6fa85f6 Merge "Issue #1807 Change DbQueryHandler to include order by informaton in the query." into development
Former-commit-id: d58ec843d1 [formerly 0bb02996e4] [formerly 15c2a0af44] [formerly d58ec843d1 [formerly 0bb02996e4] [formerly 15c2a0af44] [formerly 4ffeeded42 [formerly 15c2a0af44 [formerly 69adcef125ce7e9902eb2b0fb42e3bf517e87264]]]]
Former-commit-id: 4ffeeded42
Former-commit-id: 41e27fd6d9 [formerly 09cca538be] [formerly e246903c03c2577824612835b45c8236cc227791 [formerly a96ae13475]]
Former-commit-id: 7132855c37ad5379e7f623eaaccb2474abf20fdf [formerly b07fe81ec7]
Former-commit-id: 5e9a5412f2
2013-03-20 10:01:51 -05:00
Greg Armendariz
f9520f6208 Merge "Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base" into development
Former-commit-id: 197c99e347 [formerly ffb307c7b3] [formerly 65e9035d82] [formerly 197c99e347 [formerly ffb307c7b3] [formerly 65e9035d82] [formerly 82af4a9f5c [formerly 65e9035d82 [formerly 5c1da36c644f12bda81686365de72785b1eb8bc6]]]]
Former-commit-id: 82af4a9f5c
Former-commit-id: 5b580bb3f7 [formerly fec8dd5bc2] [formerly f16dcc8ce9210fc318eaa90b49b893aba5247cf5 [formerly 7943b05ea6]]
Former-commit-id: d037f0c243f056e816cae5de2b768d99268f456b [formerly f524f52f0b]
Former-commit-id: 4dbe6c28f6
2013-03-20 09:55:49 -05:00
Dave Hladky
7eace92a56 Issue #1796 Fixed the test
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: b6e4db814b [formerly a624cc49c7] [formerly d9078b438a] [formerly b6e4db814b [formerly a624cc49c7] [formerly d9078b438a] [formerly b4eb7b17a9 [formerly d9078b438a [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]]]]
Former-commit-id: b4eb7b17a9
Former-commit-id: b2c04da284 [formerly de43e4fc66] [formerly 0fc093c7a65abc7af6435a8d3fe4259fde06de7a [formerly b43c821a33]]
Former-commit-id: fa89636f145954a39a241e373429def479cfba9d [formerly 87728badf5]
Former-commit-id: 9391c2fb54
2013-03-19 17:22:00 -05:00
Roger Ferrel
93a2c0586d Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 8a26c52506 [formerly 3acca75f82] [formerly b32ac22ef8] [formerly 8a26c52506 [formerly 3acca75f82] [formerly b32ac22ef8] [formerly 4f889b6999 [formerly b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]]]
Former-commit-id: 4f889b6999
Former-commit-id: 21b81bfb04 [formerly aba0067eed] [formerly 25ccf4e495f06112c67009f618f3d499e05f536b [formerly a838aa2d74]]
Former-commit-id: 6daeacba61a8733baac24c881acb2072aabc760a [formerly 71834c493c]
Former-commit-id: 5907205c3c
2013-03-19 16:24:22 -05:00
David Gillingham
39e84043cc Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434.
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: 3ad6035189 [formerly ab6944650a] [formerly 843f474af8] [formerly 3ad6035189 [formerly ab6944650a] [formerly 843f474af8] [formerly 8ea6d7227b [formerly 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: 173ceacc0d [formerly a8ed519915] [formerly 15ae015d4e8d837d34c8ef660c79da6b2290ef2d [formerly 5f8c8a80f8]]
Former-commit-id: 31167e00f2dfb2abafb3357856550ddd88213c13 [formerly 2e57b9f262]
Former-commit-id: 3a70a07654
2013-03-19 16:06:25 -05:00
Richard Peter
0af3490317 Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1
Former-commit-id: 7d0568efed [formerly 26aa93a6f4] [formerly 6046872ab5] [formerly 7d0568efed [formerly 26aa93a6f4] [formerly 6046872ab5] [formerly a421cfe73e [formerly 6046872ab5 [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]]]
Former-commit-id: a421cfe73e
Former-commit-id: 95ff197f23 [formerly 845a04fd54] [formerly 191d5afdb7ad56b19e338caa367d0135343f7c82 [formerly cf395cfb39]]
Former-commit-id: 03b815c44cd66662bb1107569d01d2113f5ea38b [formerly 6852771ec6]
Former-commit-id: 3c37f0f171
2013-03-19 15:34:36 -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
Ben Steffensmeier
16a27f55fe Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: f828c49328 [formerly 337e450f94] [formerly 7b83f6bdfa] [formerly f828c49328 [formerly 337e450f94] [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 0c1fe3d11f [formerly 489a180622] [formerly 6c97a1e140c30a4f6f7ccde142ee0a06b355c751 [formerly ff0e5696e8]]
Former-commit-id: d1ae7c5b3a95206a0ebd1156d304e26ebd7b4e2e [formerly 044eeebe97]
Former-commit-id: 87b21c053d
2013-03-19 14:11:36 -05:00
Bryan Kowal
bb8b9b69da Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
Former-commit-id: fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly fa0f882050 [formerly 448518579a] [formerly cbe9b30266] [formerly 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]]]
Former-commit-id: 74b4bb0891
Former-commit-id: c7403dffe2 [formerly 6b8538f7f5] [formerly 3ba7c5a5f785e32de3db6c45c7f138af8ec9aa79 [formerly 7628860bfe]]
Former-commit-id: d011da6f3e84b53833888641711e30f0f78af275 [formerly cb78a6af53]
Former-commit-id: b05b21401f
2013-03-19 13:27:38 -05:00
Richard Peter
2340c05137 Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]]
Former-commit-id: 3a92747518
Former-commit-id: 26e2d62e99 [formerly eebd930070] [formerly 7532765e0a4316f68ebd2971adf3566334c5a08c [formerly c955b3b640]]
Former-commit-id: 1c0c5a83932631df486bbeffa3d0850087fe50b7 [formerly 1bf2c48011]
Former-commit-id: 5f09e66d4e
2013-03-19 13:24:28 -05:00
Dustin Johnson
fec2db4a51 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly 8363eba409 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]]
Former-commit-id: 8363eba409
Former-commit-id: 2896b034a7 [formerly 3c8e14edc7] [formerly bf91004f3796358ffc74a0f0628be3abb249249e [formerly e0b6e6187e]]
Former-commit-id: 29c699a80c9e5e2a63781b6b624594e5c7c717ce [formerly 889953c712]
Former-commit-id: 17fe9aee59
2013-03-19 13:09:48 -05:00
Dave Hladky
07b8f90014 Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: e0d90738ad [formerly 618f737fab] [formerly 71c2eba9b6609730384eaad2e834b311fb5eefb6 [formerly f0244f54a4]]
Former-commit-id: 7fb36c3c0bac714c21eadf0ce71c66d6f3e066cc [formerly 64f8c46e64]
Former-commit-id: af0898807b
2013-03-19 13:08:14 -05:00
Mike Duff
4943f6f2d8 Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]]
Former-commit-id: 058064ce0d
Former-commit-id: e205993cba [formerly 3e1b4ba54b] [formerly f1784284db525c1ae3413ff04b935577969880b1 [formerly 7e66c8e46d]]
Former-commit-id: bda98ae3e9d9fb64c0dfddbd5de2cf785f5bcbb7 [formerly 144223ed9b]
Former-commit-id: c22d1962de
2013-03-19 10:10:01 -05:00
Bryan Kowal
162b0b1d40 Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 72bdbbb7f6 [formerly 6106369d4c] [formerly f325038538] [formerly 72bdbbb7f6 [formerly 6106369d4c] [formerly f325038538] [formerly f0eb7d3285 [formerly f325038538 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]]]
Former-commit-id: f0eb7d3285
Former-commit-id: dc2dc31f7e [formerly fd68cd7a04] [formerly 8cd05408fb45131c5569dd6fe66f49be87474a71 [formerly 54113e9b29]]
Former-commit-id: fb3115642a2b5d3b64623250b34661ca2c9d12dd [formerly 959e8b717f]
Former-commit-id: 50e884aab0
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
02f7d8e3ab Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]]
Former-commit-id: 86dffab17d
Former-commit-id: 89ec3e9ce7 [formerly 160b6a7040] [formerly 3a15f3575a0d243b59b8d728d08f437b3b036330 [formerly dfe8de96f2]]
Former-commit-id: 008cac470dc86afbdf01474e5615c762263e40d6 [formerly e176478c7a]
Former-commit-id: f2466d6066
2013-03-18 17:16:44 -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
Steve Harris
c1bb0c2749 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
2013-03-18 16:43:22 -05:00
Bryan Kowal
33b56397a3 Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]]
Former-commit-id: 7fd035256d
Former-commit-id: 9d8b41c8c7 [formerly 3e8d5449fc] [formerly 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec]]
Former-commit-id: 91ab574f18aa46466914129e5425a627996ad4d1 [formerly 56f2b3f0c2]
Former-commit-id: 81ebbd5a5b
2013-03-18 16:36:33 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
2013-03-18 15:43:32 -05:00
Dustin Johnson
f10956964f Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
Former-commit-id: 1fb27b205a [formerly 36cc80590c] [formerly b7a5311dde] [formerly 1fb27b205a [formerly 36cc80590c] [formerly b7a5311dde] [formerly 7fe3c254fd [formerly b7a5311dde [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]]]
Former-commit-id: 7fe3c254fd
Former-commit-id: b4c83331db [formerly 7afc4a083b] [formerly 9bd17f5ccc6a8fce1d466bbffddc89e3dcf31e69 [formerly 55095f0041]]
Former-commit-id: f827fdbd3bb674e1c0ea6231337a8aa2c31c8ae0 [formerly 805c491c04]
Former-commit-id: 225c664129
2013-03-15 16:14:17 -05:00
Nate Jensen
7a734502b3 Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 3b331be9f6 [formerly 30ddd909bf] [formerly e65267d5f3] [formerly 3b331be9f6 [formerly 30ddd909bf] [formerly e65267d5f3] [formerly 235952a115 [formerly e65267d5f3 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]]]
Former-commit-id: 235952a115
Former-commit-id: 568f988ef9 [formerly 4ea1508baa] [formerly 322940c9800f51152a2cd23a4f14a10dee589147 [formerly dad08657aa]]
Former-commit-id: 3e00bfb092b747d3a0792b45f6f63ff35470bf34 [formerly d622b8c12e]
Former-commit-id: 499209754a
2013-03-15 16:10:11 -05:00
Nate Jensen
a8ef2c34ea Merge "Issue #1638 Fixed Velocity templates for windows build" into development
Former-commit-id: ba81904ec9 [formerly cab8a23ebd] [formerly f3fbae64b3] [formerly ba81904ec9 [formerly cab8a23ebd] [formerly f3fbae64b3] [formerly d14dfe215c [formerly f3fbae64b3 [formerly 640eb368b7026651de34db2154fb955930d65040]]]]
Former-commit-id: d14dfe215c
Former-commit-id: 5e8498d2db [formerly 74df582fac] [formerly a0d830224d381066b98e46fa05f68e7a3f50d428 [formerly 0191c8bff0]]
Former-commit-id: f90587e4b50237f26b84468be8608b7fc5fd3d00 [formerly 7cae3e296e]
Former-commit-id: 9bd1f201e3
2013-03-15 13:49:56 -05:00
Max Schenkelberg
11d5047ab8 Issue #1638 Fixed Velocity templates for windows build
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a

Former-commit-id: 93c416e914 [formerly 07a6fd494d] [formerly 2c3ee8d35d] [formerly 93c416e914 [formerly 07a6fd494d] [formerly 2c3ee8d35d] [formerly beb801517e [formerly 2c3ee8d35d [formerly da9666be71adf84f394f255406a66afa6c3f28be]]]]
Former-commit-id: beb801517e
Former-commit-id: f294d9aa8a [formerly c3232f2581] [formerly 1728f5f643c879365568ae1dc33fadaaaaa596c0 [formerly 582de5717c]]
Former-commit-id: 674a9be4dc2da4c1c061afd222692adb68d3eb79 [formerly af973ff5a6]
Former-commit-id: 286fc9a6ec
2013-03-15 12:16:59 -05:00
Dustin Johnson
090d1fe72a Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 65f87506b7 [formerly fff7e7983f] [formerly ecb0d2c826] [formerly 43a9f608ef [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]]
Former-commit-id: 43a9f608ef
Former-commit-id: d8880e29b6 [formerly 7adf94e9f6] [formerly 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4]]
Former-commit-id: b520365a67b13e0f4c76818883c281e85883a6aa [formerly a08059dd34]
Former-commit-id: 83034c3f43
2013-03-15 11:51:58 -05:00
Roger Ferrel
2c0583b153 Issue #1790 changes for non-blocking StationLegendDlg.
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d

Former-commit-id: 24868f7ed5 [formerly dadf8a9e4c] [formerly 0089e24579] [formerly 24868f7ed5 [formerly dadf8a9e4c] [formerly 0089e24579] [formerly b01bb935c3 [formerly 0089e24579 [formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]]]
Former-commit-id: b01bb935c3
Former-commit-id: dfbd824211 [formerly 382bb7c16b] [formerly b11e4827ee12c6a982cc5d1a4fc3306a804a2efe [formerly 08990f97f8]]
Former-commit-id: 145489302fb20481be73e31f21174de8ac97472a [formerly 85f58a9e52]
Former-commit-id: ccc37c2b46
2013-03-15 10:26:30 -05:00
Roger Ferrel
c47f5629ee Issue #1790 changes for non-blocking StaffGageDlg.
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092

Former-commit-id: 32ba1814f5 [formerly fcbda4e0de] [formerly 4230e1a9b8] [formerly 32ba1814f5 [formerly fcbda4e0de] [formerly 4230e1a9b8] [formerly 17a41bf063 [formerly 4230e1a9b8 [formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]]]
Former-commit-id: 17a41bf063
Former-commit-id: 3693e9dfeb [formerly e88e52e406] [formerly 183b27d474d2061440f4cf3fd19e327acad33523 [formerly 006062502e]]
Former-commit-id: ac30a4dd7448f55c70b4f50a34021c66bc9b9343 [formerly 47dac77059]
Former-commit-id: 1d2db27655
2013-03-15 09:00:00 -05:00
Roger Ferrel
08a01e5332 Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c

Former-commit-id: b6a18b2d96 [formerly 76507ebcc5] [formerly 015fc9b8f8] [formerly b6a18b2d96 [formerly 76507ebcc5] [formerly 015fc9b8f8] [formerly 34ea46099e [formerly 015fc9b8f8 [formerly ad772f0a3eb944117614f029a2c3659e5c774599]]]]
Former-commit-id: 34ea46099e
Former-commit-id: 269127174c [formerly 60e7b4be62] [formerly 08234f862f3dd3950c644ed09abf867def44c3c1 [formerly 7eae71038f]]
Former-commit-id: 732bd192282170bc35d3bb0a55c5ead58745fd44 [formerly 824b98527c]
Former-commit-id: 5f0b405866
2013-03-15 08:17:50 -05:00
Lee Venable
8f1459c938 Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id: a1ea0d020c [formerly 57d7559797] [formerly 456fd056f4] [formerly a1ea0d020c [formerly 57d7559797] [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 456fd056f4 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]]
Former-commit-id: 93e99b64a6
Former-commit-id: a0298d4199 [formerly ba4673b99a] [formerly db8baa1a7f8057094afd75e9aeaf6f46c5dd6820 [formerly 3a1dc41b50]]
Former-commit-id: ff4673c26bdfff1eb17037d089b4ee483eed5b65 [formerly cac220879d]
Former-commit-id: 0449fe84a6
2013-03-14 17:19:38 -05:00
Dave Hladky
5346a31c5b Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: f7ccf2e765 [formerly a1c4148918] [formerly 9b495681ec] [formerly f7ccf2e765 [formerly a1c4148918] [formerly 9b495681ec] [formerly c57d5574ef [formerly 9b495681ec [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]]
Former-commit-id: c57d5574ef
Former-commit-id: 19117f1851 [formerly 3ba473351b] [formerly a513fe6a10c22c44c2f7c793a12913414d1f9b36 [formerly db207a732c]]
Former-commit-id: fce61df1efff7105f52295e290f5cb6c3b74985f [formerly 5bf3f5f89f]
Former-commit-id: 871c4718ab
2013-03-14 15:59:39 -05:00
Roger Ferrel
69ecbd4f6f Issue #1790 Changes for non-blocking TabularDisplayDlg.
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d

Former-commit-id: a19092d5c2 [formerly 818b856f97] [formerly c43b7777e1] [formerly a19092d5c2 [formerly 818b856f97] [formerly c43b7777e1] [formerly ebe57f1cbc [formerly c43b7777e1 [formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: cec76b08bf [formerly 46428ed944] [formerly a4411b7fa0720ced4d24e4567246f0516fe411f4 [formerly ff944b4768]]
Former-commit-id: b1a23287bd793544df9c34418c58d4b414b4f70a [formerly 1cada5eec3]
Former-commit-id: d8000c1526
2013-03-14 15:38:08 -05:00
Ron Anderson
0b86852e99 Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
Former-commit-id: 1864ba24e5 [formerly 60af3ad63e] [formerly 16d93dab84] [formerly 1864ba24e5 [formerly 60af3ad63e] [formerly 16d93dab84] [formerly fc749ff3eb [formerly 16d93dab84 [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]]
Former-commit-id: fc749ff3eb
Former-commit-id: c6598f3869 [formerly 97a38fd3c5] [formerly cdf68ae1b9e656919543c5343fa44ed63c766ab2 [formerly 7087e1ebe7]]
Former-commit-id: f83c5f140768ed2dd5877ad5d7e3a9d44e146b8a [formerly e6ba869694]
Former-commit-id: bd0618d53f
2013-03-14 14:55:31 -05:00
Lee Venable
5b6fd448b7 Merge "Issue #1790 Changes for non-blocking PointDataControlDlg dialog." into development
Former-commit-id: f5f0b284d7 [formerly 966497c2a9] [formerly 03f81c4f49] [formerly f5f0b284d7 [formerly 966497c2a9] [formerly 03f81c4f49] [formerly 7c9ce3dfb9 [formerly 03f81c4f49 [formerly 27b25500f8346d73b0a12ca8597e7b0a6282ad0c]]]]
Former-commit-id: 7c9ce3dfb9
Former-commit-id: c0d412397c [formerly 9125432046] [formerly 546fc34b7d27513704c590425ed3208030340083 [formerly 21c657ce8a]]
Former-commit-id: 0dfb17af7f7775aab85c96870445f57484417355 [formerly ecc0ee05a5]
Former-commit-id: 093fcee46f
2013-03-14 13:44:15 -05:00
Ben Steffensmeier
ad0078d2e9 Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 3f0030521d [formerly 7335a2336e] [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 55d80d760f [formerly e5b9e0ca46] [formerly 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee]]
Former-commit-id: 4fe3069a05c6bc069a0cd306a5134a66e8ba310c [formerly 153a7dbd7d]
Former-commit-id: 41e3ac3923
2013-03-14 13:26:08 -05:00
Greg Armendariz
166fcb78a9 Removed merge code from the source code
Former-commit-id: 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 05d7892c3b [formerly 2bb407ea8b] [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]]]
Former-commit-id: 2f9136843b
Former-commit-id: ef59159bb9 [formerly b79ecc28e3] [formerly 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7]]
Former-commit-id: 0fe252f9bf5b69a3471bb0b71197934ca6b0d155 [formerly 8ea2042456]
Former-commit-id: cfc53af85e
2013-03-14 11:15:08 -05:00
Bryan Kowal
2b8d1731af Issue #1663 - updated libpq.so for the native hydro applications
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*

Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1

Former-commit-id: 4f62288851 [formerly 675e97b219] [formerly 379e19e8a4] [formerly 4f62288851 [formerly 675e97b219] [formerly 379e19e8a4] [formerly 28eb671ed0 [formerly 379e19e8a4 [formerly 2aed340ede1daa86607d7854cf48bba23dffaa61]]]]
Former-commit-id: 28eb671ed0
Former-commit-id: 9eddd7eca0 [formerly 6d0eb4f360] [formerly 4e43458f686c895864df23ff40ffdfa68150f68d [formerly bfae338f1c]]
Former-commit-id: b9a9088c8775111742dafda15bc4f749ddf8e850 [formerly 2a6e9e5069]
Former-commit-id: 6448897ea8
2013-03-14 10:40:18 -05:00
Bryan Kowal
ff3b0b0645 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f3835d85a0 [formerly b0d31729e8] [formerly 0d33c86abe] [formerly f3835d85a0 [formerly b0d31729e8] [formerly 0d33c86abe] [formerly 8c0ee91c5b [formerly 0d33c86abe [formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: 21e0725cdc [formerly ebaea489bc] [formerly 59d9eafff7a1f7424f1ff366a16e0923edbc8e89 [formerly e83033b314]]
Former-commit-id: 09091a45851f5017a3373897df85539afa1505f0 [formerly bc0c82dad8]
Former-commit-id: a897e41993
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
d74ac3e7f7 Issue #1777 fix subgridding range problems
Former-commit-id: 81f4bb55fc [formerly 5e81f2154d] [formerly 5bd20414eb] [formerly 81f4bb55fc [formerly 5e81f2154d] [formerly 5bd20414eb] [formerly 0daa5817d0 [formerly 5bd20414eb [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]]
Former-commit-id: 0daa5817d0
Former-commit-id: 964fc25677 [formerly d22cbc7ce9] [formerly 3bef982b8d104b6bd033477b34c99e0da65ce9ad [formerly a6140145a4]]
Former-commit-id: cf39e0dc082aed64da92558a4c063831fc9ebdb9 [formerly bc92e1be6b]
Former-commit-id: 24b97d7625
2013-03-14 09:56:00 -05:00