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

390 commits

Author SHA1 Message Date
Brian Clements
f5a9bffd4c Omaha #2733 restored geomag distribution registration 
added placeholder pattern so the plugin doesn't generate warnings


Former-commit-id: a0fea52583 [formerly 2563b644bd] [formerly 2ebc0a6ae5] [formerly a0fea52583 [formerly 2563b644bd] [formerly 2ebc0a6ae5] [formerly 21efc74635 [formerly 2ebc0a6ae5 [formerly fa73924a9c98705d00e6b68203e0cbe418e4cf01]]]]
Former-commit-id: 21efc74635
Former-commit-id: 6a46acc274 [formerly d4ecee9f39] [formerly c2d1a541c08efa40428c6c7f10f8c21832d2cbb6 [formerly e78872a6ac]]
Former-commit-id: 38a2e2c0725920aefd774b1832f8c76b905c9cbd [formerly 7aae4fa258]
Former-commit-id: 1bb316fbb1
 2014-05-22 09:13:52 -05:00
Brian Clements
909345c186 Omaha #2536 fix TAF period clone issue 
taf period values may be null, copy must account for that


Former-commit-id: 6359da2ee0 [formerly acb4515f36] [formerly 6587ea9f4c] [formerly 6359da2ee0 [formerly acb4515f36] [formerly 6587ea9f4c] [formerly 2a362cd0e1 [formerly 6587ea9f4c [formerly 51fec9906d4221595995c4b54a6affad420f6739]]]]
Former-commit-id: 2a362cd0e1
Former-commit-id: fb2a477299 [formerly c5a58d9c86] [formerly b9731a501d42d54818a16206f53fd6760636f928 [formerly 3055830ae1]]
Former-commit-id: f3383c19ff40a81e5db6063e9dc94ae1d88c85be [formerly 7d00def606]
Former-commit-id: 27e91ec4f3
 2014-05-15 15:17:33 -05:00
Steve Harris
06a67b62d7 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Former-commit-id: 7f0f5eb7d2 [formerly 5e6b9943f1] [formerly 1a06d18686] [formerly 7f0f5eb7d2 [formerly 5e6b9943f1] [formerly 1a06d18686] [formerly c83753b4d3 [formerly 1a06d18686 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]]]
Former-commit-id: c83753b4d3
Former-commit-id: 69b7a4f424 [formerly 3337f2d6d1] [formerly 39d1a11174e4bc3e15c9f3fc5d6ccca4f431fadb [formerly 1b709fb6c3]]
Former-commit-id: e56b4024532ba4aa1ca898f4bf3ab5fdc16c3b3b [formerly 3e4e9365ca]
Former-commit-id: dfc96a2fae
 2014-05-15 08:31:27 -05:00
Brian Clements
2a628638f3 Omaha #2536 moved WMO Header into new common plugin 
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 95a233a3a0 [formerly 437d9bb781] [formerly 2b1c7eaa37] [formerly 95a233a3a0 [formerly 437d9bb781] [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly 2b1c7eaa37 [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: f291884a77 [formerly abd29bf492] [formerly b75f809dcbc407fb62db7fd2cd75e86e51c75269 [formerly ee9757ea39]]
Former-commit-id: 2b23fa6944d3b14df8bcd8b466b79df2877328aa [formerly e9ee0bcbde]
Former-commit-id: 7473191ba6
 2014-05-14 13:45:09 -05:00
Nate Jensen
73ba831a9b Omaha #3152 remove NCEP logging code that doesn't work 
Change-Id: Ia08e1b70c44e00254118b2aac714105c0d4ad517

Former-commit-id: e492ad07fb [formerly 151fc9f24b] [formerly 5f9c015084] [formerly e492ad07fb [formerly 151fc9f24b] [formerly 5f9c015084] [formerly 857a44826c [formerly 5f9c015084 [formerly 479409049a379d033c58721f649e474cda42a7d0]]]]
Former-commit-id: 857a44826c
Former-commit-id: 1e0ba397bc [formerly 4934a81bad] [formerly 2d47e76ba4376dc64c0ed8773d332fc7c7fca186 [formerly f9f8262714]]
Former-commit-id: c5aab7b0dc9b2a6e73fe242db2f400f7cfee6fb7 [formerly bd51c3a863]
Former-commit-id: d209708590
 2014-05-13 16:16:12 -05:00
Nate Jensen
efb6e80251 Omaha #3160 remove OBE ncep util plugins 
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808

Former-commit-id: ba596d4848 [formerly 548d5ec519] [formerly bb1414677e] [formerly ba596d4848 [formerly 548d5ec519] [formerly bb1414677e] [formerly 5353d06ab6 [formerly bb1414677e [formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]]]]
Former-commit-id: 5353d06ab6
Former-commit-id: 0a9d07c03e [formerly c7a0638666] [formerly ff4d9e2a307083ca04a656b025dc3e8ffe1dc55f [formerly 06d07c9ca4]]
Former-commit-id: 8032d883831f12af35b0cccd9de51d93925f2d2c [formerly 1d94867dd6]
Former-commit-id: aff00030d5
 2014-05-13 13:28:20 -05:00
Brad Gonzales
abcc76cfd3 Issue #2873 Revert the deletion of the ncep nsharp win32 project. 
Amend:  added the gov.noaa.nws.ncep.ui.nsharp.win32 plugin dependency back to the com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml.

Change-Id: Ic801fbfd81c691298751d0bafbc4d96ba1457776

Former-commit-id: 0dd37a6075 [formerly 4e597afe11] [formerly b341c10bb4] [formerly 0dd37a6075 [formerly 4e597afe11] [formerly b341c10bb4] [formerly 9c86a55171 [formerly b341c10bb4 [formerly 8209ff5c53bb117b8a18b2923952b289e3021762]]]]
Former-commit-id: 9c86a55171
Former-commit-id: 9b2a9e4769 [formerly 04fb0a773c] [formerly b7a4f85e6c9b35e68a396ec8f252f41297781127 [formerly 40f9f6e788]]
Former-commit-id: 7dbd49bc3209b3e7b01f9e5afd84b569c2a788ca [formerly 5496aab450]
Former-commit-id: 2023a2156a
 2014-05-12 16:59:16 -05:00
Steve Harris
32c6a48a39 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java

Former-commit-id: 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 6964df0664 [formerly 652fb19bc4 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]]
Former-commit-id: 6964df0664
Former-commit-id: 7f7e8e69a4 [formerly 77b2da7a4f] [formerly 9655787e1bc6f95e4e9dab9054aa147d706bdd37 [formerly 661eceea83]]
Former-commit-id: 343ac38383e296e3ae1f421f8cf6238df294b55b [formerly d33fbe7c31]
Former-commit-id: ae3bc184ce
 2014-05-12 15:05:43 -05:00
Brian Clements
c0df43a64d Omaha #2733 changes to match ufcore distribution pattern changes 
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns


Former-commit-id: 4d2d5f81df [formerly 243ba8476a] [formerly 8b07016f25] [formerly 4d2d5f81df [formerly 243ba8476a] [formerly 8b07016f25] [formerly 316bfe3b6f [formerly 8b07016f25 [formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]]]
Former-commit-id: 316bfe3b6f
Former-commit-id: 26064a9629 [formerly 546cf300df] [formerly fbf8cffad16b3edb70ad15a4742dcdc5c87e748c [formerly 9cc5ee88b5]]
Former-commit-id: 1acad5dacb5b2d6f53d36dcf979d6af776115058 [formerly a1f23d2c7b]
Former-commit-id: 4a6011ce6c
 2014-05-12 09:14:28 -05:00
Bryan Kowal
c3507216ab Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA. 
Amend: updated and/or added change revision history comments
Amend: fixed Java requirement in JNA classpath
Amend: fixed Java requirement in JNA MANIFEST

Change-Id: I5033f05c48a271fe08d3ec2ac01fe79481564371

Former-commit-id: 70db1c7dc7 [formerly 79244f5032] [formerly 1e1f46e68b] [formerly 70db1c7dc7 [formerly 79244f5032] [formerly 1e1f46e68b] [formerly 9c29e6739c [formerly 1e1f46e68b [formerly fb12234836a3562156a30531e6961c0a064588bd]]]]
Former-commit-id: 9c29e6739c
Former-commit-id: 5fc64e628b [formerly 2098b015f1] [formerly 76e1a6eaf85a9ea37060e092691ba1ca871a7e9e [formerly c1e9154e89]]
Former-commit-id: 491c71dfd490dfdd3f6e724c9a0449ec60e6848b [formerly ec41dab6d0]
Former-commit-id: a07ad6724e
 2014-05-08 17:30:22 -05:00
Ben Steffensmeier
f1d28d027f Issue #2947 Redo satellite derived parameters to use an inventory to determine availability. 
Former-commit-id: 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 709e3411c4 [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 858deeaef5 [formerly a51b965c4f] [formerly 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01]]
Former-commit-id: fc1291a1e39fed83821a2edd5ba3bf44aa962f2a [formerly cc6d858f47]
Former-commit-id: 3c1adead47
 2014-04-16 14:54:59 -05:00
Nate Jensen
dd609f2851 Issue #2984 remove dead ncep purge util plugin and web page 
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829

Former-commit-id: 55ed6aa760 [formerly c81c44d15f] [formerly e081847225] [formerly 55ed6aa760 [formerly c81c44d15f] [formerly e081847225] [formerly 7726f144ed [formerly e081847225 [formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]]]]
Former-commit-id: 7726f144ed
Former-commit-id: 6c02a78f95 [formerly 5ca97d5798] [formerly 65f09770f2a186fb119737c7f34c08d45089e7d3 [formerly 56e7b21e35]]
Former-commit-id: aaa258f18e8d3796d03ac56aab36317cfdb75639 [formerly f2a1345c0b]
Former-commit-id: 6a47b92f5a
 2014-04-15 11:16:24 -05:00
Nate Jensen
148a31d3ad Issue #2984 remove unnecessary plugins from features 
remove unnecessary uengine dependencies from manifests

Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d

Former-commit-id: c0df96e085 [formerly e24940ead6] [formerly 6e2d68e102] [formerly c0df96e085 [formerly e24940ead6] [formerly 6e2d68e102] [formerly 57f2357f10 [formerly 6e2d68e102 [formerly c59a5d99ce31464bacd7c266543f10f523719a07]]]]
Former-commit-id: 57f2357f10
Former-commit-id: dacc1d5996 [formerly 97f09968b3] [formerly dad31d1699bb36bcaccd3d7e306c1af3e1f8b973 [formerly d435258fce]]
Former-commit-id: 08b4ba0f6890ecc9a2f8f524712a671b0d736980 [formerly 9ad8236b8d]
Former-commit-id: 697a7f5b9b
 2014-04-14 16:50:54 -05:00
Richard Peter
5350b3eac8 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
 2014-04-14 13:10:11 -05:00
Richard Peter
626ab0bd58 Merge branch 'omaha_14.2.2' (14.2.2-3) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
 2014-04-11 16:23:09 -05:00
Nate Jensen
e2273ed91d Merge "Issue #2950 Support dynamic color counts for color map editing." into development 
Former-commit-id: 992a00b18c [formerly 6989999e95] [formerly 5129002e91] [formerly 992a00b18c [formerly 6989999e95] [formerly 5129002e91] [formerly 5bad21f3e6 [formerly 5129002e91 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 7c7b5851a7 [formerly 58516f3a9f] [formerly 80e6eaeae66bf6576685319ea3e0cf04186e38c2 [formerly 92f0182d3f]]
Former-commit-id: a18f7fab710c311296f870364da3764831a1befa [formerly a08e3a4f1a]
Former-commit-id: 4fe2e3a01b
 2014-04-09 11:20:04 -05:00
Everett Kladstrup
f815fbcb60 Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9 [formerly 86bf2b5ea0] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a]
Former-commit-id: 7b2683532a
 2014-04-09 09:31:12 -05:00
Ben Steffensmeier
883474adf0 Issue #2950 Support dynamic color counts for color map editing. 
Former-commit-id: c23ef56706 [formerly 9d7504e2c3] [formerly c5a48642eb] [formerly c23ef56706 [formerly 9d7504e2c3] [formerly c5a48642eb] [formerly c805a5fed7 [formerly c5a48642eb [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]]
Former-commit-id: c805a5fed7
Former-commit-id: 4c72a79253 [formerly cf3456c6cd] [formerly be88286e2cfc17a580f9a83f0f911cee38d4ed27 [formerly 16446101a4]]
Former-commit-id: 075aeccc30fd1d6a00f2c10de006958f3601b57d [formerly e0ff68736e]
Former-commit-id: 80476e1f60
 2014-04-08 15:27:57 -05:00
Ben Steffensmeier
1aa51a118b Issue #2874 Initial implementation of RTOFS data. 
Former-commit-id: 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 26558fad1e [formerly aadc22091e] [formerly 17445664d752b4ffa0186bdce951baaffefd1f21 [formerly ab8293c6a1]]
Former-commit-id: b8e1bca2fe93a3c4fa125052086c7d64a243b406 [formerly d20a1a6f54]
Former-commit-id: 77d809f66a
 2014-03-24 11:10:18 -05:00
Brad Gonzales
b404e07694 Issue #2873 Removed 32 bit native libraries and references. 
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 189234f162 [formerly 08dde4824f [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]]
Former-commit-id: 189234f162
Former-commit-id: 02a20c0e37 [formerly 0022633626] [formerly b1f2574d3b73438b586d2b8edcd4477283696b6d [formerly d303662a51]]
Former-commit-id: 9d6f627b3d954f1806f2ed939de355f3fe6bafcb [formerly f859a625d0]
Former-commit-id: 412262edcf
 2014-03-20 13:27:39 -05:00
Nate Jensen
8ad61a23c0 Issue #2919 fix windows error due to gempak library missing 
Former-commit-id: a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly 82ee3e7104 [formerly 747ac58166 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 0dd42bbdc2 [formerly 07d2a4f40c] [formerly 8865ef5c8523a5ad4eab9d7ab74db2f4ee390b98 [formerly 24eadadffd]]
Former-commit-id: 7ebb0aa7faa5174e83081cdcc16795ddf83ed95e [formerly 557c180e6d]
Former-commit-id: 8ac503de37
 2014-03-20 09:38:07 -05:00
Steve Harris
24c55c616c Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
 2014-03-17 15:55:41 -05:00
Nate Jensen
87eaf289e1 Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development 
Former-commit-id: a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly 27625eb93a [formerly 540d0f2e1d [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]]]
Former-commit-id: 27625eb93a
Former-commit-id: c2fde2241e [formerly 5f554ade56] [formerly 685d628805abded0ae9728b016ad3cb6833fc05a [formerly d8edb8e91b]]
Former-commit-id: a39642ba88c4d15d783728b3396c1262932e9519 [formerly 432926c40b]
Former-commit-id: b8b63869ed
 2014-03-13 11:16:00 -05:00
Ron Anderson
9accd00e1f Issue #2718 Update to GeoTools 10.5 
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: cbd408ce4e [formerly 06b0b5b684] [formerly c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]]
Former-commit-id: cfe7b7159bee965bab52438c7b1f622e5351016b [formerly 4ffc16ce53]
Former-commit-id: 98e22f6e59
 2014-03-13 11:11:53 -05:00
Bryan Kowal
49142d88a1 Issue #2851 - initial 64-bit build of the bignsharp DLL 
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win32/bignsharp.dll: PE32 executable for MS Windows (DLL) (console) Intel 80386 32-bit
file ./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll
./ncep/gov.noaa.nws.ncep.ui.nsharp.win64/bignsharp.dll: PE32+ executable for MS Windows (DLL) (console) Mono/.Net assembly

Amend: update Java version and Plugin version

Change-Id: I377e8b51eb9d7fd9964092040d1bcde3f9bcfd27

Former-commit-id: 40578d5fe0 [formerly b0de1fba76] [formerly cac6709da8] [formerly 40578d5fe0 [formerly b0de1fba76] [formerly cac6709da8] [formerly 438e594868 [formerly cac6709da8 [formerly 3189f870d55219372438213441fd1359a6bb5cc4]]]]
Former-commit-id: 438e594868
Former-commit-id: cfe069e216 [formerly fe9b652d52] [formerly deff90d8a30f3ac8617a91216fe1f97ec2c6f28a [formerly 9ec8e864a7]]
Former-commit-id: 114c71d431ade597e2d6c55cf0917beb0ccb9af7 [formerly 2c101a12dd]
Former-commit-id: 3440a5b64c
 2014-03-11 16:47:11 -05:00
Brian.Dyke
0a1ef77d16 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 8d4a1e1204 [formerly 24785068be] [formerly d710aec521] [formerly 8d4a1e1204 [formerly 24785068be] [formerly d710aec521] [formerly fda6ab1344 [formerly d710aec521 [formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]]]
Former-commit-id: fda6ab1344
Former-commit-id: d197a72c20 [formerly c5502af3fa] [formerly 6ec1b00cf64c71cead90fca582edef188ec24710 [formerly 0aff5875b0]]
Former-commit-id: 28dc637ae8563b78153684cbfa60e954caea69c9 [formerly dcade6e18a]
Former-commit-id: 26e19974d1
 2014-03-10 15:14:59 -04:00
Ben Steffensmeier
fd2fbe839d Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]
Former-commit-id: 8650074737
Former-commit-id: bf5b777b0d [formerly 5e4c35e93f] [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]]
Former-commit-id: 97f709f323c3b2bc50eb72f596874288c2f388b5 [formerly a1ac082c94]
Former-commit-id: ad4ce67e85
 2014-03-07 18:15:32 -06:00
Stephen Gilbert
806b78cf4d VLab Issue #3224 - NSHARP: Fix erroneous mixing heights 
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: 8560c21c50 [formerly 200c7e60da] [formerly 65dd8b4c3c] [formerly 8560c21c50 [formerly 200c7e60da] [formerly 65dd8b4c3c] [formerly f203a4c035 [formerly 65dd8b4c3c [formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]]]
Former-commit-id: f203a4c035
Former-commit-id: 803a4584c9 [formerly 00c1f40997] [formerly ad4b7bcc63f7e8c66ec4b0f39eea3f4a987956f1 [formerly 46ebeb9969]]
Former-commit-id: d34facf3627b4a21886984446a4d5d04222a5da1 [formerly abb11feb16]
Former-commit-id: aaa14d1b1d
 2014-03-07 19:10:08 -05:00
Stephen Gilbert
e3d279329d VLab Issue #3223 - NSHARP: Improve selection operation 
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: ba4869af46 [formerly 5fcb45a629] [formerly 9a457213bb] [formerly ba4869af46 [formerly 5fcb45a629] [formerly 9a457213bb] [formerly e3aedaa1d6 [formerly 9a457213bb [formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]]]
Former-commit-id: e3aedaa1d6
Former-commit-id: fb4c74e0cd [formerly c4b73eb02e] [formerly c9da8cd134141da14e27b89961b37aff9bce21eb [formerly b1e1d9178a]]
Former-commit-id: d2c9ed404a1b1977c532dfd66aa6f8681ccc6fad [formerly 05328b9103]
Former-commit-id: 08b8f4c679
 2014-03-07 19:07:28 -05:00
Stephen Gilbert
5652cbdde4 VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP 
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 78e4214f3d [formerly a7fd09a409] [formerly 1632166902] [formerly 49a6d6ec7e [formerly 1632166902 [formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: fee37acf0c [formerly 6d40a42c39] [formerly cf3ae4ba60186788d49675c04096c67eee23603a [formerly de6e50d8e6]]
Former-commit-id: 6488fc0d38e5381f3847719213a5fbb4e7249d10 [formerly 40a62c63cd]
Former-commit-id: 5eea989db5
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
3787125175 VLab Issue #3221 - Fix XML serialization problems 
A few problems reading/writing XML files were noticed after upgrading to
14.2.1.  This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.

Change-Id: I8aad4197029c70f72612299a25329687892884af

Former-commit-id: 6f8caa3515 [formerly cce06bfbe3] [formerly 625fcb0064] [formerly 6f8caa3515 [formerly cce06bfbe3] [formerly 625fcb0064] [formerly 6dd6ae8d36 [formerly 625fcb0064 [formerly 4f58998c899e28521658bf17dee852592c534713]]]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: b69374b56d [formerly ce73240c40] [formerly 53869af84fd3c1760276c2fccf36acd25767d8aa [formerly 204d047289]]
Former-commit-id: 24c6ee760a153abacd30869121c5aeaaddae79fa [formerly ebafac1725]
Former-commit-id: e0f2f91b21
 2014-03-07 18:36:42 -05:00
Steve Harris
9c0f484340 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
 2014-03-07 15:43:40 -06:00
Steve Harris
3348f6857a Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
 2014-03-07 15:16:18 -06:00
Brian.Dyke
15a5404df3 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 92bff38059 [formerly 48cc3b6c55] [formerly 3ac2a61218] [formerly 92bff38059 [formerly 48cc3b6c55] [formerly 3ac2a61218] [formerly 1fe5504d4c [formerly 3ac2a61218 [formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 1f7e61b3df [formerly 48f1f544d6] [formerly a7d6f4f47c9df94b8ae88988530dc06d80b92b0a [formerly 0c4b9469b0]]
Former-commit-id: abc0a250d76460ad95e9e08c0cae29d6d481bfd2 [formerly 795c5424cb]
Former-commit-id: d9f1b98ce7
 2014-03-07 11:50:06 -05:00
Steve Harris
a19beb1e5d Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
 2014-03-06 08:39:43 -06:00
Steve Harris
b7bde83b40 Merge branch 'master_14.2.1' into ncep_14.2.1 
Former-commit-id: 18ae41769e [formerly 1a666f9f71] [formerly 167ce61d6c] [formerly 18ae41769e [formerly 1a666f9f71] [formerly 167ce61d6c] [formerly 4b01c57c0a [formerly 167ce61d6c [formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]]]
Former-commit-id: 4b01c57c0a
Former-commit-id: 8dcd31be32 [formerly 12d8ff2fce] [formerly 6f64a4f733692a35b9219e001f7c17834f34eb7c [formerly 6e361c0a57]]
Former-commit-id: b13ffe319da176594078f6a0b2c43783b9cba1cd [formerly b00cecc2ab]
Former-commit-id: 86476b5064
 2014-03-05 13:00:23 -06:00
Max Schenkelberg
7c66cf792b Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values. 
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26 [formerly 39e1c4fa46] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134]
Former-commit-id: c6cf08db73
 2014-03-04 09:23:36 -06:00
Brian Clements
dbb33ceac2 Issue #2667 fixed bin lightning menus 
the column name for the source of the lightning data was changed


Former-commit-id: dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]]
Former-commit-id: 7a7d476899
Former-commit-id: 472d08d2ad [formerly bf4c119278] [formerly dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f]]
Former-commit-id: fcbaab390c314bd0db75b372cf855bd45a12a942 [formerly dc8667011b]
Former-commit-id: 44fdea985e
 2014-03-03 13:17:05 -06:00
Richard Peter
ef2ff1d0f7 Merge branch 'omaha_14.2.1' (14.2.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
 2014-02-27 15:18:26 -06:00
Richard Peter
7f36cf564b Issue #2509: Fix Merge of 13.5.2-4 ncep resources 
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]
Former-commit-id: 862069dfd3
Former-commit-id: 9f43d8e4b2 [formerly 237ada7b8b] [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3]]
Former-commit-id: 1a965b16ce71e4ece17a9ac8efbc506a1d823b59 [formerly 9489565efb]
Former-commit-id: 68eade49a2
 2014-02-27 13:46:47 -06:00
Brian.Dyke
de9e6553a9 OB_14.1.1-19 baseline 
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
 2014-02-21 06:50:59 -05:00
Ron Anderson
41a6f52eff Issue #2819 Removed more unnecessary .clone() calls 
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 84bea14340 [formerly 908e43039e] [formerly ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]]
Former-commit-id: a122ae5f46b63941580c026c45106c52001929d6 [formerly b0a4b63689]
Former-commit-id: e91fd1d683
 2014-02-19 11:55:11 -06:00
Greg Armendariz
8a8127ab0c Issue #2754 - Fix import 
Former-commit-id: 11db377bf8 [formerly 5490e216be] [formerly e611dbe912] [formerly 11db377bf8 [formerly 5490e216be] [formerly e611dbe912] [formerly 2e79658417 [formerly e611dbe912 [formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]]]]
Former-commit-id: 2e79658417
Former-commit-id: 4cc403c2e7 [formerly 744c6fd9b1] [formerly 7f15c3386a71f2f598d58c1cb6cc6594a4e6792d [formerly 23f17b3f63]]
Former-commit-id: 0b20dae07d945ca03185d36e38562999d99055f7 [formerly ac169b4f24]
Former-commit-id: e47453df3b
 2014-02-03 14:45:47 -06:00
Stephen Gilbert
c13f9333a0 VLab Issue #2916 - NSHARP Errors Swapping into main pane 
Fixed some widget management errors in the Show Text dialog's close
method.  Ensure Text Dislog's close method is called when swapping
Nsharp display.
    
Change-Id: I6e645aa552980b49e552a2830f9f148d95f27f3b

Former-commit-id: 5b447b3861 [formerly d849e051c8] [formerly ba72d87f07] [formerly 5b447b3861 [formerly d849e051c8] [formerly ba72d87f07] [formerly 3f6c7ef92c [formerly ba72d87f07 [formerly 0ff12f2c322d9cbed696f9ee4f2049d9efed7863]]]]
Former-commit-id: 3f6c7ef92c
Former-commit-id: e8ba3c7e61 [formerly 838a8e4faa] [formerly 792d509298c3b21bbd4b328b20b94425de1790d8 [formerly 323eeb31c9]]
Former-commit-id: 600b0e7e1ca25aab2ffe37f80a32a6ca264bcc5b [formerly e4c1561c19]
Former-commit-id: df9518ae2b
 2014-02-03 14:55:25 -05:00
Steve Harris
95a936e9dc Merge branch 'omaha_14.2.1' into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: f1a9ec2d1e [formerly ae2b849157] [formerly 7a156e297a] [formerly f1a9ec2d1e [formerly ae2b849157] [formerly 7a156e297a] [formerly 7b59bd41eb [formerly 7a156e297a [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 116d836ab3 [formerly 4a379aa6e5] [formerly 675dc12528eb749e423c405fa15dbe8b66201362 [formerly aa9b488963]]
Former-commit-id: 0dd75fee1d6fbdae1f20d879a1069b131d9cd16f [formerly b9af02c0b3]
Former-commit-id: e6cab2a902
 2014-02-03 10:29:16 -06:00
Steve Harris
b016112b8f Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]]
Former-commit-id: eb9d4319dc
Former-commit-id: ae4332665e [formerly 6883c64744] [formerly 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906]]
Former-commit-id: 538ff84c8a7daabd62a35c1ea90e3f4c3651fc70 [formerly d8989145ac]
Former-commit-id: 08700a77b1
 2014-02-03 10:26:11 -06:00
Brian.Dyke
4deb06cc50 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 8b06bfd2f9 [formerly 89b824b846] [formerly 4e7b1b207f] [formerly 8b06bfd2f9 [formerly 89b824b846] [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 4e7b1b207f [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 1f222c489d [formerly 3fd2ef82ab] [formerly f0782f5fb1a9ed0a419e5942875e692fbf816d81 [formerly dd183bc0e9]]
Former-commit-id: 7e826c4c3fd87de1a5c5fc4057ef18e6c2819ffe [formerly df55ab5503]
Former-commit-id: a540be3064
 2014-01-31 08:28:09 -05:00
Stephen Gilbert
8e70fc371e VLab Issue #2867 - Remove dependency on Mcidas dataplugin 
Removed the dependency for mcidas dataplugin.  The ncep feature
dependencies don't allow for that causing an error in the build scripts.

Change-Id: I9cccc6d93158465f54cb0d9db0e57b16604e1d09

Former-commit-id: 17598bc377 [formerly beaee1eaf0] [formerly c9af367a72] [formerly 17598bc377 [formerly beaee1eaf0] [formerly c9af367a72] [formerly 0e96169b6f [formerly c9af367a72 [formerly 0fa8b0ae9f21df9a1d773edd7e997151c6db9c8f]]]]
Former-commit-id: 0e96169b6f
Former-commit-id: bad69bc7e1 [formerly e0e74ad5fd] [formerly b1f331f4a7e0b7dacbc9abc9350a207b7d9b3eac [formerly 71e8735fdf]]
Former-commit-id: df5950ccef02530cec5110e181a176e1490ff078 [formerly f5327455c3]
Former-commit-id: e60e1873c0
 2014-01-29 09:58:10 -05:00
Stephen Gilbert
ec4d735498 VLab Issue #2867 - Add dependency for Mcidas dataplugin 
Don't like it, but added a dependency for mcidas dataplugin to the
gov.noaa.nws.ncep.vix.common plugin.

Change-Id: Ie8aff1c3ae1733191cb74b7dc0c4593bb37ca28b

Former-commit-id: d19279fbab [formerly e60635f47d] [formerly ac68b01bbc] [formerly d19279fbab [formerly e60635f47d] [formerly ac68b01bbc] [formerly f21b0f5d82 [formerly ac68b01bbc [formerly 61c5dce6e5ee16d776bcac2740ddf4e860fbb40f]]]]
Former-commit-id: f21b0f5d82
Former-commit-id: cbf5fd5372 [formerly 29ca14c4b7] [formerly e88492cf6e3b7e15e084b09596f70de340b6008e [formerly 486096ada2]]
Former-commit-id: 6a2f8151cb7e1256817c6b8baaf36f96dd1e7fa8 [formerly fb46c34d1c]
Former-commit-id: 39c149a747
 2014-01-28 14:52:46 -05:00
Stephen Gilbert
d55a30413e Merge "VLab Issue #2867 - NCEP CAVE plugin delivery for 14.2.1" into ncep_14.2.1 
Former-commit-id: 90917307fb [formerly 312a09983a] [formerly 64c2460028] [formerly 90917307fb [formerly 312a09983a] [formerly 64c2460028] [formerly 1af8bfa176 [formerly 64c2460028 [formerly b928cda17148473922bcd3ad11e33cc93c1e37c3]]]]
Former-commit-id: 1af8bfa176
Former-commit-id: 7607cd015b [formerly 7f3e8b5c21] [formerly 4713e121a372bd9e590289df0e094c3f4646818c [formerly d62a9f3b08]]
Former-commit-id: e37e62740f5ac23fd6116df99c13fa498b772dd0 [formerly 05655af06b]
Former-commit-id: 202f929a5f
 2014-01-27 14:23:02 -05:00