Ben Steffensmeier
|
ad4ce67e85
|
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: c0b478eb97 [formerly 9122b6da99] [formerly c0b478eb97 [formerly 9122b6da99] [formerly 8650074737 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]
Former-commit-id: 8650074737
Former-commit-id: 5e4c35e93f [formerly d3043fda5a]
Former-commit-id: a1ac082c94
|
2014-03-07 18:15:32 -06:00 |
|
Steve Harris
|
ed7921643c
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: c24108e75b [formerly 708485427e]
Former-commit-id: 61af779433
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
e29b96b6bd
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
|
2014-03-07 15:16:18 -06:00 |
|
Steve Harris
|
2db5dcf6eb
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
|
2014-03-06 08:39:43 -06:00 |
|
Max Schenkelberg
|
83103254e7
|
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 6edfb8965f [formerly dbcbd1b560] [formerly 6edfb8965f [formerly dbcbd1b560] [formerly 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]
Former-commit-id: 1854bbb477
Former-commit-id: bff80c3ee9 [formerly 6658c94e6e]
Former-commit-id: 96bdc00728
|
2014-03-03 17:59:48 -06:00 |
|
Nate Jensen
|
4e66e5bcc5
|
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: b40f5477b4 [formerly 63244f840f] [formerly b40f5477b4 [formerly 63244f840f] [formerly 908d308825 [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: fb68c4c07f [formerly 92527f1ffa]
Former-commit-id: f0bb217f04
|
2014-02-28 09:53:27 -06:00 |
|
Richard Peter
|
5fab51d41b
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
|
2014-02-27 15:18:26 -06:00 |
|
Ben Steffensmeier
|
d899433612
|
Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: 2425b9665c [formerly d8bfdd1a7e] [formerly 2425b9665c [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 0fde78c595 [formerly 804cbb48e6]
Former-commit-id: 6843396c78
|
2014-02-26 14:45:19 -06:00 |
|
Brian.Dyke
|
0bcf7c89b8
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
3c673caec2
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
|
2014-02-24 13:46:48 -06:00 |
|
Brian.Dyke
|
f86f9f8918
|
OB_14.1.1-19 baseline
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
e91fd1d683
|
Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 663cb4cb62 [formerly 5258aecf45] [formerly 663cb4cb62 [formerly 5258aecf45] [formerly 419e9d0b8d [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 908e43039e [formerly 8a41723ba6]
Former-commit-id: b0a4b63689
|
2014-02-19 11:55:11 -06:00 |
|
Ron Anderson
|
8a7af092f2
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
|
2014-02-18 10:45:20 -06:00 |
|
Steve Harris
|
7805eac857
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: d0352c69d4 [formerly 267cc881a4] [formerly d0352c69d4 [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 146412a8bd [formerly e115197bb7]
Former-commit-id: 28aa3dd195
|
2014-02-17 08:54:34 -06:00 |
|
Ron Anderson
|
7447a71c10
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 3e78908bb5 [formerly fcf45916f4] [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: d9b82b4ebe [formerly 2d7c87ac84]
Former-commit-id: d298aabe40
|
2014-02-13 10:10:34 -06:00 |
|
Brian.Dyke
|
f47dd3ef59
|
14.1.1-18 baseline
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
|
2014-02-11 15:52:50 -05:00 |
|
David Gillingham
|
e20060f1da
|
Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: b12e29dd7c [formerly 03d36b8309] [formerly b12e29dd7c [formerly 03d36b8309] [formerly e8ffc73893 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]
Former-commit-id: e8ffc73893
Former-commit-id: ad8c40032f [formerly 94ec272ab2]
Former-commit-id: 06d68cc0be
|
2014-02-07 09:51:42 -06:00 |
|
Brian.Dyke
|
42e17bf5f3
|
Issue #83
Former-commit-id: f2e56b268c [formerly 484119f6b0] [formerly f2e56b268c [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 3c160bb05e [formerly f088dab5ef]
Former-commit-id: 870b355263
|
2014-02-04 16:32:42 -05:00 |
|
Brian.Dyke
|
b8f7317b9d
|
14.1.1-17 baseline
Former-commit-id: f3d34b0c38 [formerly 180d1356cd] [formerly f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: f1cc9d6ee2 [formerly 947ec5fd96]
Former-commit-id: 948fffa361
|
2014-02-04 12:33:46 -05:00 |
|
Ben Steffensmeier
|
4b8491c85b
|
Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963
Former-commit-id: 48bb8a59a1 [formerly 1897336455] [formerly 48bb8a59a1 [formerly 1897336455] [formerly 7b1245b0cf [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]]]
Former-commit-id: 7b1245b0cf
Former-commit-id: c9a89659c3 [formerly 76e76198d6]
Former-commit-id: d1781763ab
|
2014-01-23 18:43:14 -06:00 |
|
Ben Steffensmeier
|
c20b169454
|
Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74
Former-commit-id: 3196471d18 [formerly 81b38e2ddf] [formerly 3196471d18 [formerly 81b38e2ddf] [formerly 4f9e60c658 [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]]]
Former-commit-id: 4f9e60c658
Former-commit-id: 831d904de2 [formerly 85eb694b23]
Former-commit-id: 5dfa58dc98
|
2014-01-22 16:53:04 -06:00 |
|
Steve Harris
|
69626ab704
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: a465718a0d [formerly 24ab7cff49] [formerly a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: b62efa9387 [formerly 252c7ee40a]
Former-commit-id: 2a967fc9b5
|
2014-01-21 12:36:54 -06:00 |
|
Steve Harris
|
ccd2f6cdaa
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 5fcccbff1b [formerly 454d557884] [formerly 5fcccbff1b [formerly 454d557884] [formerly 9371eeeee0 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 7ea285c48b [formerly 0ba307d616]
Former-commit-id: b5f7f35ccb
|
2014-01-20 10:17:44 -06:00 |
|
gerritcm
|
6bf3189db9
|
14.1.1-16 baseline
Former-commit-id: 9e935404d8 [formerly 6be938e6eb] [formerly 9e935404d8 [formerly 6be938e6eb] [formerly b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: b72cd19055 [formerly 644da23327]
Former-commit-id: 5f79da2501
|
2014-01-16 16:43:05 -05:00 |
|
Brian Clements
|
db92ac5b84
|
Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files
Former-commit-id: c63c8e2fc6 [formerly f9a8b68da5] [formerly c63c8e2fc6 [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: 496d15d77f [formerly e420ae009d]
Former-commit-id: dd0c5d9b57
|
2014-01-14 17:05:28 -06:00 |
|
Ron Anderson
|
77c132f706
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
5862555160
|
14.1.1-14 baseline
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
|
2014-01-06 14:02:30 -05:00 |
|
David Gillingham
|
203e25ab3c
|
Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: c48c0523ff [formerly 136265183d] [formerly c48c0523ff [formerly 136265183d] [formerly 09bfdc49e3 [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: 6e642b81fe [formerly 8f3802eecf]
Former-commit-id: 24c8fc930e
|
2013-12-18 16:18:47 -06:00 |
|
Richard Peter
|
1c743d4d44
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
|
2013-12-17 21:04:53 -06:00 |
|
Steve Harris
|
800136d61b
|
14.1.1-13 baseline
Former-commit-id: 85eebac7e2 [formerly c88b10039a] [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: 5368f23247 [formerly 61d4adc979]
Former-commit-id: ff08301890
|
2013-12-12 16:59:57 -05:00 |
|
Richard Peter
|
ae6e34be4b
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
|
2013-12-05 12:12:27 -06:00 |
|
Ron Anderson
|
bbd7ea36a1
|
Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: 497236ca74 [formerly b5906249cc] [formerly 497236ca74 [formerly b5906249cc] [formerly 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: e30d6041ee [formerly 103fed386f]
Former-commit-id: 89e87a1683
|
2013-12-04 17:10:48 -06:00 |
|
Steve Harris
|
60f062ea59
|
14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
|
2013-12-04 16:47:59 -05:00 |
|
Ron Anderson
|
95d6bebb13
|
Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2
Former-commit-id: 54219aa03d [formerly 7459d65134] [formerly 54219aa03d [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: a99197c5c2 [formerly 75d2dd7a29]
Former-commit-id: 1988e86bbd
|
2013-12-04 15:29:28 -06:00 |
|
Ron Anderson
|
e2f54e78d0
|
Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224
Former-commit-id: 7a3c7d530e [formerly d72119409e] [formerly 7a3c7d530e [formerly d72119409e] [formerly 633137d8c0 [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]]
Former-commit-id: 633137d8c0
Former-commit-id: 769df41dea [formerly f6b9e69738]
Former-commit-id: a731f80011
|
2013-11-20 13:43:25 -06:00 |
|
Ron Anderson
|
cc95af7fa8
|
Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: 0bfd9a1c98 [formerly a5bc64473a] [formerly 0bfd9a1c98 [formerly a5bc64473a] [formerly 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]
Former-commit-id: 42229b8eee
Former-commit-id: 9d56a36dbe [formerly 6442e2e933]
Former-commit-id: 298f4abbae
|
2013-11-07 14:38:39 -06:00 |
|
Richard Peter
|
94e0faa6c6
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
|
2013-11-07 14:25:45 -06:00 |
|
David Gillingham
|
be9ed341f5
|
Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67
Former-commit-id: 3df38a8d41 [formerly e1df69e312] [formerly 3df38a8d41 [formerly e1df69e312] [formerly 0e74638eb2 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 1ed80f471c [formerly d0b188d577]
Former-commit-id: 50f9ad420b
|
2013-11-07 11:36:49 -06:00 |
|
Steve Harris
|
0aa90a7855
|
14.1.1-6 baseline
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
|
2013-11-06 14:08:33 -05:00 |
|
Ron Anderson
|
638b57e188
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: a15c620fc8 [formerly 9e9dd04bfd] [formerly a15c620fc8 [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]
Former-commit-id: cc991ed528
Former-commit-id: f453d92818 [formerly deb89a88f5]
Former-commit-id: 84adff8e96
|
2013-11-01 11:07:39 -05:00 |
|
David Gillingham
|
4862c1d171
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: f404f1560c [formerly 6e1cca2966] [formerly f404f1560c [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 3776f258a3 [formerly 3bac577a31]
Former-commit-id: 5df42898ad
|
2013-10-31 14:07:20 -05:00 |
|
Ron Anderson
|
49ea9c0444
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: b61ccc1609 [formerly 38e33092a2] [formerly b61ccc1609 [formerly 38e33092a2] [formerly 42e924e021 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: 2f23072e41 [formerly eef9d2dfb0]
Former-commit-id: e3a0440825
|
2013-10-31 14:04:55 -05:00 |
|
David Gillingham
|
75acd532a1
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: c58160c9a9 [formerly 297fd6c3d4] [formerly c58160c9a9 [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 68b0b2e3db [formerly 996817f124]
Former-commit-id: eef2c93d6c
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
f2184b9379
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: 554a9cddf3 [formerly f3143ba7b4] [formerly 554a9cddf3 [formerly f3143ba7b4] [formerly 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: 19043faeaa [formerly f2751f017e]
Former-commit-id: e8c199f108
|
2013-10-29 14:33:53 -05:00 |
|
Ron Anderson
|
643624f1a9
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: dd3ef2844c [formerly fa5b6dce02] [formerly dd3ef2844c [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 3575496955 [formerly dda2eb89c1]
Former-commit-id: 1daa0f8649
|
2013-10-28 12:59:44 -05:00 |
|
Ben Steffensmeier
|
47d3fb8249
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 0c66089721 [formerly 27165cea30] [formerly 0c66089721 [formerly 27165cea30] [formerly 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]
Former-commit-id: 44a6f05986
Former-commit-id: 0e3cf8b47f [formerly 1f33a1997e]
Former-commit-id: 0c3bb6ef3e
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
da4589ec2b
|
14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
472c0a1a5e
|
14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
|
2013-10-28 10:46:02 -04:00 |
|
Ben Steffensmeier
|
ddd58aa99c
|
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 3b68ce8d72 [formerly 2a83b45f93] [formerly 3b68ce8d72 [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 4eea088717 [formerly fbdcadb456]
Former-commit-id: 5645da0b45
|
2013-10-25 15:50:10 -05:00 |
|
Steve Harris
|
f97c128cc8
|
13.5.2-12 baseline
Former-commit-id: e2b9baf2ed [formerly a532896473] [formerly e2b9baf2ed [formerly a532896473] [formerly bcb531e671 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 15d9848170 [formerly b70ec5732d]
Former-commit-id: 248e79aa2f
|
2013-10-25 09:59:15 -04:00 |
|