Commit graph

521 commits

Author SHA1 Message Date
Richard Peter
d536edf512 Issue #1257: Fix hdf5 purge
Change-Id: I90c54ad6494f7ff3bdf576f12098e8bafddfee95

Former-commit-id: 8e215f3397 [formerly da5a8fc3d9] [formerly 93697faeb1 [formerly 9b4e8adccfdc94e9f8cfb7705855b1376b892cdd]]
Former-commit-id: 93697faeb1
Former-commit-id: 8096b2f6fb
2012-11-02 11:06:27 -05:00
Ben Steffensmeier
11bd701e0a Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated.
Former-commit-id: 9b6833e497 [formerly a6ef4957d6] [formerly c1c55fa7aa [formerly 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]]
Former-commit-id: c1c55fa7aa
Former-commit-id: e4b81a6829
2012-11-02 10:37:42 -05:00
Ron Anderson
1734cf9e10 Merge "Issue #189 fix gfe retrieval of static data" into development
Former-commit-id: db17dcd548 [formerly a4e12e54a9] [formerly df05080714 [formerly a43043963e91e682ff78f370445bbb3e9185456d]]
Former-commit-id: df05080714
Former-commit-id: bfd5ddb5cb
2012-11-01 18:33:12 -05:00
Ben Steffensmeier
1348c2d512 Issue #189 fix gfe retrieval of static data
Former-commit-id: 2cb23de522 [formerly a663497d5b] [formerly 743b2b89e3 [formerly d08a637535547c0b037f3a50d86cc0c16ee0ad62]]
Former-commit-id: 743b2b89e3
Former-commit-id: 1c704a98f5
2012-11-01 18:30:05 -05:00
Ron Anderson
538bf101bc Merge "Issue #1257: Address peer review comment and cleanup bufrmos." into development
Former-commit-id: 86aa15c3d6 [formerly dfc022c59c] [formerly 6f4b4624d0 [formerly f11a03f18fa7104b7d920dba8108a582a5f5c967]]
Former-commit-id: 6f4b4624d0
Former-commit-id: ec5bbe2c7d
2012-11-01 18:08:47 -05:00
Nate Jensen
7fc91039ca Merge "Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum." into development
Former-commit-id: 18e03a8c57 [formerly 4fd1111b7b] [formerly ada2d72a9c [formerly 32c1912eef76a513b79e6419ec90c9141dd56479]]
Former-commit-id: ada2d72a9c
Former-commit-id: e7dfd27bd7
2012-11-01 17:29:57 -05:00
Richard Peter
ce0848f7e3 Merge "Issue #1302 Fixes for data delivery merge with development branch." into development
Former-commit-id: 0620aac119 [formerly 1b156820b6] [formerly 34aeb3015c [formerly 070f9a24c317292b8069848635045364993d66b7]]
Former-commit-id: 34aeb3015c
Former-commit-id: 0e46f72ccb
2012-11-01 17:00:34 -05:00
Max Schenkelberg
cbb716190a Issue #1307 Ensured wrap correcting occurs fully over -180-180 boundary at a minimum.
Change-Id: Iff5460327f799c69800672deb9481e4d65874a62

Former-commit-id: 47e684d0e8 [formerly cbfdfa4818] [formerly 9a7a8c0f9c [formerly 361a999d368e183513518e87bd350f3ff26ea8c0]]
Former-commit-id: 9a7a8c0f9c
Former-commit-id: 3eebdd0ded
2012-11-01 16:38:10 -05:00
Dustin Johnson
7b4967b5bb Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: 8d5c86f31e [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7f994472ae
2012-11-01 16:31:14 -05:00
Richard Peter
c0dbf3dd23 Issue #1257: Address peer review comment and cleanup bufrmos.
Change-Id: I37f4714a3b350924fd86c016dea7de8aff023def

Former-commit-id: 4910120217 [formerly ed20220923] [formerly 12323c1f4e [formerly 2fbcf67a963c3a174a5bd096e3dc11550cdff723]]
Former-commit-id: 12323c1f4e
Former-commit-id: dd20288dbf
2012-11-01 16:23:41 -05:00
Ben Steffensmeier
a48889cb30 Issue #189 fix grib purge issues caused by new purge keys
Former-commit-id: 93bdc9d407 [formerly a64a5ba50e] [formerly 4a3e2f4f49 [formerly 0e7829283db36cb8f2226d626b4e211efa0a3e1f]]
Former-commit-id: 4a3e2f4f49
Former-commit-id: 629f3e6650
2012-11-01 15:33:15 -05:00
Dustin Johnson
e7a0f96a9a Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Brad Gonzales
4ffe05d37e Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 449e4a2182 [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]
Former-commit-id: 20a5fe3577
Former-commit-id: 2ffcd5d684
2012-11-01 11:02:48 -05:00
Richard Peter
684046dd24 Merge "Issue #1257: Update PurgeRules to not be hard linked to path keys" into development
Former-commit-id: 01e0819e71 [formerly cc8433e76a] [formerly 98a014aedd [formerly 3eb29df71d71820b5e9f62932874e48ac9849f7d]]
Former-commit-id: 98a014aedd
Former-commit-id: 28d64a4263
2012-10-31 21:26:05 -05:00
Brad Gonzales
7807eca270 Issue #1274 Added Token control for java code and scripts started by RFC Crons.
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]
Former-commit-id: 44e9238fa9
Former-commit-id: 253c19ae05
2012-10-31 21:20:40 -05:00
Richard Peter
998278caf7 Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 5787d6278d [formerly 275398778f] [formerly 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 886375172b
Former-commit-id: bd1d87363a
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
1d94435220 merge branch Unifeid_Grid into developement
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
2012-10-30 12:24:54 -05:00
Bryan Kowal
6dae6015f9 Relocating projects due to the dependencies of com.raytheon.uf.edex.esb.camel
Former-commit-id: 943b2b0606 [formerly 37777f32ea] [formerly 10c8013cc3 [formerly e451f4b49d393b595ec0314970ffae8834a67425]]
Former-commit-id: 10c8013cc3
Former-commit-id: eed6cb8dad
2012-10-29 17:26:56 -05:00
Steve Harris
e211bfc043 Merge branch 'ss_builds' into development
Former-commit-id: 340ce53e22 [formerly fb46bb053d] [formerly afb534db67 [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: afb534db67
Former-commit-id: 048c0c88cd
2012-10-29 12:17:12 -05:00
Steve Harris
d8b6157aab 12.11.1-12 baseline
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
2012-10-29 12:15:56 -05:00
Brad Gonzales
781265a6a8 Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: 24fc32ee14
Former-commit-id: 5949c8b09c
2012-10-26 14:00:55 -05:00
Ben Steffensmeier
b6482dd206 Issue #189 update grid paths to resemble new grib paths
Former-commit-id: a08b468d48 [formerly 13cfc7c341] [formerly 7b03228e5c [formerly 7347ff2138ecbb3ac28a4f09a3e3a42d86f961d7]]
Former-commit-id: 7b03228e5c
Former-commit-id: 6586ebe4b7
2012-10-25 18:03:48 -05:00
Ron Anderson
6c4264972f Issue #1260 Fix data loading from NetCDF databases.
Change-Id: I2b4f0e8d99fa6021d187b756fc1c7abb792c7920

Former-commit-id: 1767d945fc [formerly 3874ac688b] [formerly ffc8f1567d [formerly 8c7eda363e3ad13853bed43d6f2d1eb5f61fab94]]
Former-commit-id: ffc8f1567d
Former-commit-id: 141c47d4e0
2012-10-25 16:59:25 -05:00
Ben Steffensmeier
45cc834fc3 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 7734a983f5 [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 54f414a7e0
2012-10-25 16:17:54 -05:00
Richard Peter
cbb6deec7a Merge "Issue #1279 add some comments to the grid wrap chaecking code." into development
Former-commit-id: 936aaae5a4 [formerly 0152b058e5] [formerly 6f441fc85e [formerly faf4edee48f169841eb5c1ab3b4ad4dc28f1f338]]
Former-commit-id: 6f441fc85e
Former-commit-id: 12f20ca32e
2012-10-25 12:44:10 -05:00
Ben Steffensmeier
9b8f2bcdbd merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
2012-10-25 12:22:11 -05:00
Nate Jensen
8ee3d9b304 Merge "Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run" into development
Former-commit-id: 409da6ad67 [formerly c70d361f2d] [formerly 73bc74d3d5 [formerly e032f584ec1caa3c9c973d554123678f828791a7]]
Former-commit-id: 73bc74d3d5
Former-commit-id: 29c8908ef7
2012-10-24 15:27:56 -05:00
Steve Harris
28dccc0278 Merge branch 'ss_builds' (12.11.1-10) into development
Former-commit-id: af3161539a [formerly e8e3ef530c] [formerly 1b2cb0db6c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]]
Former-commit-id: 1b2cb0db6c
Former-commit-id: 19dca3feca
2012-10-24 15:15:14 -05:00
Steve Harris
61224dec54 12.11.1-10 baseline
Former-commit-id: 63dddc5f5f [formerly e845c605e6] [formerly 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: 0ba69044a2
Former-commit-id: cc21977c35
2012-10-24 15:13:57 -05:00
Ron Anderson
a0402bb612 Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run
Change-Id: Ie9bfc66b5cba7639155944765701833ffa788660

Former-commit-id: bd5537e63d [formerly e226e41852] [formerly e0b809db9f [formerly f00655f5c5fb53af0682313e5054124a459b9649]]
Former-commit-id: e0b809db9f
Former-commit-id: 56a04517a8
2012-10-24 14:11:30 -05:00
Ben Steffensmeier
5c51ac0204 Issue #189 move stereographic grid coverage to common so ti can be stored in the db and parsed from a URI using the standard mechanisms.
Former-commit-id: 321988209e [formerly d349cb2dbf] [formerly 1377341720 [formerly 721d3ad5bb7a6007dafba91283814e83590c972a]]
Former-commit-id: 1377341720
Former-commit-id: 8fd7254b23
2012-10-24 11:45:49 -05:00
Steve Harris
ae9c6d58dd Merge branch 'ss_builds' (12.11.1-7) into development
Former-commit-id: d42e8373c6 [formerly b7406a55cc] [formerly 38b9c03f5e [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]
Former-commit-id: 38b9c03f5e
Former-commit-id: 9d038186d1
2012-10-23 16:43:09 -05:00
Steve Harris
efba080b9c 12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
2012-10-23 16:40:50 -05:00
Richard Peter
5dd0edf429 Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times.
Change-Id: I4fb15e8e712155f6099bd27880fbcbdf1948fc5f

Former-commit-id: f94ba53663 [formerly 2e025e09e2] [formerly 0d10680b28 [formerly 6077558dbd06f8fdb568f03c163352b080a9eb5e]]
Former-commit-id: 0d10680b28
Former-commit-id: 5bc200bb88
2012-10-23 13:52:25 -05:00
Ben Steffensmeier
91e5550892 Issue #1279 add some comments to the grid wrap chaecking code.
Former-commit-id: 58066e92dd [formerly a78273a16f] [formerly 632bd9e051 [formerly cd1af813dc843102784b82fe452e6150de021375]]
Former-commit-id: 632bd9e051
Former-commit-id: 9c9bb42707
2012-10-19 13:49:48 -05:00
David Gillingham
b6801be2ad Issue #1091: Fix generation of AreaDictionary and CityLocations.
Change-Id: I1cba6765ea91a90c49a2f3d47da63c7c8155689e

Former-commit-id: b6c00c9773 [formerly f84bbf5236] [formerly c1905cafa4 [formerly f8a6e05adbe36191ad45f2fe8991547d13b622c3]]
Former-commit-id: c1905cafa4
Former-commit-id: 221eaea664
2012-10-19 12:31:37 -05:00
Richard Peter
1b9d2bc7eb Merge "Issue #1279 change GridCoverage to choose more reasonable longitude ranges, use a 0 central meridian for huge grids to avoid normalization in geotools, fix intersections in GridGeometryProjections to work for unnormalized areas, fix data wrapper world wrap detection to work for any crs which doesn't normalize." into development
Former-commit-id: 0db5a1253b [formerly e8fd5ab21c] [formerly 4e02275260 [formerly 0a4ed6b4f65fd6906636d9857b350c8d4423e177]]
Former-commit-id: 4e02275260
Former-commit-id: daf1bbb33f
2012-10-18 18:13:11 -05:00
Ben Steffensmeier
3d0a05a19f Issue #189 fix bad merging of D2DGridDatabase
Former-commit-id: dcb1b45768 [formerly 58d11234e3] [formerly 0e22256a81 [formerly e945bf4020b869e56f2440a449d43acc8b0a9b16]]
Former-commit-id: 0e22256a81
Former-commit-id: 168987f453
2012-10-18 17:08:31 -05:00
Steve Harris
8486da2fd3 Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: 1807100932
Former-commit-id: 892e4df811
2012-10-18 16:01:05 -05:00
Steve Harris
8beb6fc0b8 12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
2012-10-18 15:53:01 -05:00
Steve Harris
85ad066b70 12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
2012-10-18 15:46:42 -05:00
Ben Steffensmeier
db2c9b41ec Issue #189 fix unified grid problems found during install/upgrade on testbed
Former-commit-id: f3331dc743 [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]
Former-commit-id: 90b815d412
Former-commit-id: ea2f15c0df
2012-10-18 13:27:37 -05:00
Ben Steffensmeier
6748ebb4ec Issue #1279 change GridCoverage to choose more reasonable longitude ranges, use a 0 central meridian for huge grids to avoid normalization in geotools, fix intersections in GridGeometryProjections to work for unnormalized areas, fix data wrapper world wrap detection to work for any crs which doesn't normalize.
Former-commit-id: aac3144f51 [formerly 2f7a04f8ef] [formerly e3cc30e8a8 [formerly 908b9ec666e5dfb50ef4fe3899bf2288bf4cecc5]]
Former-commit-id: e3cc30e8a8
Former-commit-id: a67d5e2b6c
2012-10-18 12:39:01 -05:00
Richard Peter
cfcef0a7b1 Issue #1257: Revert radar file name changes. Change grib path to just be by master level name.
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26

Former-commit-id: 36c53a2cc8 [formerly 85eb3b7598] [formerly 72acca2422 [formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]
Former-commit-id: 72acca2422
Former-commit-id: 8cb830c1c6
2012-10-17 13:22:00 -05:00
Steve Harris
d0e91329b4 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
2012-10-16 15:48:14 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Steve Harris
24681cb342 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: a2d9207ebc [formerly e38fc1e5c9] [formerly 615042859f [formerly 16bfc9f7e68cc45b44867fc41cf62cd12f323390]]
Former-commit-id: 615042859f
Former-commit-id: 5384c8fa71
2012-10-16 09:21:22 -05:00
Steve Harris
f0121b6fa8 Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: 8b7665418a [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 63da835aef
2012-10-16 09:20:37 -05:00
Richard Peter
19797b9064 Issue #1257: Update grib path keys to include hdf5 layout. Turn on TcpNoDelay
Change-Id: I296d0d4b1c204a325c499b3aeb1f9d7f16de0c9b

Former-commit-id: e32d77c87f [formerly 68ac1abca4] [formerly c5e3b54caa [formerly 29b54f75013685f1bcd9ed3129c9ba3ddf629395]]
Former-commit-id: c5e3b54caa
Former-commit-id: a80db469b2
2012-10-15 20:15:39 -05:00
Ron Anderson
5de80732ea Issue #1260 Fix non-overlapping grids
Change-Id: I27bc2a2d4db33abb81c1733046e8eef5729a4384

Former-commit-id: 25ddccf57a [formerly b31e52cbd0] [formerly bce2713c31 [formerly 6b05875f6bd24d027bb5817eee9b412bb83f9b3a]]
Former-commit-id: bce2713c31
Former-commit-id: 87e518de29
2012-10-15 18:24:07 -05:00