Steve Harris
3ee627253f
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 953bec4467da43a7a8ca4bc8e9ab5c5ee47e098d4bc8e9ab5c5ee47e098d3ad515e28fb119d66cda
2013-02-06 11:12:01 -06:00
Steve Harris
63b36d8670
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: 44a428781214f23d4227a16ac7819c6c6b53679ba16ac7819c6c6b53679b28ddc9bad848a0ffda4d
2013-02-06 11:08:53 -06:00
Steve Harris
5d64cfc298
13.2.1-5 baseline
...
Former-commit-id: 7e1236c17ca6b3cde1ff232734091d146fcc6da8232734091d146fcc6da81c602ec3a77497a15e22
2013-02-06 11:02:32 -06:00
Bryan Kowal
285e192bd1
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: 874d75454381da18f8517815b651bb5fea87f1dd7815b651bb5fea87f1dd99994d3151efe288c82c
2013-02-05 13:25:15 -06:00
Steve Harris
0f4fcd0ba8
13.2.1-2 baseline
...
Former-commit-id: 74bfe9595c0006a2b6cb7a7f7c45cac3e4551dfa7a7f7c45cac3e4551dfa1153d80c5b251a9c0195
2013-01-25 09:07:12 -06:00
Bryan Kowal
9761bc18ea
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: 9e1825b27086bd4e3b3fa2f745ec545d769d8a8da2f745ec545d769d8a8d2bb5377a4dd9832e846b
2013-01-17 09:59:11 -06:00
Bryan Kowal
00c7284039
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: d194f3c13755550007cb2ed28bed938c118e791b2ed28bed938c118e791b0a39b4ddf11eb4e6d41e
2013-01-15 18:46:46 -06:00
Bryan Kowal
a0abbfd761
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 147cf7902b90b9cf980402c16b6f3dd710e987e402c16b6f3dd710e987e437d1aee9658a7376ed60
2013-01-15 16:09:42 -06:00
Bryan Kowal
49b121ed3a
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: 1414f0415bfba28ea69be2a12845d34db9c6c321e2a12845d34db9c6c321c1330e812138480e46b1
2013-01-15 14:56:01 -06:00
Richard Peter
9da3b7e2dd
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: 4e1f66abb3ae3ea75cbf1318f53902b8e42dabc01318f53902b8e42dabc0aa9e16b038fa6247baf7
2013-01-14 17:38:38 -06:00
Steve Harris
13be9f8987
13.1.2-8 baseline
...
Former-commit-id: 5aaacf4eecb864fdc303e6217a17de06b8eb8db0e6217a17de06b8eb8db03caf592e837d0109a349
2013-01-11 16:19:07 -05:00
Steve Harris
4c8e604619
13.1.2-7 baseline
...
Former-commit-id: 0b15dff12ba8d90da9c04f86b07eb042189b5f884f86b07eb042189b5f88b7f1dbe72bf1256f2a9e
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
d51e288baf
Issue #1362 add null chack in nsharp mouse handler.
...
Former-commit-id: b6e5e160eab05bf7b6e21186724fa8a836aee4811186724fa8a836aee4813a4661685aa8b4746176
2013-01-08 18:17:24 -06:00
Steve Harris
fe763963e9
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775addbcae57f5782a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb3941337c553cd4185ef5c
2013-01-06 14:32:24 -06:00
Max Schenkelberg
b912ede4c2
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: 656a4500eb08160fff31fabb9bbcff7e3273db95fabb9bbcff7e3273db95904270b99b3a1106efa0
2012-12-20 17:14:34 -06:00
Steve Harris
377804398b
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: d27c5237c34d4771ee3a43ddfe98c4f6988eefff43ddfe98c4f6988eefff6287b32e7df02c1ef71d
2012-12-11 08:45:53 -06:00
Steve Harris
a45a7fe1bf
12.12.1-8 baseline
...
Former-commit-id: 8790caf84e2d338b4cec19962f41ba5093a7c44219962f41ba5093a7c442ee06a94735ff4131c2ee
2012-12-06 09:02:51 -06:00
Max Schenkelberg
1f8c88490a
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: a113ecd2ea56ae27e172b648c5828eed77d56a84b648c5828eed77d56a84b24440cc37f681c1304c
2012-11-29 10:29:36 -06:00
Nate Jensen
c281cd6661
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: c4cc7b638c0398aeaa5b49c207996331637efbbc49c207996331637efbbc8944e220f69158625765
2012-11-14 16:09:00 -06:00
Dustin Johnson
08fd67e94a
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: 069c8d4788d27bce13c2bff32bbe580d1d663f41bff32bbe580d1d663f41e25b7c312b5d5dbe27e1
2012-11-14 14:41:57 -06:00
Steve Harris
4300583fc2
12.12.1-4 baseline
...
Former-commit-id: b968ab5135b91b7f0fae85130eb61157578da52185130eb61157578da521628ca9e5c6e35a321a8c
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
069028be40
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 233398088a3d126b41e12c8f3f09ac2d864c3b092c8f3f09ac2d864c3b0991254adfd647759f025b
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
b664a9e649
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: c17b92afc5f62cf2713de6b0751f5cfbed67a208e6b0751f5cfbed67a2087c9341a3a6d75b59622a
2012-11-08 14:34:55 -06:00
Dustin Johnson
cd5faf58bf
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: acd4cf94d8efd3d3735a064ef82d1e1dbeb22893064ef82d1e1dbeb228934222b24d092d1e886cf3
2012-11-08 09:57:16 -06:00
Steve Harris
3cb24c1d06
12.12.1-1 baseline
...
Former-commit-id: 8278cac143c2839cc86de4bd20a515e1498006c7e4bd20a515e1498006c7214fcd3b634f243de928
2012-11-07 12:41:20 -06:00
Dustin Johnson
fe8a2a3b09
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: 7d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10bcf575966be7a0f96a9a
2012-11-01 13:36:06 -05:00
Richard Peter
44b6afb10a
Issue #1257 : Update PurgeRules to not be hard linked to path keys
...
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: b2989eb90f5787d6278d275398778f886375172b275398778f886375172bbd1d87363a998278caf7
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
0ee5726a56
merge branch Unifeid_Grid into developement
...
Former-commit-id: c789e1fd94272e057bf1d0a2ed32b5b6a1563bb2d0a2ed32b5b6a1563bb292fd247ccc1d94435220
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
24de750932
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 1a215cb42a4f503d3a1e6a9ff88b33c2934ae7a56a9ff88b33c2934ae7a5a77d2097f89b8f2bcdbd
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
4e23c22262
Issue #189 modify nsharp to use grid data.
...
Former-commit-id: ed69bb3056190e27205c52c37c114adb1efee51452c37c114adb1efee514b9cd33b79b525fbd457b
2012-10-24 13:07:41 -05:00
Steve Harris
dfdf01de85
12.11.1-5 baseline
...
Former-commit-id: bb8fe6e556362d6ffaca03f3f3c36aa0eaf651ff03f3f3c36aa0eaf651ffe31c1e5bba85ad066b70
2012-10-18 15:46:42 -05:00
Steve Harris
c9b563338a
12.11.1-4 baseline
...
Former-commit-id: 6e44abdba198171b5de9d3497e47eb6958b861f0d3497e47eb6958b861f0cbbdb231ce2c82d9cb07
2012-10-16 13:27:07 -05:00
Richard Peter
6185a78fec
Issue #1257 : Fix NSharp point retrieval
...
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4
Former-commit-id: c3961853baca878b536f25fe0aef5b3fa2a8b89425fe0aef5b3fa2a8b894d434d967dd13bffbc202
2012-10-15 19:40:20 -05:00
Richard Peter
6c0bfb9858
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: 202c7b885e12bcfbda80ca0c9b7502bcb0560291ca0c9b7502bcb0560291ce85c8e1a646870808e0
2012-10-15 09:52:14 -05:00
Ben Steffensmeier
97c23508d7
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: a67ce9586cde3769129c8b7256b1ae266a2f317f8b7256b1ae266a2f317ffed5a35af3fde1e73d58
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
cb49001901
Issue #1217 commit code from Ncep to fix the problem
...
Former-commit-id: ca08938dbb71704d7298d566733aaebb7b9d18e0d566733aaebb7b9d18e075d1e65c294da0a25cfb
2012-10-09 16:20:39 -05:00
Ben Steffensmeier
5db7179015
Issue #1131 merge latest changes to nsharp from ncep
...
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320
Former-commit-id: 53024843e695f23ebe70b266c68be301a13dee33b266c68be301a13dee33c367592b02a11df022cf
2012-09-28 15:35:11 -05:00
Steven Harris
9c67bbab77
12.11.1-1 baseline
...
Former-commit-id: ffe36410570e86bfd1d3618aa3f316feec28f274618aa3f316feec28f2748843ffd022f5e63d5f93
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
1aba06d15a
Issue #1213 update nsharp resources to clear target on dispose.
...
Former-commit-id: 6594ab0fbfcfc9e5e78c60ca8a3011752a0078d460ca8a3011752a0078d41df5ee74aab4be61cead
2012-09-25 10:54:57 -05:00
Ben Steffensmeier
81b569a8f8
Issue #1131 merge multipane nsharp into D2D.
...
Former-commit-id: f68919cd08cb6b9dda23c04649842a2606f968cbc04649842a2606f968cb036aa08f2cb83ca44d6b
2012-09-20 17:28:54 -05:00
Ben Steffensmeier
6af74b843c
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
...
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 9eecab65c04fe2127bfbbd8eb7fc1505849f634dbd8eb7fc1505849f634db547d9dd8f6b058ace34
2012-09-18 15:19:05 -05:00
Max Schenkelberg
1e81c703f1
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: 5e94274b98a6cc869ada7294025e262f8f1ce9b27294025e262f8f1ce9b2c26d21d90852e812ec0e
2012-09-11 16:27:41 -05:00
Steve Harris
64699fa90b
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9de1639aea221f430062b969e7e6dfd21f430062b969e7e6dfd438d139fddf376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
20e088a957
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 319927240c0e046d847abba4eb12d0af106f1d29bba4eb12d0af106f1d2953e29f59e4f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83
12.10.1-1 baseline
...
Former-commit-id: 7248f8b7620abf64b77c195158c004d708932029195158c004d7089320297bd9c63dc7e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
fd6e8d5b63
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: 772c4359da51eb89eb2a91e39617cba71dac6cad91e39617cba71dac6cad87a602dfeedbcb28ce77
2012-08-27 09:53:55 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac3942872824561cb7fb0b17bd5
2012-08-21 15:27:03 -05:00
Ben Steffensmeier
89255891cc
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 977d5587cb25b00010e13f0b2e474c8e971abbd83f0b2e474c8e971abbd82c5cfe6d98f6e7d795f9
2012-08-17 16:16:20 -05:00
Steve Harris
d3023f15ac
12.9.1-1 baseline
...
Former-commit-id: b9fb1c89d48309193ce931ae7ea21879ce6cfd9731ae7ea21879ce6cfd970c5d9e2416aed7a644df
2012-08-15 13:59:00 -05:00
