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

124 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
mjames-upc
ba2bf10d1a mute hydroapps / anything related to shef endpoints 
Former-commit-id: 0068ebfbe4
 2015-10-05 14:12:22 -06:00
Fay.Liang
3a354bf7fb Merge tag 'OB_14.4.1-47' into int_15.1.1 
14.4.1-47

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
 2015-05-29 15:42:40 -04:00
Mark Peters
07b1e1ae47 Omaha #4525 Incorrect Unit Conversion for MSLP 
Change-Id: Ice48df4e0bf67e2b75f8804707a99e9feab2c53b

Former-commit-id: 8f01720f50 [formerly 750f5efb93 [formerly fbe232d6c4177a9db7afafa5aa4f9031dc14d49b]]
Former-commit-id: 750f5efb93
Former-commit-id: 31b6dad2cc
 2015-05-26 14:15:01 -05:00
Mark Peters
750f5efb93 Omaha #4525 Incorrect Unit Conversion for MSLP 
Change-Id: Ice48df4e0bf67e2b75f8804707a99e9feab2c53b

Former-commit-id: fbe232d6c4177a9db7afafa5aa4f9031dc14d49b
 2015-05-26 14:15:01 -05:00
Nathan Bowler
c75c052122 Omaha #3897 Better handle invalid Section 2 data. 
Change-Id: I50ce32553027d90e677f001efd6bc27fd6e9a091

Former-commit-id: c5ff89d216e9df47330efb6560d47406ac3601fe
 2015-01-12 11:27:55 -05:00
Nate Jensen
ec28d2f1a0 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
 2014-12-03 15:47:10 -06:00
Nate Jensen
effb6c68bf Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]
Former-commit-id: ec28d2f1a0
Former-commit-id: 6c1391e938
 2014-12-03 15:47:10 -06:00
Mark Peters
087dabe3bb Omaha #3629 Fix null pointer exceptions from matchElement() replacements 
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: e0330ab61d027ee3b8512230b64000bb7f3d71f1
 2014-10-09 11:17:53 -05:00
Mark Peters
99b25a3031 Omaha #3629 Fix null pointer exceptions from matchElement() replacements 
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: 63069f5adc [formerly 087dabe3bb [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]
Former-commit-id: 087dabe3bb
Former-commit-id: 7f3eb45256
 2014-10-09 11:17:53 -05:00
Mark Peters
6d59eb314d Omaha #3629 Replacing matchElement() 
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e

Former-commit-id: 6f898cc3d7f30651846847c5645ec26ac448ec83
 2014-09-30 11:39:40 -05:00
Mark Peters
17f328433b Omaha #3629 Replacing matchElement() 
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e

Former-commit-id: 776420f2d9 [formerly 6d59eb314d [formerly 6f898cc3d7f30651846847c5645ec26ac448ec83]]
Former-commit-id: 6d59eb314d
Former-commit-id: 6a0703ad98
 2014-09-30 11:39:40 -05:00
Mark Peters
549cf2a2b1 Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins 
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4

Former-commit-id: e196f02cf7533498280b252e9c345f9b3c4a3629
 2014-09-26 14:50:03 -05:00
Mark Peters
f920c9ab1f Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins 
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4

Former-commit-id: 0c657c2a49 [formerly 549cf2a2b1 [formerly e196f02cf7533498280b252e9c345f9b3c4a3629]]
Former-commit-id: 549cf2a2b1
Former-commit-id: 5fb76a1532
 2014-09-26 14:50:03 -05:00
Mark Peters
bd5996a599 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 1350720111ceeb83893c5c0129eb41d662d16211
 2014-09-23 12:12:22 -05:00
Mark Peters
bfd99d02af Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I65fee949e595b76be5c998dcd550b287928a1d65

Former-commit-id: 9176913542 [formerly bd5996a599 [formerly 1350720111ceeb83893c5c0129eb41d662d16211]]
Former-commit-id: bd5996a599
Former-commit-id: 27f5ae502d
 2014-09-23 12:12:22 -05:00
Mark Peters
3f1e21107b Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc
 2014-09-19 14:02:54 -05:00
Mark Peters
d065b2610f Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: c5da5ccb9b [formerly 3f1e21107b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]
Former-commit-id: 3f1e21107b
Former-commit-id: 68044d2dd7
 2014-09-19 14:02:54 -05:00
Brian Clements
aa991c9223 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location 
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: cdb0a72fcb2345564f2b944fdecd7869fd498767
 2014-07-24 13:45:58 -05:00
Brian Clements
26ade7cae8 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location 
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: 74a6c3dd20 [formerly aa991c9223 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]
Former-commit-id: aa991c9223
Former-commit-id: a7d17bd490
 2014-07-24 13:45:58 -05:00
Nate Jensen
9219e1e254 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: c91a7d4084be3753ad51afd11b46b621af0bc878
 2014-06-23 14:13:19 -05:00
Nate Jensen
0556146804 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 53633a6ed4 [formerly 9219e1e254 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]
Former-commit-id: 9219e1e254
Former-commit-id: 6077794cc9
 2014-06-23 14:13:19 -05:00
Brian Clements
2b1c7eaa37 Omaha #2536 moved WMO Header into new common plugin 
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: c2e57be98850284cb01ba921b9dddcadbe66b311
 2014-05-14 13:45:09 -05:00
Brian Clements
95a233a3a0 Omaha #2536 moved WMO Header into new common plugin 
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 6bd43f79ff [formerly 2b1c7eaa37 [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]
Former-commit-id: 2b1c7eaa37
Former-commit-id: 437d9bb781
 2014-05-14 13:45:09 -05:00
Brian Clements
4e976fafed Issue #2906 removed wmo header, timeObs and timeNominal from sfcobs HDF5 
times still in DB, accesible from point data view
BUFR obs decoder populates WMO header for consistency


Former-commit-id: c5400855f507015ab0a10cb0ce17ff7ba92a6220
 2014-04-22 09:10:45 -05:00
Brian Clements
1a87b6f537 Issue #2906 removed wmo header, timeObs and timeNominal from sfcobs HDF5 
times still in DB, accesible from point data view
BUFR obs decoder populates WMO header for consistency


Former-commit-id: 61832eac86 [formerly 4e976fafed [formerly c5400855f507015ab0a10cb0ce17ff7ba92a6220]]
Former-commit-id: 4e976fafed
Former-commit-id: 62e57a4d82
 2014-04-22 09:10:45 -05:00
Richard Peter
dbba727f3d Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 6e015b3f61c20635077d6e8271e9b763e5a32fe1
 2014-04-14 13:10:11 -05:00
Richard Peter
909571ebca Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]
Former-commit-id: dbba727f3d
Former-commit-id: e4be1f24e7
 2014-04-14 13:10:11 -05:00
Richard Peter
3575d6586f Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: bd13bc332bcdd87723bec8669885f4594ad483b9
 2014-04-11 16:23:09 -05:00
Richard Peter
9b12d9ddaf Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 3575d6586f
Former-commit-id: cd51f3fa87
 2014-04-11 16:23:09 -05:00
Brian Clements
663337e661 Issue #2906 added synop bufr obs decoder 
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features


Former-commit-id: b35756921a0ba5ff240b80f92322da90345c6eaf
 2014-04-10 12:08:27 -05:00
Brian Clements
421153a246 Issue #2906 added synop bufr obs decoder 
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features


Former-commit-id: 972d18cd3b [formerly 663337e661 [formerly b35756921a0ba5ff240b80f92322da90345c6eaf]]
Former-commit-id: 663337e661
Former-commit-id: 1e2ad93e65
 2014-04-10 12:08:27 -05:00
Steve Harris
873bd6b889 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
 2014-03-07 15:43:40 -06:00
Steve Harris
865fef97b1 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: 873bd6b889
Former-commit-id: 51b755a476
 2014-03-07 15:43:40 -06:00
Mike Duff
944fca16b8 Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 2f1aa28a4389c15e20724ebc8d79501c338f565e
 2014-03-07 12:47:46 -06:00
Mike Duff
63937fa7cd Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]
Former-commit-id: 944fca16b8
Former-commit-id: 7fd9cc40c7
 2014-03-07 12:47:46 -06:00
Steve Harris
069093884f 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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
 2014-03-06 08:39:43 -06:00
Steve Harris
52226061e9 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: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
 2014-03-06 08:39:43 -06:00
Brian.Dyke
cfa4997978 OB_14.1.1-19 baseline 
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
 2014-02-21 06:50:59 -05:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline 
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
 2014-02-21 06:50:59 -05:00
Nate Jensen
c47f6546dd Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development 
Former-commit-id: 648e5bff2e85d00cf5bcee923f2a137aa76117fc
 2013-12-05 12:59:58 -06:00
Nate Jensen
65e20edacf Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development 
Former-commit-id: ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]
Former-commit-id: c47f6546dd
Former-commit-id: b16c88133b
 2013-12-05 12:59:58 -06:00
Richard Peter
0c4ae068ad 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: b09f1559254f06a82afa91f0cc14c8150f88ce64
 2013-12-05 12:12:27 -06:00
Richard Peter
ba577ff354 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: a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: 0c4ae068ad
Former-commit-id: b3b23647b4
 2013-12-05 12:12:27 -06:00
Ben Steffensmeier
f682e66e9b Issue #2537 Use PointDataAccessFactory for multiple point data types. 
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 91a3fdbc8bd98603a1cda218729d5542dac809ef
 2013-12-05 10:54:28 -06:00
Ben Steffensmeier
318e48c945 Issue #2537 Use PointDataAccessFactory for multiple point data types. 
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]
Former-commit-id: f682e66e9b
Former-commit-id: 7c2a4ef72c
 2013-12-05 10:54:28 -06:00
Steve Harris
ca0f65bd9a 14.1.1-10 baseline 
Former-commit-id: 6970b56e5970df5cd40ddfc41470324d652f0afd
 2013-11-19 16:40:25 -05:00
Steve Harris
69cef95302 14.1.1-10 baseline 
Former-commit-id: 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: ca0f65bd9a
Former-commit-id: 8251107646
 2013-11-19 16:40:25 -05:00
Steve Harris
3328e2dd1d 14.1.1-7 baseline 
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
 2013-11-06 14:16:14 -05:00
Steve Harris
21ff310620 14.1.1-7 baseline 
Former-commit-id: 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
 2013-11-06 14:16:14 -05:00