Commit graph

546 commits

Author SHA1 Message Date
Dustin Johnson
7d0e4a6e75 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: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
2012-11-01 13:36:06 -05:00
Ben Steffensmeier
c789e1fd94 merge branch Unifeid_Grid into developement
Former-commit-id: b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: d0a2ed32b5
Former-commit-id: 272e057bf1
2012-10-30 12:24:54 -05:00
Steve Harris
eb8a05a414 Merge branch 'ss_builds' into development
Former-commit-id: afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: fb46bb053d
Former-commit-id: 340ce53e22
2012-10-29 12:17:12 -05:00
Steve Harris
7f6baf2e24 12.11.1-12 baseline
Former-commit-id: 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 8682e4f6ca
Former-commit-id: 565756567f
2012-10-29 12:15:56 -05:00
Ron Anderson
a982185c63 Issue #1260 Fix data loading from NetCDF databases.
Change-Id: I2b4f0e8d99fa6021d187b756fc1c7abb792c7920

Former-commit-id: ffc8f1567d [formerly 3874ac688b [formerly 8c7eda363e3ad13853bed43d6f2d1eb5f61fab94]]
Former-commit-id: 3874ac688b
Former-commit-id: 1767d945fc
2012-10-25 16:59:25 -05:00
Ben Steffensmeier
12eb4c8246 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 6f2c1ede9e [formerly b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: b7d61e7543
Former-commit-id: 7734a983f5
2012-10-25 16:17:54 -05:00
Ben Steffensmeier
1a215cb42a merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: 6a9ff88b33
Former-commit-id: 4f503d3a1e
2012-10-25 12:22:11 -05:00
Steve Harris
7779b584c0 12.11.1-10 baseline
Former-commit-id: 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: e845c605e6
Former-commit-id: 63dddc5f5f
2012-10-24 15:13:57 -05:00
Ron Anderson
74d0bba75e 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: e0b809db9f [formerly e226e41852 [formerly f00655f5c5fb53af0682313e5054124a459b9649]]
Former-commit-id: e226e41852
Former-commit-id: bd5537e63d
2012-10-24 14:11:30 -05:00
Richard Peter
f829123ab3 Issue #1257: Fix GFE HDF5 Retrievel to time correlate results to requested times.
Change-Id: I4fb15e8e712155f6099bd27880fbcbdf1948fc5f

Former-commit-id: 0d10680b28 [formerly 2e025e09e2 [formerly 6077558dbd06f8fdb568f03c163352b080a9eb5e]]
Former-commit-id: 2e025e09e2
Former-commit-id: f94ba53663
2012-10-23 13:52:25 -05:00
David Gillingham
4729d5a6c8 Issue #1091: Fix generation of AreaDictionary and CityLocations.
Change-Id: I1cba6765ea91a90c49a2f3d47da63c7c8155689e

Former-commit-id: c1905cafa4 [formerly f84bbf5236 [formerly f8a6e05adbe36191ad45f2fe8991547d13b622c3]]
Former-commit-id: f84bbf5236
Former-commit-id: b6c00c9773
2012-10-19 12:31:37 -05:00
Ben Steffensmeier
957ec4b8d5 Issue #189 fix bad merging of D2DGridDatabase
Former-commit-id: 0e22256a81 [formerly 58d11234e3 [formerly e945bf4020b869e56f2440a449d43acc8b0a9b16]]
Former-commit-id: 58d11234e3
Former-commit-id: dcb1b45768
2012-10-18 17:08:31 -05:00
Steve Harris
58cd1e90f8 12.11.1-6 baseline
Former-commit-id: 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: fba4a443a0
Former-commit-id: 30c786a885
2012-10-18 15:53:01 -05:00
Steve Harris
bb8fe6e556 12.11.1-5 baseline
Former-commit-id: a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: 03f3f3c36a
Former-commit-id: 362d6ffaca
2012-10-18 15:46:42 -05:00
Steve Harris
6e44abdba1 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
2012-10-16 13:27:07 -05:00
Ben Steffensmeier
a67ce9586c Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 8b7256b1ae
Former-commit-id: de3769129c
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
4d8e42f460 Issue #189 updates to GFE from code review
Former-commit-id: 8afcbace62 [formerly 3ff63d4ad3 [formerly a64647ddbd4f062602f092b828c080af2550f31a]]
Former-commit-id: 3ff63d4ad3
Former-commit-id: bf80df2927
2012-10-10 16:32:34 -05:00
Steve Harris
04da0dbf50 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: c12ee14e66
Former-commit-id: 75901860c2
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
ddd259ffad Issue #189 switch gfe to grid.
Former-commit-id: 4ab3357b8d [formerly 5cf650b61a [formerly 7c029a18dcfd9f955fd3a9a2351d5dfef6d18912]]
Former-commit-id: 5cf650b61a
Former-commit-id: ddbd05372b
2012-10-01 16:08:43 -05:00
Steven Harris
ffe3641057 12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
69283c27a8 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]
Former-commit-id: 4be2aa88c7
Former-commit-id: 5f787b6a6b
2012-09-20 12:24:35 -05:00
Ben Steffensmeier
9eecab65c0 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: bd8eb7fc15
Former-commit-id: 4fe2127bfb
2012-09-18 15:19:05 -05:00
Steve Harris
ddc923e3e0 12.10.1-4 baseline
Former-commit-id: 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 791ef6cedf
Former-commit-id: 9cd1f3ec0f
2012-09-13 12:33:36 -05:00
Steve Harris
0d8d18d7e2 12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
2012-09-13 12:08:11 -05:00
Steve Harris
0403e7d0a9 12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
2012-09-11 16:00:38 -05:00
Steve Harris
bb190a66a1 12.10.1-2 baseline
Former-commit-id: a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: 250f0ccac9
Former-commit-id: dde1f4c54d
2012-09-11 15:50:57 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
2012-08-21 15:27:03 -05:00
Steve Harris
71b024e3a1 12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
2012-08-15 15:19:10 -05:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
2012-08-15 13:59:00 -05:00
Steve Harris
79d4d91e46 12.8.1-10 baseline
Former-commit-id: ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: b5e8fee24d
Former-commit-id: 6244359a80
2012-08-06 09:34:26 -05:00
Steve Harris
2e804fc8c4 12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
2012-08-01 10:45:37 -05:00
Steve Harris
b242dd98d6 12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
2012-07-19 16:20:40 -05:00
Steve Harris
32fdf6ed3b 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
2012-07-10 07:53:49 -05:00
Steve Harris
2f10c7a1e4 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
2012-06-08 13:39:48 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Steve Harris
760ead2047 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
b05701d2d7 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: 70357d90bc
Former-commit-id: 0665862abe
2012-03-29 10:03:05 -05:00
David Gillingham
d3d2046df0 Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: 3cfa029f4b [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]]
Former-commit-id: 9a75c87829
Former-commit-id: efc9e9000b
2012-03-06 16:24:58 -06:00
David Gillingham
b8acb1912c Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 1d69867594 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]
Former-commit-id: ff231f33f4
Former-commit-id: 8d2ea4cfba
2012-03-05 16:49:23 -06:00
Steve Harris
5a96582f16 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Steve Harris
829d2791e9 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
d129eab241 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
2012-02-20 12:43:38 -06:00
Steve Harris
7b4b066a2b Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: 93f6535bd8
Former-commit-id: c209d6de36
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
700cb47baa Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a

Former-commit-id: 0d75fbf942 [formerly b3463d27fc [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]
Former-commit-id: b3463d27fc
Former-commit-id: 3c673896a0
2012-01-30 16:39:57 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00