Commit graph

287 commits

Author SHA1 Message Date
Steve Harris
14f23d4227 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]
Former-commit-id: a16ac7819c
2013-02-06 11:08:53 -06:00
Steve Harris
a6b3cde1ff 13.2.1-5 baseline
Former-commit-id: 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]
Former-commit-id: 232734091d
2013-02-06 11:02:32 -06:00
Bryan Kowal
81da18f851 Issue #1577 - deploy-install and AWIPS II ant task updates
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring

Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f

Former-commit-id: 5fea87f1dd [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]
Former-commit-id: 7815b651bb
2013-02-05 13:25:15 -06:00
Steve Harris
ae2859d5a2 13.2.1-4 baseline
Former-commit-id: 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]
Former-commit-id: 8f2e7d4437
2013-01-31 11:40:31 -06:00
Steve Harris
0006a2b6cb 13.2.1-2 baseline
Former-commit-id: c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]
Former-commit-id: 7a7f7c45ca
2013-01-25 09:07:12 -06:00
Steve Harris
33bc5fd816 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00
Steve Harris
48d1aa7732 13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
2013-01-23 11:13:03 -05:00
Steve Harris
683193255d 13.1.2-10 baseline
Former-commit-id: 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]
Former-commit-id: 68dde17de2
2013-01-18 10:37:25 -05:00
Bryan Kowal
86bd4e3b3f Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
Former-commit-id: 5d769d8a8d [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]
Former-commit-id: a2f745ec54
2013-01-17 09:59:11 -06:00
Bryan Kowal
55550007cb Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
Former-commit-id: 8c118e791b [formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]
Former-commit-id: 2ed28bed93
2013-01-15 18:46:46 -06:00
Bryan Kowal
90b9cf9804 Issue #1469 - updated for compatibility with recent changes to Pypies.
Former-commit-id: d710e987e4 [formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]
Former-commit-id: 02c16b6f3d
2013-01-15 16:09:42 -06:00
Bryan Kowal
fba28ea69b Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]
Former-commit-id: e2a12845d3
2013-01-15 14:56:01 -06:00
Richard Peter
ae3ea75cbf Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]
Former-commit-id: 1318f53902
2013-01-14 17:38:38 -06:00
Steve Harris
b864fdc303 13.1.2-8 baseline
Former-commit-id: 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]
Former-commit-id: e6217a17de
2013-01-11 16:19:07 -05:00
Steve Harris
a8d90da9c0 13.1.2-7 baseline
Former-commit-id: 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]
Former-commit-id: 4f86b07eb0
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
b05bf7b6e2 Issue #1362 add null chack in nsharp mouse handler.
Former-commit-id: a836aee481 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]
Former-commit-id: 1186724fa8
2013-01-08 18:17:24 -06:00
Steve Harris
efd3392abe 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
2013-01-06 14:55:11 -06:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Max Schenkelberg
08160fff31 Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: 7e3273db95 [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]
Former-commit-id: fabb9bbcff
2012-12-20 17:14:34 -06:00
Steve Harris
4d4771ee3a Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]
Former-commit-id: 43ddfe98c4
2012-12-11 08:45:53 -06:00
Steve Harris
2d338b4cec 12.12.1-8 baseline
Former-commit-id: 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]
Former-commit-id: 19962f41ba
2012-12-06 09:02:51 -06:00
Max Schenkelberg
56ae27e172 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]
Former-commit-id: b648c5828e
2012-11-29 10:29:36 -06:00
Nate Jensen
0398aeaa5b Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
Former-commit-id: 31637efbbc [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]
Former-commit-id: 49c2079963
2012-11-14 16:09:00 -06:00
Dustin Johnson
d27bce13c2 Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]
Former-commit-id: bff32bbe58
2012-11-14 14:41:57 -06:00
Steve Harris
b91b7f0fae 12.12.1-4 baseline
Former-commit-id: 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 85130eb611
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
3d126b41e1 Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 2d864c3b09 [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]
Former-commit-id: 2c8f3f09ac
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
f62cf2713d Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]
Former-commit-id: e6b0751f5c
2012-11-08 14:34:55 -06:00
Dustin Johnson
efd3d3735a Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 064ef82d1e
2012-11-08 09:57:16 -06:00
Steve Harris
c2839cc86d 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Dustin Johnson
8e69107b5a 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 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 98d7beae50
2012-11-01 13:36:06 -05:00
Richard Peter
5787d6278d Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]
Former-commit-id: 275398778f
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
272e057bf1 merge branch Unifeid_Grid into developement
Former-commit-id: b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]
Former-commit-id: d0a2ed32b5
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
4f503d3a1e merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]
Former-commit-id: 6a9ff88b33
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
190e27205c Issue #189 modify nsharp to use grid data.
Former-commit-id: db1efee514 [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]
Former-commit-id: 52c37c114a
2012-10-24 13:07:41 -05:00
Steve Harris
362d6ffaca 12.11.1-5 baseline
Former-commit-id: a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: 03f3f3c36a
2012-10-18 15:46:42 -05:00
Steve Harris
98171b5de9 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00
Richard Peter
ca878b536f Issue #1257: Fix NSharp point retrieval
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: 3fa2a8b894 [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]
Former-commit-id: 25fe0aef5b
2012-10-15 19:40:20 -05:00
Richard Peter
12bcfbda80 Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path.
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: bcb0560291 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]
Former-commit-id: ca0c9b7502
2012-10-15 09:52:14 -05:00
Ben Steffensmeier
de3769129c 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 f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]
Former-commit-id: 8b7256b1ae
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
71704d7298 Issue #1217 commit code from Ncep to fix the problem
Former-commit-id: bb7b9d18e0 [formerly 608994193c845cfc60431b3c416c61736189a160]
Former-commit-id: d566733aae
2012-10-09 16:20:39 -05:00
Ben Steffensmeier
95f23ebe70 Issue #1131 merge latest changes to nsharp from ncep
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320

Former-commit-id: 01a13dee33 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]
Former-commit-id: b266c68be3
2012-09-28 15:35:11 -05:00
Steven Harris
0e86bfd1d3 12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: 618aa3f316
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
cfc9e5e78c Issue #1213 update nsharp resources to clear target on dispose.
Former-commit-id: 752a0078d4 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]
Former-commit-id: 60ca8a3011
2012-09-25 10:54:57 -05:00
Ben Steffensmeier
cb6b9dda23 Issue #1131 merge multipane nsharp into D2D.
Former-commit-id: 2606f968cb [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]
Former-commit-id: c04649842a
2012-09-20 17:28:54 -05:00
Ben Steffensmeier
4fe2127bfb Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]
Former-commit-id: bd8eb7fc15
2012-09-18 15:19:05 -05:00
Max Schenkelberg
a6cc869ada Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 2f8f1ce9b2 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]
Former-commit-id: 7294025e26
2012-09-11 16:27:41 -05:00
Steve Harris
de1639aea2 12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 21f430062b
2012-09-11 16:00:38 -05:00
Steve Harris
0e046d847a Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]
Former-commit-id: bba4eb12d0
2012-09-04 12:11:03 -05:00
Steve Harris
0abf64b77c 12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: 195158c004
2012-09-04 12:07:27 -05:00
Steve Harris
51eb89eb2a Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]
Former-commit-id: 91e39617cb
2012-08-27 09:53:55 -05:00