Brian Clements
f2db2d8fef
Omaha #3179 split modes.xml into plugin modes files
...
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a
Former-commit-id: 2baee319de
[formerly 5e39a68498
] [formerly 334bb53dea
[formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]
Former-commit-id: 334bb53dea
Former-commit-id: d79c63a429
2014-05-28 13:32:18 -05:00
Nate Jensen
8f3b574120
Merge "Omaha #2670 Fix airep manifest to work with CAVE spring." into omaha_14.4.1
...
Former-commit-id: 3747f80c89
[formerly 5be7360043
] [formerly 18a3239fd5
[formerly d9d68507505fa1b45f47a6b92148dca7884ccb1b]]
Former-commit-id: 18a3239fd5
Former-commit-id: 588337605b
2014-05-27 15:49:00 -05:00
Ben Steffensmeier
a9078dd9cb
Omaha #2669 add support for data access framework to pirep.
...
Former-commit-id: 0be1e981aa
[formerly 7570a24b10
] [formerly dd13f31356
[formerly c37d85ba479b8df38c90df522059b0c58eea6005]]
Former-commit-id: dd13f31356
Former-commit-id: 04cae3aad7
2014-05-27 15:20:09 -05:00
Ben Steffensmeier
e6b9bccfc8
Omaha #2670 Fix airep manifest to work with CAVE spring.
...
Former-commit-id: d47c9fbd9c
[formerly 46d737e01b
] [formerly 942bf638af
[formerly 7dccca4d1c97ea8d97fb46b8ef1fa139a92b22b5]]
Former-commit-id: 942bf638af
Former-commit-id: 4d5b86a29d
2014-05-27 15:19:05 -05:00
Ben Steffensmeier
a29c82ffea
Omaha #2670 add support for data access framework to airep plugin.
...
Former-commit-id: 80fa485848
[formerly a58bc7a8d4
] [formerly 46c69e7d74
[formerly 56c528cf5727954431298c955a506d54cd5921ad]]
Former-commit-id: 46c69e7d74
Former-commit-id: 101b7c3516
2014-05-27 13:38:09 -05:00
Steve Harris
aebe44aec5
Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
Former-commit-id: 498ff9235d
[formerly 211e5f8197
] [formerly 7da3d7461f
[formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]
Former-commit-id: 7da3d7461f
Former-commit-id: 51f8c81f33
2014-05-23 08:16:43 -05:00
Stephen Gilbert
2c50057a68
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Removed dependency on persistCamelRegistered from ncgrib spring config
Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8
Former-commit-id: 0dff405bc4
[formerly 3b8233dd88
] [formerly 4299e7c72c
[formerly a7140f38a54a577dd2d62cc551ab182b561f6fc0]]
Former-commit-id: 4299e7c72c
Former-commit-id: e07ae7a2f2
2014-05-22 14:35:49 -04:00
Stephen Gilbert
86953e803e
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 14258764bd
[formerly 91d469eb90
] [formerly 7992a6b15b
[formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]
Former-commit-id: 7992a6b15b
Former-commit-id: 7aaf3f44bc
2014-05-22 12:39:09 -04:00
Brian Clements
d4ecee9f39
Omaha #2733 restored geomag distribution registration
...
added placeholder pattern so the plugin doesn't generate warnings
Former-commit-id: 2563b644bd
[formerly 2ebc0a6ae5
] [formerly 21efc74635
[formerly fa73924a9c98705d00e6b68203e0cbe418e4cf01]]
Former-commit-id: 21efc74635
Former-commit-id: e78872a6ac
2014-05-22 09:13:52 -05:00
Stephen Gilbert
042ca4e3ac
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans
Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c
Former-commit-id: 5885bff027
[formerly 57cf6c4bd7
] [formerly e1b0c5f102
[formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]]
Former-commit-id: e1b0c5f102
Former-commit-id: 66295d65c5
2014-05-15 18:31:17 -04:00
Stephen Gilbert
2c95dc0f33
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
PGEN Bug Fixes
Change-Id: Ie50d8f829e0dfb00fab254945a46592553cdb59c
Former-commit-id: be04b1b1d9
[formerly e71b522740
] [formerly d6f370db60
[formerly 2f93fd7bdbcf1fa4698dfc2dd51c377db6d809b6]]
Former-commit-id: d6f370db60
Former-commit-id: c0e6cd6c50
2014-05-15 17:40:04 -04:00
Stephen Gilbert
cc68098978
VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
...
Localization/configuration file updates
Change-Id: I489d8228f17534234cd8ea20e10a137a17bad054
Former-commit-id: cb483a72ff
[formerly 60b9ec665b
] [formerly 4f2a631e66
[formerly c55835291b5d2bbe24c4398851e23a5c28d5e582]]
Former-commit-id: 4f2a631e66
Former-commit-id: 6f18460949
2014-05-15 17:25:39 -04:00
Stephen Gilbert
2e9673e057
VLab Issue #3722 - SWPC delivery for 14.3.1
...
Upgrades to Geomag and solar image processing
Change-Id: Ibe33d00843419e34998274a87734f3f29d2b63dc
Former-commit-id: ed8b7bc0cb
[formerly 5da74a455d
] [formerly 4d2154d2de
[formerly c9bcc3d15adcea014696e5cd68b9688506ee07d9]]
Former-commit-id: 4d2154d2de
Former-commit-id: c3b1cda7c5
2014-05-15 17:24:13 -04:00
Stephen Gilbert
da02372ba6
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 4602f86f47
[formerly bd2dad11b5
] [formerly ca9b7c8dfc
[formerly 3c904361e7176592cc873a3414c18ad5107aea54]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: 4e5968d7b6
2014-05-15 17:20:52 -04:00
Brian Clements
c5a58d9c86
Omaha #2536 fix TAF period clone issue
...
taf period values may be null, copy must account for that
Former-commit-id: acb4515f36
[formerly 6587ea9f4c
] [formerly 2a362cd0e1
[formerly 51fec9906d4221595995c4b54a6affad420f6739]]
Former-commit-id: 2a362cd0e1
Former-commit-id: 3055830ae1
2014-05-15 15:17:33 -05:00
Steve Harris
3337f2d6d1
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: 5e6b9943f1
[formerly 1a06d18686
] [formerly c83753b4d3
[formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]
Former-commit-id: c83753b4d3
Former-commit-id: 1b709fb6c3
2014-05-15 08:31:27 -05:00
Brian Clements
abd29bf492
Omaha #2536 moved WMO Header into new common plugin
...
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: 437d9bb781
[formerly 2b1c7eaa37
] [formerly 6bd43f79ff
[formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]
Former-commit-id: 6bd43f79ff
Former-commit-id: ee9757ea39
2014-05-14 13:45:09 -05:00
Nate Jensen
4934a81bad
Omaha #3152 remove NCEP logging code that doesn't work
...
Change-Id: Ia08e1b70c44e00254118b2aac714105c0d4ad517
Former-commit-id: 151fc9f24b
[formerly 5f9c015084
] [formerly 857a44826c
[formerly 479409049a379d033c58721f649e474cda42a7d0]]
Former-commit-id: 857a44826c
Former-commit-id: f9f8262714
2014-05-13 16:16:12 -05:00
Nate Jensen
c7a0638666
Omaha #3160 remove OBE ncep util plugins
...
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808
Former-commit-id: 548d5ec519
[formerly bb1414677e
] [formerly 5353d06ab6
[formerly d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0]]
Former-commit-id: 5353d06ab6
Former-commit-id: 06d07c9ca4
2014-05-13 13:28:20 -05:00
Brad Gonzales
04fb0a773c
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: 4e597afe11
[formerly b341c10bb4
] [formerly 9c86a55171
[formerly 8209ff5c53bb117b8a18b2923952b289e3021762]]
Former-commit-id: 9c86a55171
Former-commit-id: 40f9f6e788
2014-05-12 16:59:16 -05:00
Steve Harris
77b2da7a4f
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: b3bc71c8a4
[formerly 652fb19bc4
] [formerly 6964df0664
[formerly a20833879f1a0434c562a22a874b1e1722278954]]
Former-commit-id: 6964df0664
Former-commit-id: 661eceea83
2014-05-12 15:05:43 -05:00
Brian Clements
546cf300df
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: 243ba8476a
[formerly 8b07016f25
] [formerly 316bfe3b6f
[formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]
Former-commit-id: 316bfe3b6f
Former-commit-id: 9cc5ee88b5
2014-05-12 09:14:28 -05:00
Bryan Kowal
2098b015f1
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: 79244f5032
[formerly 1e1f46e68b
] [formerly 9c29e6739c
[formerly fb12234836a3562156a30531e6961c0a064588bd]]
Former-commit-id: 9c29e6739c
Former-commit-id: c1e9154e89
2014-05-08 17:30:22 -05:00
Ben Steffensmeier
a51b965c4f
Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
...
Former-commit-id: bb51fb299a
[formerly 709e3411c4
] [formerly a8bb2c0dfd
[formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 119ced4a01
2014-04-16 14:54:59 -05:00
Nate Jensen
5ca97d5798
Issue #2984 remove dead ncep purge util plugin and web page
...
Change-Id: Ifca01d858586ce3bf968f4b1203eb9853be97829
Former-commit-id: c81c44d15f
[formerly e081847225
] [formerly 7726f144ed
[formerly 9f01e8a242ba44dec510fdc5ca75be566f8fa008]]
Former-commit-id: 7726f144ed
Former-commit-id: 56e7b21e35
2014-04-15 11:16:24 -05:00
Nate Jensen
97f09968b3
Issue #2984 remove unnecessary plugins from features
...
remove unnecessary uengine dependencies from manifests
Change-Id: Ic76eb5faa4b14cb4ea133ab74532bacd1a05c23d
Former-commit-id: e24940ead6
[formerly 6e2d68e102
] [formerly 57f2357f10
[formerly c59a5d99ce31464bacd7c266543f10f523719a07]]
Former-commit-id: 57f2357f10
Former-commit-id: d435258fce
2014-04-14 16:50:54 -05:00
Richard Peter
ff87317bd4
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: e4be1f24e7
[formerly dbba727f3d
] [formerly 17196b5dcd
[formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]
Former-commit-id: 17196b5dcd
Former-commit-id: 8b279966d1
2014-04-14 13:10:11 -05:00
Richard Peter
d65b11d404
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: cd51f3fa87
[formerly 3575d6586f
] [formerly 21ae3b5fcd
[formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: a7ec0bcf66
2014-04-11 16:23:09 -05:00
Nate Jensen
58516f3a9f
Merge "Issue #2950 Support dynamic color counts for color map editing." into development
...
Former-commit-id: 6989999e95
[formerly 5129002e91
] [formerly 5bad21f3e6
[formerly b196bf0463ea59d55dec4e70373ca731152123f9]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 92f0182d3f
2014-04-09 11:20:04 -05:00
Everett Kladstrup
86bf2b5ea0
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: 8b19b3601a
[formerly 06d6961c0f
] [formerly 0699041518
[formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 0699041518
Former-commit-id: 260d0beddc
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
cf3456c6cd
Issue #2950 Support dynamic color counts for color map editing.
...
Former-commit-id: 9d7504e2c3
[formerly c5a48642eb
] [formerly c805a5fed7
[formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]
Former-commit-id: c805a5fed7
Former-commit-id: 16446101a4
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
aadc22091e
Issue #2874 Initial implementation of RTOFS data.
...
Former-commit-id: 1c18e800b3
[formerly 55046a8e1e
] [formerly 12ed72b0c0
[formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]
Former-commit-id: 12ed72b0c0
Former-commit-id: ab8293c6a1
2014-03-24 11:10:18 -05:00
Brad Gonzales
0022633626
Issue #2873 Removed 32 bit native libraries and references.
...
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f
Former-commit-id: de508133ff
[formerly 08dde4824f
] [formerly 189234f162
[formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]
Former-commit-id: 189234f162
Former-commit-id: d303662a51
2014-03-20 13:27:39 -05:00
Nate Jensen
07d2a4f40c
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 6edec10edc
[formerly 747ac58166
] [formerly 82ee3e7104
[formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]
Former-commit-id: 82ee3e7104
Former-commit-id: 24eadadffd
2014-03-20 09:38:07 -05:00
Steve Harris
5d95d594f8
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: 5efb16fa8b
[formerly d0aeb854f5
] [formerly 0c2c5ad4bd
[formerly a2318f04eea89a258400dea526daa4fe67b69271]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: b5a2d2237f
2014-03-17 15:55:41 -05:00
Nate Jensen
5f554ade56
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: a9381c505e
[formerly 540d0f2e1d
] [formerly 27625eb93a
[formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]
Former-commit-id: 27625eb93a
Former-commit-id: d8edb8e91b
2014-03-13 11:16:00 -05:00
Ron Anderson
06b0b5b684
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: ab69d3e318
[formerly 1c727465ee
] [formerly bcfaf40ebf
[formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 4b2a388628
2014-03-13 11:11:53 -05:00
Bryan Kowal
fe9b652d52
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: b0de1fba76
[formerly cac6709da8
] [formerly 438e594868
[formerly 3189f870d55219372438213441fd1359a6bb5cc4]]
Former-commit-id: 438e594868
Former-commit-id: 9ec8e864a7
2014-03-11 16:47:11 -05:00
Brian.Dyke
c5502af3fa
Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 24785068be
[formerly d710aec521
] [formerly fda6ab1344
[formerly ac54324fb0eff1483dd2c3aa8d94273760451dab]]
Former-commit-id: fda6ab1344
Former-commit-id: 0aff5875b0
2014-03-10 15:14:59 -04:00
Ben Steffensmeier
5e4c35e93f
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
...
Former-commit-id: c0b478eb97
[formerly 9122b6da99
] [formerly 8650074737
[formerly ba5ff870337c7ac66d633077d84de867e5df967c]]
Former-commit-id: 8650074737
Former-commit-id: d3043fda5a
2014-03-07 18:15:32 -06:00
Stephen Gilbert
00c1f40997
VLab Issue #3224 - NSHARP: Fix erroneous mixing heights
...
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2
Former-commit-id: 200c7e60da
[formerly 65dd8b4c3c
] [formerly f203a4c035
[formerly 459cd2e6772efa05a683073798a1d4424aa2facf]]
Former-commit-id: f203a4c035
Former-commit-id: 46ebeb9969
2014-03-07 19:10:08 -05:00
Stephen Gilbert
c4b73eb02e
VLab Issue #3223 - NSHARP: Improve selection operation
...
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d
Former-commit-id: 5fcb45a629
[formerly 9a457213bb
] [formerly e3aedaa1d6
[formerly 16fcc171c65d79d5698feeb3ff0ace49c31d976f]]
Former-commit-id: e3aedaa1d6
Former-commit-id: b1e1d9178a
2014-03-07 19:07:28 -05:00
Stephen Gilbert
6d40a42c39
VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP
...
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57
Former-commit-id: a7fd09a409
[formerly 1632166902
] [formerly 49a6d6ec7e
[formerly 24e07a3215a7879e459afc74e020eab0a8e1c646]]
Former-commit-id: 49a6d6ec7e
Former-commit-id: de6e50d8e6
2014-03-07 18:49:21 -05:00
Stephen Gilbert
ce73240c40
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: cce06bfbe3
[formerly 625fcb0064
] [formerly 6dd6ae8d36
[formerly 4f58998c899e28521658bf17dee852592c534713]]
Former-commit-id: 6dd6ae8d36
Former-commit-id: 204d047289
2014-03-07 18:36:42 -05:00
Steve Harris
c24108e75b
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 51b755a476
[formerly 873bd6b889
] [formerly f60aba35d6
[formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: f60aba35d6
Former-commit-id: 708485427e
2014-03-07 15:43:40 -06:00
Steve Harris
4d1fbf8743
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 068297b90a
[formerly 92232fa063
] [formerly 40b543f9a8
[formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]
Former-commit-id: 40b543f9a8
Former-commit-id: f992a6b046
2014-03-07 15:16:18 -06:00
Brian.Dyke
48f1f544d6
Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1
...
Former-commit-id: 48cc3b6c55
[formerly 3ac2a61218
] [formerly 1fe5504d4c
[formerly 8b6d5b889e652cbf82c66ae831c9c116626c1494]]
Former-commit-id: 1fe5504d4c
Former-commit-id: 0c4b9469b0
2014-03-07 11:50:06 -05:00
Steve Harris
587f15a95d
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: 3ba28aabea
[formerly 069093884f
] [formerly ffcc34f8d4
[formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 96658d8ce0
2014-03-06 08:39:43 -06:00
Steve Harris
12d8ff2fce
Merge branch 'master_14.2.1' into ncep_14.2.1
...
Former-commit-id: 1a666f9f71
[formerly 167ce61d6c
] [formerly 4b01c57c0a
[formerly 505bcf7b47aac1344bb46bac690ce83591b8e554]]
Former-commit-id: 4b01c57c0a
Former-commit-id: 6e361c0a57
2014-03-05 13:00:23 -06:00
Max Schenkelberg
39e1c4fa46
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: 59434c8a60
[formerly a01a6d68d0
] [formerly cbf8b9249c
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: cbf8b9249c
Former-commit-id: 654da3c0a2
2014-03-04 09:23:36 -06:00