Commit graph

426 commits

Author SHA1 Message Date
Ben Steffensmeier
d3043fda5a Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]
Former-commit-id: 8650074737
2014-03-07 18:15:32 -06:00
Steve Harris
708485427e Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]
Former-commit-id: f60aba35d6
2014-03-07 15:43:40 -06:00
Steve Harris
f992a6b046 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]
Former-commit-id: 40b543f9a8
2014-03-07 15:16:18 -06:00
Steve Harris
96658d8ce0 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: 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: ffcc34f8d4
2014-03-06 08:39:43 -06:00
Max Schenkelberg
6658c94e6e 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: dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]
Former-commit-id: 1854bbb477
2014-03-03 17:59:48 -06:00
Nate Jensen
92527f1ffa Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]
Former-commit-id: 908d308825
2014-02-28 09:53:27 -06:00
Richard Peter
f13c86bc3e 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: 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 1c150e6e8b
2014-02-27 15:18:26 -06:00
Ben Steffensmeier
804cbb48e6 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]
Former-commit-id: 07bc9f075f
2014-02-26 14:45:19 -06:00
Brian.Dyke
227131e5f1 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]
Former-commit-id: 1a8a0b703e
2014-02-24 14:51:00 -05:00
Ron Anderson
3b2ea2d6ac 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: 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]
Former-commit-id: 2db5f26840
2014-02-24 13:46:48 -06:00
Brian.Dyke
64044e7ce5 OB_14.1.1-19 baseline
Former-commit-id: cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: 10b723647b
2014-02-21 06:50:59 -05:00
Ron Anderson
8a41723ba6 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]
Former-commit-id: 419e9d0b8d
2014-02-19 11:55:11 -06:00
Ron Anderson
d4ba9eba94 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: 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 14a082a4e9
2014-02-18 10:45:20 -06:00
Steve Harris
e115197bb7 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]
Former-commit-id: 9fcc5ad930
2014-02-17 08:54:34 -06:00
Ron Anderson
2d7c87ac84 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]
Former-commit-id: 2f067699f2
2014-02-13 10:10:34 -06:00
Brian.Dyke
c5857c30f2 14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]
Former-commit-id: 1d6a9456b7
2014-02-11 15:52:50 -05:00
David Gillingham
94ec272ab2 Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]
Former-commit-id: e8ffc73893
2014-02-07 09:51:42 -06:00
Brian.Dyke
f088dab5ef Issue #83
Former-commit-id: 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]
Former-commit-id: fb15dd5dfb
2014-02-04 16:32:42 -05:00
Brian.Dyke
947ec5fd96 14.1.1-17 baseline
Former-commit-id: 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]
Former-commit-id: 23280af290
2014-02-04 12:33:46 -05:00
Ben Steffensmeier
76e76198d6 Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963

Former-commit-id: 1897336455 [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]
Former-commit-id: 7b1245b0cf
2014-01-23 18:43:14 -06:00
Ben Steffensmeier
85eb694b23 Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74

Former-commit-id: 81b38e2ddf [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]
Former-commit-id: 4f9e60c658
2014-01-22 16:53:04 -06:00
Steve Harris
252c7ee40a 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: 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]
Former-commit-id: 69dc3d835b
2014-01-21 12:36:54 -06:00
Steve Harris
0ba307d616 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: 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]
Former-commit-id: 9371eeeee0
2014-01-20 10:17:44 -06:00
gerritcm
644da23327 14.1.1-16 baseline
Former-commit-id: 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]
Former-commit-id: b84f7d4203
2014-01-16 16:43:05 -05:00
Brian Clements
e420ae009d 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: f9a8b68da5 [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]
Former-commit-id: 0076ec9aaf
2014-01-14 17:05:28 -06:00
Ron Anderson
624375267e 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: ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: 62c445d872
2014-01-13 17:45:20 -06:00
Steve Harris
43cc501e0d 14.1.1-14 baseline
Former-commit-id: f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: 9ef1c841b9
2014-01-06 14:02:30 -05:00
David Gillingham
8f3802eecf Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: 136265183d [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]
Former-commit-id: 09bfdc49e3
2013-12-18 16:18:47 -06:00
Richard Peter
62fa535744 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: 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]
Former-commit-id: 2e7fd9ddba
2013-12-17 21:04:53 -06:00
Steve Harris
61d4adc979 14.1.1-13 baseline
Former-commit-id: c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]
Former-commit-id: b0b55a676b
2013-12-12 16:59:57 -05:00
Richard Peter
da027298d4 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: 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: a0b6ea8bb2
2013-12-05 12:12:27 -06:00
Ron Anderson
103fed386f Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]
Former-commit-id: 20eeb2796e
2013-12-04 17:10:48 -06:00
Steve Harris
14421048af 14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]
Former-commit-id: a3ec45a99f
2013-12-04 16:47:59 -05:00
Ron Anderson
75d2dd7a29 Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]
Former-commit-id: c9cb2bdb6a
2013-12-04 15:29:28 -06:00
Ron Anderson
f6b9e69738 Issue #2488 Change to use DejaVu fonts
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224

Former-commit-id: d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]
Former-commit-id: 633137d8c0
2013-11-20 13:43:25 -06:00
Ron Anderson
6442e2e933 Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development
Former-commit-id: a5bc64473a [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]
Former-commit-id: 42229b8eee
2013-11-07 14:38:39 -06:00
Richard Peter
520dd57f02 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: fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]
Former-commit-id: 93c776022a
2013-11-07 14:25:45 -06:00
David Gillingham
d0b188d577 Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]
Former-commit-id: 0e74638eb2
2013-11-07 11:36:49 -06:00
Steve Harris
26da1ce793 14.1.1-6 baseline
Former-commit-id: 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]
Former-commit-id: 6067af4252
2013-11-06 14:08:33 -05:00
Ron Anderson
deb89a88f5 Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]
Former-commit-id: cc991ed528
2013-11-01 11:07:39 -05:00
David Gillingham
3bac577a31 Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af

Former-commit-id: 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]
Former-commit-id: c4f5cc53bb
2013-10-31 14:07:20 -05:00
Ron Anderson
eef9d2dfb0 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]
Former-commit-id: 42e924e021
2013-10-31 14:04:55 -05:00
David Gillingham
996817f124 Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]
Former-commit-id: b7b29a1fdb
2013-10-30 11:34:46 -05:00
Nate Jensen
f2751f017e 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: f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]
Former-commit-id: 6880a18f1a
2013-10-29 14:33:53 -05:00
Ron Anderson
dda2eb89c1 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]
Former-commit-id: f2cfc0c686
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
1f33a1997e Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]
Former-commit-id: 44a6f05986
2013-10-28 10:14:08 -05:00
Steve Harris
7590a56e0e 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: 99e3707c5b
2013-10-28 10:55:16 -04:00
Steve Harris
4a6a209aea 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 5739b4f832
2013-10-28 10:46:02 -04:00
Ben Steffensmeier
fbdcadb456 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]
Former-commit-id: 4c03fc93f1
2013-10-25 15:50:10 -05:00
Steve Harris
b70ec5732d 13.5.2-12 baseline
Former-commit-id: a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]
Former-commit-id: bcb531e671
2013-10-25 09:59:15 -04:00