Commit graph

125 commits

Author SHA1 Message Date
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: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]
Former-commit-id: fa6247baf7
2013-01-14 17:38:38 -06:00
Steve Harris
13be9f8987 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]
Former-commit-id: 7d0109a349
2013-01-11 16:19:07 -05:00
Steve Harris
4c8e604619 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]
Former-commit-id: f1256f2a9e
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
d51e288baf Issue #1362 add null chack in nsharp mouse handler.
Former-commit-id: b6e5e160ea [formerly b05bf7b6e2] [formerly 1186724fa8] [formerly a836aee481 [formerly 1186724fa8 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]]
Former-commit-id: a836aee481
Former-commit-id: c5f3635a2e57e9b55fb0c57ae387ac93fbacbe48 [formerly 3a4661685a]
Former-commit-id: a8b4746176
2013-01-08 18:17:24 -06:00
Steve Harris
fe763963e9 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
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: 656a4500eb [formerly 08160fff31] [formerly fabb9bbcff] [formerly 7e3273db95 [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]
Former-commit-id: 7e3273db95
Former-commit-id: 4287aae513311854dca459766b0660713bfe075e [formerly 904270b99b]
Former-commit-id: 3a1106efa0
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: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
2012-12-11 08:45:53 -06:00
Steve Harris
a45a7fe1bf 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]
Former-commit-id: ff4131c2ee
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: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]
Former-commit-id: f681c1304c
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: c4cc7b638c [formerly 0398aeaa5b] [formerly 49c2079963] [formerly 31637efbbc [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]
Former-commit-id: 31637efbbc
Former-commit-id: 0bf1056e5bebc6db3ad2c4e0bf1d7112695b64f7 [formerly 8944e220f6]
Former-commit-id: 9158625765
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: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]
Former-commit-id: 5d5dbe27e1
2012-11-14 14:41:57 -06:00
Steve Harris
4300583fc2 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]
Former-commit-id: e35a321a8c
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: 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 93da211e0f7547578a2ee201bcf8f17e845566f7 [formerly 91254adfd6]
Former-commit-id: 47759f025b
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: c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]
Former-commit-id: fbed67a208
Former-commit-id: b5eb27fb49abd5ab7570ad430a356c40d5ae9848 [formerly 7c9341a3a6]
Former-commit-id: d75b59622a
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: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
2012-11-08 09:57:16 -06:00
Steve Harris
3cb24c1d06 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]
Former-commit-id: 4f243de928
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: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
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: b2989eb90f [formerly 5787d6278d] [formerly 275398778f] [formerly 886375172b [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]]
Former-commit-id: 886375172b
Former-commit-id: 3ba6f5a7f032d4b04a9f1b4905d76eb04a5920a4 [formerly bd1d87363a]
Former-commit-id: 998278caf7
2012-10-31 18:19:44 -05:00
Ben Steffensmeier
0ee5726a56 merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]
Former-commit-id: 1d94435220
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: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]
Former-commit-id: 9b8f2bcdbd
2012-10-25 12:22:11 -05:00
Ben Steffensmeier
4e23c22262 Issue #189 modify nsharp to use grid data.
Former-commit-id: ed69bb3056 [formerly 190e27205c] [formerly 52c37c114a] [formerly db1efee514 [formerly 52c37c114a [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]]]
Former-commit-id: db1efee514
Former-commit-id: 71ee5529caf13280126c3faa03641d031c6db9a7 [formerly b9cd33b79b]
Former-commit-id: 525fbd457b
2012-10-24 13:07:41 -05:00
Steve Harris
dfdf01de85 12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]
Former-commit-id: 85ad066b70
2012-10-18 15:46:42 -05:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Richard Peter
6185a78fec Issue #1257: Fix NSharp point retrieval
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: c3961853ba [formerly ca878b536f] [formerly 25fe0aef5b] [formerly 3fa2a8b894 [formerly 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]]]
Former-commit-id: 3fa2a8b894
Former-commit-id: 9953f61860789b9448d8609f799d6617079d6167 [formerly d434d967dd]
Former-commit-id: 13bffbc202
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: 202c7b885e [formerly 12bcfbda80] [formerly ca0c9b7502] [formerly bcb0560291 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]]
Former-commit-id: bcb0560291
Former-commit-id: a9406efb61625c7381ceb47856f2fa57a257622d [formerly ce85c8e1a6]
Former-commit-id: 46870808e0
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: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]
Former-commit-id: 266a2f317f
Former-commit-id: aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]
Former-commit-id: fde1e73d58
2012-10-12 12:45:50 -05:00
Ben Steffensmeier
cb49001901 Issue #1217 commit code from Ncep to fix the problem
Former-commit-id: ca08938dbb [formerly 71704d7298] [formerly d566733aae] [formerly bb7b9d18e0 [formerly d566733aae [formerly 608994193c845cfc60431b3c416c61736189a160]]]
Former-commit-id: bb7b9d18e0
Former-commit-id: 2ec55cc9a61cacc71d429ddf935ef1b3bc14bc11 [formerly 75d1e65c29]
Former-commit-id: 4da0a25cfb
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: 53024843e6 [formerly 95f23ebe70] [formerly b266c68be3] [formerly 01a13dee33 [formerly b266c68be3 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]]]
Former-commit-id: 01a13dee33
Former-commit-id: 72c17846701edfb3c6dba4f2a7886e2bba0634d9 [formerly c367592b02]
Former-commit-id: a11df022cf
2012-09-28 15:35:11 -05:00
Steven Harris
9c67bbab77 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]
Former-commit-id: f5e63d5f93
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
1aba06d15a Issue #1213 update nsharp resources to clear target on dispose.
Former-commit-id: 6594ab0fbf [formerly cfc9e5e78c] [formerly 60ca8a3011] [formerly 752a0078d4 [formerly 60ca8a3011 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]]]
Former-commit-id: 752a0078d4
Former-commit-id: 9774aad7fe69585f7286f46b443de05cc8c6a51e [formerly 1df5ee74aa]
Former-commit-id: b4be61cead
2012-09-25 10:54:57 -05:00
Ben Steffensmeier
81b569a8f8 Issue #1131 merge multipane nsharp into D2D.
Former-commit-id: f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly 2606f968cb [formerly c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]]
Former-commit-id: 2606f968cb
Former-commit-id: ffd63f3c9e74adbc96cb48f93c0afa5f9de5a89a [formerly 036aa08f2c]
Former-commit-id: b83ca44d6b
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: 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]
Former-commit-id: 05849f634d
Former-commit-id: 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f]
Former-commit-id: 6b058ace34
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: 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908]
Former-commit-id: 52e812ec0e
2012-09-11 16:27:41 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
20e088a957 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
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: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]
Former-commit-id: dbcb28ce77
2012-08-27 09:53:55 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00
Ben Steffensmeier
89255891cc Issue #666 fix collaboration message compose problems with ncp keybindings
Former-commit-id: 977d5587cb [formerly 25b00010e1] [formerly 3f0b2e474c] [formerly 8e971abbd8 [formerly 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]]
Former-commit-id: 8e971abbd8
Former-commit-id: a03fb3fc1578ffe96414fa4161300406218521d7 [formerly 2c5cfe6d98]
Former-commit-id: f6e7d795f9
2012-08-17 16:16:20 -05:00
Steve Harris
d3023f15ac 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Steve Harris
9cce94e63a Merge branch 'development' into development_on_ss_builds
Former-commit-id: 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: c8ede12f88d71b1fa54dc220cc2b1866cb44d9e8 [formerly 8f4ddad22c]
Former-commit-id: dbe07ca70c
2012-08-06 08:23:04 -05:00
Steve Harris
330c7a877c Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]
Former-commit-id: d2291ba23f
2012-08-01 12:43:12 -05:00
Steve Harris
4f47148ced 12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]
Former-commit-id: dab00b12e6
2012-08-01 10:45:37 -05:00
Nate Jensen
ed7692a863 Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64

Former-commit-id: 3db2a3fe6a [formerly 8539a075bb] [formerly 43e5a5d331fafc88613302773d9633128974a5cb [formerly ae7c427b4b]] [formerly 69f51e6e87 [formerly ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]]]
Former-commit-id: 69f51e6e87
Former-commit-id: 76be324e1c5161d8977d3d5548eb7c51a3c3a8af [formerly 00bbb6c8a3]
Former-commit-id: 9ca861b827
2012-07-31 10:02:39 -05:00
Nate Jensen
6d8ac0455e Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 3ab4b622030a864dcf04c61605009347c3550e9a [formerly 8fa0eb70db]
Former-commit-id: 7d478ac74c
2012-07-31 08:57:54 -05:00
Steve Harris
c18e221e26 Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]
Former-commit-id: 9e4df42326
2012-07-27 14:44:44 -05:00
Steve Harris
e1eb7f5972 12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]
Former-commit-id: f2102bfb24
2012-07-19 16:20:40 -05:00
Bryan Kowal
e07c3c20b5 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]
Former-commit-id: 3b7c761f99
Former-commit-id: 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]
Former-commit-id: 470511d9a3
2012-07-11 12:44:32 -05:00
Steve Harris
1e747f0a42 Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
These files have existing camel-cased equivalents and may not be needed.


Former-commit-id: a456af38fa [formerly 8fff0d7e53] [formerly 479ccdbed2] [formerly 9454393d13 [formerly 479ccdbed2 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]]]
Former-commit-id: 9454393d13
Former-commit-id: 7ed16a1e6561227172b77b9994e15bfb96164579 [formerly 330b9c3174]
Former-commit-id: 45ac1d4d51
2012-07-10 09:29:33 -05:00