xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5742 commits 31 branches 40 tags 3.8 GiB
Commit graph

389 commits

Author SHA1 Message Date
Steve Harris
d0555c85c9 13.2.1-7 baseline 
Former-commit-id: 934a76bd7e [formerly 0b7287b130] [formerly 6fad5da5ed] [formerly 934a76bd7e [formerly 0b7287b130] [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly 6fad5da5ed [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 1699141ca3 [formerly 6780b60df5] [formerly 026d981189675d233e618f3f607c027654752432 [formerly 6bfbfc8a5e]]
Former-commit-id: 3f62bf744d982dc3896f07fe513e27e80aeca64a [formerly 94dd16659a]
Former-commit-id: 2255fa6a05
 2013-02-12 14:51:26 -06:00
Steve Harris
e91c865ccd Merge branch '13.2.1_delivery' into development 
Former-commit-id: 953bec4467 [formerly da43a7a8ca] [formerly 4bc8e9ab5c] [formerly 953bec4467 [formerly da43a7a8ca] [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 4bc8e9ab5c [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ee627253f [formerly b119d66cda] [formerly 0d3c30007ccec08e7c869bfdb97fef5b71783b3b [formerly 3ad515e28f]]
Former-commit-id: 57f644770a496fa44b6b32dc022210ab2e19666c [formerly d73efe8e86]
Former-commit-id: a11c8dff6d
 2013-02-06 11:12:01 -06:00
Steve Harris
2ccf38754d 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: 44a4287812 [formerly 14f23d4227] [formerly a16ac7819c] [formerly 44a4287812 [formerly 14f23d4227] [formerly a16ac7819c] [formerly 6c6b53679b [formerly a16ac7819c [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 63b36d8670 [formerly 48a0ffda4d] [formerly 5a2f1703799bcf7b130380bb73001e518a88ee6d [formerly 28ddc9bad8]]
Former-commit-id: 6f45b04bcc29948b273c8b6c0ae71fe396db790a [formerly f028c16f79]
Former-commit-id: f997ecea38
 2013-02-06 11:08:53 -06:00
Steve Harris
6cef082440 13.2.1-5 baseline 
Former-commit-id: 7e1236c17c [formerly a6b3cde1ff] [formerly 232734091d] [formerly 7e1236c17c [formerly a6b3cde1ff] [formerly 232734091d] [formerly 146fcc6da8 [formerly 232734091d [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 5d64cfc298 [formerly 7497a15e22] [formerly 49d71a590915a63b8746aa7ff8b66241cdada3aa [formerly 1c602ec3a7]]
Former-commit-id: 1b1ed3d8dd018c07b00ccdca9330d598dd62ac67 [formerly bb0759d5ad]
Former-commit-id: f36867a520
 2013-02-06 11:02:32 -06:00
Bryan Kowal
77d006cc5f 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: 874d754543 [formerly 81da18f851] [formerly 7815b651bb] [formerly 874d754543 [formerly 81da18f851] [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7815b651bb [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 285e192bd1 [formerly efe288c82c] [formerly 79a63957141ccebe7c30159fdecdcee461b2f5f5 [formerly 99994d3151]]
Former-commit-id: 6be7d17634e138e6eac183d671f48db6672cf7f4 [formerly 2fafc6a34b]
Former-commit-id: 2afa604676
 2013-02-05 13:25:15 -06:00
Steve Harris
bafb9234f2 13.2.1-4 baseline 
Former-commit-id: ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: d6b48ca411 [formerly 3f25b862c8] [formerly 10a61c775941bb43691425e06f2cf4ac1116da55 [formerly 2998f750f4]]
Former-commit-id: 145f6b5c4d69d5e7db5b971374ee6cd59cc6e57e [formerly 0a4ef8c084]
Former-commit-id: 5ae95b956b
 2013-01-31 11:40:31 -06:00
Steve Harris
5d7a0ba9af 13.2.1-2 baseline 
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 0f4fcd0ba8 [formerly 251a9c0195] [formerly 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]]
Former-commit-id: a3e63c2bb7b23736c07cc90370ea39a5d96fd1a5 [formerly 27706b8dcb]
Former-commit-id: eafa141b90
 2013-01-25 09:07:12 -06:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline 
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
 2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58 13.2.1-1 baseline 
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4 [formerly 8ed6a53113] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9]
Former-commit-id: 08bf724a6c
 2013-01-23 11:13:03 -05:00
Steve Harris
f3e43ecb33 13.1.2-10 baseline 
Former-commit-id: 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]]
Former-commit-id: 86ea0b666e
Former-commit-id: b4a3933e87 [formerly 39f9dc931a] [formerly 9f07f7e014b3a205684780ddaf335bdd9b824c4d [formerly d148beb4ca]]
Former-commit-id: 18d303aa6094230a2a8aa0f0954b1705a38382d5 [formerly 5c488932d9]
Former-commit-id: 18b7633b70
 2013-01-18 10:37:25 -05:00
Bryan Kowal
a7f8d65804 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: 9e1825b270 [formerly 86bd4e3b3f] [formerly a2f745ec54] [formerly 9e1825b270 [formerly 86bd4e3b3f] [formerly a2f745ec54] [formerly 5d769d8a8d [formerly a2f745ec54 [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]]]]
Former-commit-id: 5d769d8a8d
Former-commit-id: 9761bc18ea [formerly d9832e846b] [formerly 2108d5adbe08bf12c597593f05366699193eb6b8 [formerly 2bb5377a4d]]
Former-commit-id: f94a7412d8370472fbff4f7faa55e5eb8e3ba709 [formerly 0c5323fadb]
Former-commit-id: dc85c1692b
 2013-01-17 09:59:11 -06:00
Bryan Kowal
3fca7d882f 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: d194f3c137 [formerly 55550007cb] [formerly 2ed28bed93] [formerly d194f3c137 [formerly 55550007cb] [formerly 2ed28bed93] [formerly 8c118e791b [formerly 2ed28bed93 [formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]]]]
Former-commit-id: 8c118e791b
Former-commit-id: 00c7284039 [formerly 1eb4e6d41e] [formerly d8bdc1f2055cc2924e29bd41737da260c406b70c [formerly 0a39b4ddf1]]
Former-commit-id: ee3b477b1fc070b014bea68023ff497f01ed3763 [formerly e9e16abea2]
Former-commit-id: 6dbe3e938f
 2013-01-15 18:46:46 -06:00
Bryan Kowal
b93b2f41fb Issue #1469 - updated for compatibility with recent changes to Pypies. 
Former-commit-id: 147cf7902b [formerly 90b9cf9804] [formerly 02c16b6f3d] [formerly 147cf7902b [formerly 90b9cf9804] [formerly 02c16b6f3d] [formerly d710e987e4 [formerly 02c16b6f3d [formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]]]]
Former-commit-id: d710e987e4
Former-commit-id: a0abbfd761 [formerly 8a7376ed60] [formerly 3baeb9bb62d5988bfa2a7a03edecc279dd153b9a [formerly 37d1aee965]]
Former-commit-id: 87daf65ceb0838923be5081f0276e6b2de5d0e2f [formerly 34518b7cf6]
Former-commit-id: cd4624e79e
 2013-01-15 16:09:42 -06:00
Bryan Kowal
d9c01fe8a0 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: 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 49b121ed3a [formerly 38480e46b1] [formerly 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]]
Former-commit-id: 64fa164a62368e1ef375932fe20cd65b2d0ba6fb [formerly 290167ac16]
Former-commit-id: 89cc2bdf57
 2013-01-15 14:56:01 -06:00
Richard Peter
031bae3bfd 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 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
 2013-01-14 17:38:38 -06:00
Steve Harris
32c48861de 13.1.2-8 baseline 
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
 2013-01-11 16:19:07 -05:00
Steve Harris
005d9ccae2 13.1.2-7 baseline 
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
 2013-01-11 16:12:09 -05:00
Ben Steffensmeier
f844921a9f Issue #1362 add null chack in nsharp mouse handler. 
Former-commit-id: b6e5e160ea [formerly b05bf7b6e2] [formerly 1186724fa8] [formerly b6e5e160ea [formerly b05bf7b6e2] [formerly 1186724fa8] [formerly a836aee481 [formerly 1186724fa8 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]]]
Former-commit-id: a836aee481
Former-commit-id: d51e288baf [formerly a8b4746176] [formerly c5f3635a2e57e9b55fb0c57ae387ac93fbacbe48 [formerly 3a4661685a]]
Former-commit-id: 6388e67bc1b8b207cd9477a9646d2c61acb3f856 [formerly 8fb09ab2cb]
Former-commit-id: 1b9a9383c1
 2013-01-08 18:17:24 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline 
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
 2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline 
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
 2013-01-06 14:32:24 -06:00
Max Schenkelberg
5fb550377e 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 656a4500eb [formerly 08160fff31] [formerly fabb9bbcff] [formerly 7e3273db95 [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]]
Former-commit-id: 7e3273db95
Former-commit-id: b912ede4c2 [formerly 3a1106efa0] [formerly 4287aae513311854dca459766b0660713bfe075e [formerly 904270b99b]]
Former-commit-id: 09a73da346014f11fd385751bf9b96d1d8a46914 [formerly 09f1499af9]
Former-commit-id: d0a39b6c17
 2012-12-20 17:14:34 -06:00
Steve Harris
179755f156 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 d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
 2012-12-11 08:45:53 -06:00
Steve Harris
5f22640e99 12.12.1-8 baseline 
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593]
Former-commit-id: 0b22b3c014
 2012-12-06 09:02:51 -06:00
Max Schenkelberg
8215537399 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 a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]]
Former-commit-id: ed77d56a84
Former-commit-id: 1f8c88490a [formerly f681c1304c] [formerly 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]]
Former-commit-id: c5ee37a2251945312e76e97b444e5dc6495a440a [formerly b8b98a78c3]
Former-commit-id: a7b239f9c1
 2012-11-29 10:29:36 -06:00
Nate Jensen
0dc2166356 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 c4cc7b638c [formerly 0398aeaa5b] [formerly 49c2079963] [formerly 31637efbbc [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]]
Former-commit-id: 31637efbbc
Former-commit-id: c281cd6661 [formerly 9158625765] [formerly 0bf1056e5bebc6db3ad2c4e0bf1d7112695b64f7 [formerly 8944e220f6]]
Former-commit-id: cb5b6558e1c8f1296d96b7f556b9a32c12b8431e [formerly 25602f0183]
Former-commit-id: 46f902852f
 2012-11-14 16:09:00 -06:00
Dustin Johnson
c6dbe1bc0c 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 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 08fd67e94a [formerly 5d5dbe27e1] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]]
Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234]
Former-commit-id: 6d21c445c2
 2012-11-14 14:41:57 -06:00
Steve Harris
ccb16b9b44 12.12.1-4 baseline 
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b]
Former-commit-id: 2c2bfc949d
 2012-11-14 14:19:20 -06:00
Ben Steffensmeier
88ccafacce Issue #189 changes to mappings and ncep merge from code review 
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 069028be40 [formerly 47759f025b] [formerly 93da211e0f7547578a2ee201bcf8f17e845566f7 [formerly 91254adfd6]]
Former-commit-id: e4d04345db41c59b5fd45edf11fdb36401df1850 [formerly 84abe4fa4f]
Former-commit-id: e57c669f2e
 2012-11-14 12:22:53 -06:00
Ben Steffensmeier
8399158199 Issue #189 merge ncep changes to unified grid. 
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly c17b92afc5 [formerly f62cf2713d] [formerly e6b0751f5c] [formerly fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]]
Former-commit-id: fbed67a208
Former-commit-id: b664a9e649 [formerly d75b59622a] [formerly b5eb27fb49abd5ab7570ad430a356c40d5ae9848 [formerly 7c9341a3a6]]
Former-commit-id: fe88c86a07e948a680250c58c72bfa9ef94a60ca [formerly 40a07f8998]
Former-commit-id: 35b855635f
 2012-11-08 14:34:55 -06:00
Dustin Johnson
eb82c7672b 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 acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
 2012-11-08 09:57:16 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline 
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
 2012-11-07 12:41:20 -06:00
Dustin Johnson
4bc4d95b21 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 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
 2012-11-01 13:36:06 -05:00
Richard Peter
0f2e6c97fe Issue #1257: Update PurgeRules to not be hard linked to path keys 
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: b2989eb90f [formerly 5787d6278d] [formerly 275398778f] [formerly b2989eb90f [formerly 5787d6278d] [formerly 275398778f] [formerly 886375172b [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]]]
Former-commit-id: 886375172b
Former-commit-id: 44b6afb10a [formerly 998278caf7] [formerly 3ba6f5a7f032d4b04a9f1b4905d76eb04a5920a4 [formerly bd1d87363a]]
Former-commit-id: 3ec2c0f1f1a74b387da0ad28f03a1512c353c3f8 [formerly 940d986f6d]
Former-commit-id: 7df04375f1
 2012-10-31 18:19:44 -05:00
Ben Steffensmeier
3e225faa8b merge branch Unifeid_Grid into developement 
Former-commit-id: c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly c789e1fd94 [formerly 272e057bf1] [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 0ee5726a56 [formerly 1d94435220] [formerly e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc]]
Former-commit-id: 51550491838571c9141b390aa875633f1c0b19a4 [formerly 38b0dafe0b]
Former-commit-id: 1931b503a2
 2012-10-30 12:24:54 -05:00
Ben Steffensmeier
84ee3cecaa merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61]
Former-commit-id: 86562637f0
 2012-10-25 12:22:11 -05:00
Ben Steffensmeier
e54800b299 Issue #189 modify nsharp to use grid data. 
Former-commit-id: ed69bb3056 [formerly 190e27205c] [formerly 52c37c114a] [formerly ed69bb3056 [formerly 190e27205c] [formerly 52c37c114a] [formerly db1efee514 [formerly 52c37c114a [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]]]]
Former-commit-id: db1efee514
Former-commit-id: 4e23c22262 [formerly 525fbd457b] [formerly 71ee5529caf13280126c3faa03641d031c6db9a7 [formerly b9cd33b79b]]
Former-commit-id: 12bb661225b5687cd685be940f2cd591b147fda6 [formerly 3f608d0843]
Former-commit-id: 1db5421cd7
 2012-10-24 13:07:41 -05:00
Steve Harris
92be4d5105 12.11.1-5 baseline 
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]]
Former-commit-id: a0eaf651ff
Former-commit-id: dfdf01de85 [formerly 85ad066b70] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]]
Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c]
Former-commit-id: 13cdd55545
 2012-10-18 15:46:42 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline 
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
 2012-10-16 13:27:07 -05:00
Richard Peter
695869ce5b Issue #1257: Fix NSharp point retrieval 
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: c3961853ba [formerly ca878b536f] [formerly 25fe0aef5b] [formerly c3961853ba [formerly ca878b536f] [formerly 25fe0aef5b] [formerly 3fa2a8b894 [formerly 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]]]]
Former-commit-id: 3fa2a8b894
Former-commit-id: 6185a78fec [formerly 13bffbc202] [formerly 9953f61860789b9448d8609f799d6617079d6167 [formerly d434d967dd]]
Former-commit-id: b627e06233b12e82e53271f30a0f602ac3a5fba8 [formerly a8b4b8ac8b]
Former-commit-id: dd0b4bae3d
 2012-10-15 19:40:20 -05:00
Richard Peter
9c9e23d8a2 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 202c7b885e [formerly 12bcfbda80] [formerly ca0c9b7502] [formerly bcb0560291 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]]]
Former-commit-id: bcb0560291
Former-commit-id: 6c0bfb9858 [formerly 46870808e0] [formerly a9406efb61625c7381ceb47856f2fa57a257622d [formerly ce85c8e1a6]]
Former-commit-id: cc07adda4c70d3d12938f64d2565a522222ba657 [formerly 881582885c]
Former-commit-id: 61892fee88
 2012-10-15 09:52:14 -05:00
Ben Steffensmeier
51d1c03c36 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 a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d]
Former-commit-id: 29777154bb
 2012-10-12 12:45:50 -05:00
Ben Steffensmeier
b0b69f3ac8 Issue #1217 commit code from Ncep to fix the problem 
Former-commit-id: ca08938dbb [formerly 71704d7298] [formerly d566733aae] [formerly ca08938dbb [formerly 71704d7298] [formerly d566733aae] [formerly bb7b9d18e0 [formerly d566733aae [formerly 608994193c845cfc60431b3c416c61736189a160]]]]
Former-commit-id: bb7b9d18e0
Former-commit-id: cb49001901 [formerly 4da0a25cfb] [formerly 2ec55cc9a61cacc71d429ddf935ef1b3bc14bc11 [formerly 75d1e65c29]]
Former-commit-id: 9a2c7f6adc332173f6454404c0637806022a5d7d [formerly 18e2457845]
Former-commit-id: d4de806443
 2012-10-09 16:20:39 -05:00
Ben Steffensmeier
907dfd4141 Issue #1131 merge latest changes to nsharp from ncep 
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320

Former-commit-id: 53024843e6 [formerly 95f23ebe70] [formerly b266c68be3] [formerly 53024843e6 [formerly 95f23ebe70] [formerly b266c68be3] [formerly 01a13dee33 [formerly b266c68be3 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]]]]
Former-commit-id: 01a13dee33
Former-commit-id: 5db7179015 [formerly a11df022cf] [formerly 72c17846701edfb3c6dba4f2a7886e2bba0634d9 [formerly c367592b02]]
Former-commit-id: 404fec31a0b742a08b2eba8a4322bef6f83c8c9d [formerly 642f58ca49]
Former-commit-id: 54f592bf89
 2012-09-28 15:35:11 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline 
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
 2012-09-27 15:57:45 -05:00
Ben Steffensmeier
4dec69329a Issue #1213 update nsharp resources to clear target on dispose. 
Former-commit-id: 6594ab0fbf [formerly cfc9e5e78c] [formerly 60ca8a3011] [formerly 6594ab0fbf [formerly cfc9e5e78c] [formerly 60ca8a3011] [formerly 752a0078d4 [formerly 60ca8a3011 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]]]]
Former-commit-id: 752a0078d4
Former-commit-id: 1aba06d15a [formerly b4be61cead] [formerly 9774aad7fe69585f7286f46b443de05cc8c6a51e [formerly 1df5ee74aa]]
Former-commit-id: a11e8248006420fc2cc07b4a864e33b3aff746d2 [formerly 190f0754fb]
Former-commit-id: 610515500d
 2012-09-25 10:54:57 -05:00
Ben Steffensmeier
2c73e5a2d3 Issue #1131 merge multipane nsharp into D2D. 
Former-commit-id: f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly f68919cd08 [formerly cb6b9dda23] [formerly c04649842a] [formerly 2606f968cb [formerly c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]]]
Former-commit-id: 2606f968cb
Former-commit-id: 81b569a8f8 [formerly b83ca44d6b] [formerly ffd63f3c9e74adbc96cb48f93c0afa5f9de5a89a [formerly 036aa08f2c]]
Former-commit-id: 2196697644a1958a810f83bd43efdccc96f18efc [formerly 8fc544b44f]
Former-commit-id: c43b7c1dd7
 2012-09-20 17:28:54 -05:00
Ben Steffensmeier
f13ba32307 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 9eecab65c0 [formerly 4fe2127bfb] [formerly bd8eb7fc15] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]]
Former-commit-id: 05849f634d
Former-commit-id: 6af74b843c [formerly 6b058ace34] [formerly 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f]]
Former-commit-id: f3894ca9c56c5ba2f1f317fbf84aa3eceec77726 [formerly a28984c40c]
Former-commit-id: 9509d72ef9
 2012-09-18 15:19:05 -05:00
Max Schenkelberg
6b5b4197a0 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 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 1e81c703f1 [formerly 52e812ec0e] [formerly 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908]]
Former-commit-id: 0f1fad1da8c7a5d1787cda72eb269efb5b9cde6d [formerly 1badd11cdb]
Former-commit-id: fbc35a39d4
 2012-09-11 16:27:41 -05:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline 
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
 2012-09-11 16:00:38 -05:00
Steve Harris
46d05b60a1 Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789]
Former-commit-id: f8e7459dfb
 2012-09-04 12:11:03 -05:00