Brian.Dyke
14a63a19e1
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40f0b8ea5822fb1f5aa5933524838f9ffb1f5aa5933524838f9f029f5753adbf3758efa3
2014-04-25 11:06:11 -04:00
Brian.Dyke
05c0e1ad1c
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 493830467488d44a31292a4fe3dbaea7c9ddc05e2a4fe3dbaea7c9ddc05e911c0c6c17953236aad8
2014-04-23 14:05:50 -04:00
Zhidong.Hao
5d43f374e6
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: f32bb4e4f4f16936223ae1d5aa284d0177756f97e1d5aa284d0177756f97358e7b2b54d6edd56d34
2014-04-22 14:31:14 -04:00
Brian.Dyke
54e2d33607
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 2d8d035b263b90abdf7a880329e4ae9943a331c3880329e4ae9943a331c362c2a8b8432c8e6ec2fc
2014-04-18 07:53:10 -04:00
Brian.Dyke
ec3c3b4bbe
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 55d7d8dadb53ce26a9b61aec3b3698645fe64a4a1aec3b3698645fe64a4a4eb3317f8066974e17b9
2014-04-17 14:42:44 -04:00
Brian.Dyke
9c4385efbe
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 735801a7e79df6fb2d4d12a482e1d7b8829139a212a482e1d7b8829139a20ea7c51ad76f35818917
2014-04-17 14:42:35 -04:00
Nate Jensen
ef5448e8f9
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
...
Former-commit-id: 52e4a94bb39ebedf0b98d121f07e76e0ae9e5f8fd121f07e76e0ae9e5f8fe0ffa7b6b4736c2cc764
2014-04-16 08:41:54 -05:00
Ron Anderson
c263058e63
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: d2b4d707022a68e875a56e0147169f9f085a08566e0147169f9f085a08564622ad9b8aa6fa60f40d
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
68df2b0d29
Issue #3017 Update SatSpatialFactory to have more specific methods.
...
Former-commit-id: 2c5ef0198049ca556b33ecbe6fd2d76ea38cfbb2ecbe6fd2d76ea38cfbb23eebc7a8642f51d63032
2014-04-15 13:29:05 -05:00
Steve Harris
1f3584ce15
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
...
Former-commit-id: 9ff30774359132d9004eeb2f2865fe5bf5bdb6b0eb2f2865fe5bf5bdb6b0c361ccd5316ed279d306
2014-04-15 09:39:33 -05:00
Benjamin Phillippe
f731dbc847
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 575caa6238490413551b3db751fc5b62062bf2883db751fc5b62062bf288035272360b0b149f92d9
2014-04-15 09:15:12 -05:00
brian.dyke
627004af0a
Merge branch 'master_14.2.1' into asm_14.2.1
...
Former-commit-id: 33274850e35fc07cafc8fb1c399d4da6708cc174fb1c399d4da6708cc1745b27f2987fe8dffad9cb
2014-04-14 15:29:23 -04:00
Richard Peter
d5149f4409
Merge "Issue #2947 Minor satellite and derived parameter improvements." into development
...
Former-commit-id: 84bb4e5e3297fb03df0291e941f60a9ef8347f2391e941f60a9ef8347f23ffd74e6787a4eba6e6df
2014-04-11 19:33:31 -05:00
Ben Steffensmeier
a224105467
Issue #2947 Minor satellite and derived parameter improvements.
...
Former-commit-id: 4004fe2d182d66e58671dd794a3c12428f3a2d8bdd794a3c12428f3a2d8b6c92b645f0b120feab6f
2014-04-11 17:37:59 -05:00
Richard Peter
56089894f2
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: 9b12d9ddafcd51f3fa873575d6586f21ae3b5fcd3575d6586f21ae3b5fcda7ec0bcf66d65b11d404
2014-04-11 16:23:09 -05:00
Zhidong.Hao
a8eaf88994
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
...
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: a153f7218ef5877f5fb00b499061da9c18f609240b499061da9c18f6092413808687c13adcd5bca5
2014-04-11 15:51:12 -04:00
Zhidong.Hao
531eea30e1
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 8e54cb295848ee7712c7009c6e067a1a91b820d9009c6e067a1a91b820d9c6d9a3926eab0c9a65d2
2014-04-11 15:34:06 -04:00
Brian.Dyke
ef617f4b14
ASM #465 - Update capture script to prevent hanging when running psql
...
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: 2cb1541fe9af5cbe3321192a5513dfdeff8ed340192a5513dfdeff8ed34097687e72174efe23ee2c
2014-04-11 11:18:06 -04:00
Everett Kladstrup
c0091199ed
Issue #2725 remove wxmath from edex.common.core
...
Former-commit-id: 108cddd62b8e726ad379c2d27d11f225414de245c2d27d11f225414de245fed45e26d8f40a46aef0
2014-04-10 17:42:07 -05:00
Nate Jensen
f107b14359
Merge "Issue #2725 Moving derivparam plugins to the lowest applicable features" into development
...
Former-commit-id: b9ced036ed2fc2442dc4e1dbbe718b59d51c7d0be1dbbe718b59d51c7d0b51400be34f4898952f4f
2014-04-10 16:36:26 -05:00
Everett Kladstrup
1c2141ee39
Issue #2725 Moving derivparam plugins to the lowest applicable features
...
Former-commit-id: c22e8323d17fd3d7ce3db074c88957ed0c157e33b074c88957ed0c157e33b9f67d3bae70a383f68d
2014-04-10 16:00:22 -05:00
Richard Peter
f59ce85fd6
Merge "Issue #2906 removed accidental manifest entry for bufr obs" into development
...
Former-commit-id: 777b89dbff868d32cbbc2b28e47e44b2962db1f02b28e47e44b2962db1f02955520b418185a9120c
2014-04-10 15:54:34 -05:00
Brian Clements
4872fa7dca
Issue #2906 removed accidental manifest entry for bufr obs
...
Former-commit-id: 86f1619d05c4bbcc0688f2d2cab0fce8708eb44df2d2cab0fce8708eb44dca43897d73b83dc2f4e9
2014-04-10 15:31:53 -05:00
Nate Jensen
98c385b874
Merge "Issue #2725 Put derivparam plugins in viz and edex separately" into development
...
Former-commit-id: 5b8a8effbbecafc30027ffc903d5c47f8478ee0bffc903d5c47f8478ee0b11fd8d805517bf6198d9
2014-04-10 15:12:24 -05:00
Nate Jensen
444f846278
Merge "Issue #2906 added synop bufr obs decoder" into development
...
Former-commit-id: 0e445606362df73a660175b5f5b658439dc7157175b5f5b658439dc715718788d4606491c478cb8f
2014-04-10 15:09:39 -05:00
Everett Kladstrup
2bdc415769
Issue #2725 Put derivparam plugins in viz and edex separately
...
Former-commit-id: e543570a0790244ad7ecd76aaed2f01a8a05cd0ed76aaed2f01a8a05cd0edb413dc65ffa9ee97662
2014-04-10 14:08:42 -05:00
Brian.Dyke
70e228a893
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: b6e4e2339473be1016c08c2f601b599cce8eb0d18c2f601b599cce8eb0d1ff51498036afc1da9015
2014-04-10 13:26:42 -04:00
Brian Clements
a48840eb73
Issue #2906 added synop bufr obs decoder
...
fixed units in sfcobs point data description
made getDescription() and static constants public in point data transform
fixed typo in udunits alias file
created new decoder for synop bufr obs
added decoder and dependencies to features
Former-commit-id: 421153a2461e2ad93e65663337e661972d18cd3b663337e661972d18cd3ba072496474e34f218002
2014-04-10 12:08:27 -05:00
David Gillingham
969dccd366
Issue #3004 : Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
...
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a11c7e650e6ac8a6dc8769da31ab2042c8a6dc8769da31ab204272229cfb940385a4395e
2014-04-10 11:24:40 -05:00
Nate Jensen
0137516622
Merge "Issue #2694 Improve error handling" into development
...
Former-commit-id: 0ff3ad4f05288aa9b52ce327184bdc9357bdfb0ee327184bdc9357bdfb0e3151a36ead64f44d5e6c
2014-04-10 10:23:22 -05:00
Ron Anderson
1ad7403502
Issue #2694 Improve error handling
...
Change-Id: I576cd4950d73fd6ce82f982dbc165e18ecb240f3
Former-commit-id: 64a9b021d611f7c48504e66c93553d70faf6e7aae66c93553d70faf6e7aa6891dab959563e343ca6
2014-04-10 10:11:22 -05:00
Richard Peter
cfe3c6a7af
Merge "Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks." into development
...
Former-commit-id: 4e4a4a955b8925673f3c394a41738f8b98ee101c394a41738f8b98ee101cdfd19e7904923b6887dc
2014-04-09 16:42:31 -05:00
Nate Jensen
8af38ce197
Issue #2907 fix redbook decoding of month
...
Change-Id: Ieccea813452ba5708f039ea8aad0fd6f83c16f9a
Former-commit-id: 3f08f9e0328b9e22751a411779ce6f5905ff0dcf411779ce6f5905ff0dcf0630c1bc0c08f3535a49
2014-04-09 16:07:56 -05:00
Richard Peter
47795836f2
Merge branch 'master_14.1.2' into master_14.2.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50567609044395eba8dcf6b15d28853095eba8dcf6b15d28853073aab15d85f1b85f6964
2014-04-09 16:00:54 -05:00
Roger Ferrel
e6938244b4
Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
...
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908
Former-commit-id: 76883956dd032ee7ef77226b1be015c86d738d5b226b1be015c86d738d5b0d85ae72e0eec1d22987
2014-04-09 13:57:55 -05:00
Everett Kladstrup
4c979bd398
Issue #2725 Post "derived parameter move" changes
...
* move derived parameter definitions to base localization level
* remove java 7 exception constructor from inventory plugin
* move python function adapter to derivparam.python plugin
Former-commit-id: e222fc706e0e88702cea16b4c9253e41b154802c16b4c9253e41b154802cf6bf1f43bd2ace82f815
2014-04-09 11:20:14 -05:00
Brian.Dyke
a6ebdbfc3a
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 7de936dfbae4136f79dd947194c998929b736038947194c998929b7360385163a31a66d76d3a26cb
2014-04-09 11:39:07 -04:00
Everett Kladstrup
29ce7781c9
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: eab13586028b19b3601a06d6961c0f069904151806d6961c0f0699041518260d0beddc86bf2b5ea0
2014-04-09 09:31:12 -05:00
Brian.Dyke
824e1f6d14
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 518167e0bb529059851a20fef0f15b79c7ec7ae920fef0f15b79c7ec7ae9538b02e42b20c27a479d
2014-04-08 13:05:12 -04:00
Brad Gonzales
d8f6c4d758
Issue #2694 Added missing org.codehaus.jackson dependency to com.raytheon.uf.edex.base.feature.
...
Amend: removed org.codehaus.jackson dependency from com.raytheon.uf.edex.datadelivery.core.feature.
Change-Id: Id36525e4e0e4764c648a4abca938e4131b23f3e0
Former-commit-id: d1d858d68f100252664e579ba2a1172909580bc3579ba2a1172909580bc3db463891cd2f5c99f364
2014-04-08 11:55:23 -05:00
Richard Peter
9cb93f8e6f
Merge "Issue #2694 Fix dependency issues in the build." into development
...
Former-commit-id: c1670250bc00ccec2f0298050f9c3206c531a0f698050f9c3206c531a0f6401eeaff70ca9e1c334d
2014-04-08 09:57:13 -05:00
Ron Anderson
5062057d01
Issue #2694 Fix dependency issues in the build.
...
Change-Id: Ie0bc386851869bb0b7e56c117193c84e5fa03e91
Former-commit-id: c46e9801c0e71d8778c2c20a2f2e0d5e7a694eb7c20a2f2e0d5e7a694eb7bba62096a1fc6a3264e0
2014-04-08 09:49:56 -05:00
Nate Jensen
c38fd5990f
Merge "Issue #2968 fix buffer thread safety issues" into development
...
Former-commit-id: cb858dc39eccb6c8fc2ce3e5a25484a03ca229e7e3e5a25484a03ca229e7ac7f0b69a4f16f51aa12
2014-04-08 09:46:11 -05:00
Nate Jensen
3095bf9a48
Merge "Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM" into development
...
Former-commit-id: 269eebc2d5000c6e71389423a189a92626eaee249423a189a92626eaee249b4f8ca1fc7705fc909a
2014-04-08 09:08:45 -05:00
Nate Jensen
3649961255
Issue #2968 fix buffer thread safety issues
...
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2
Former-commit-id: 917e1ed8fd5c775618e3e11a5c4559f2b18b76f2e11a5c4559f2b18b76f2ae9c53fd05f5d594bddc
2014-04-07 17:30:27 -05:00
Mike Duff
49d3dd00ba
Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM
...
Change-Id: If01865b85f7ed18edea63757426cb76e44587b0e
Former-commit-id: 97fb67b7b209802cfde2692d8841d1418c80640e692d8841d1418c80640e80bb9e41f57bb7f3c4eb
2014-04-07 16:17:28 -05:00
Ron Anderson
454323fd74
Issue #2694 Converted GetBrokerConnections to Java.
...
Change-Id: Ic9445906ed88036d6598ffec0319de9c89f8c163
Former-commit-id: 7c9f4091c2d16380e50ea6794beaa5df9c5c81d6a6794beaa5df9c5c81d6d778e9dac6d1cb494222
2014-04-07 15:18:01 -05:00
Nate Jensen
0ab946a58a
Merge "Issue #2905 removed java 1.7 specific code" into development
...
Former-commit-id: ef099dee95f32249d79c174677f71b44bfeea419174677f71b44bfeea419723a1e2cd79f80655bdd
2014-04-07 13:05:05 -05:00
Brian Clements
f18843762b
Issue #2905 removed java 1.7 specific code
...
use of Integer.compare()
Former-commit-id: d909a8e909ae3ece84bea1d9d323bdf53203712fa1d9d323bdf53203712f6d2125746e8afb7d6473
2014-04-07 12:22:52 -05:00
Brian Clements
7ecb691bdf
Issue #2906 fixed mapper no-value checks to do both null and empty set
...
fixed problem caused by previous change
Former-commit-id: 23b83ee2381a45c232019e6da34150fe281381ab9e6da34150fe281381abaf01ba2de68140800517
2014-04-07 08:45:56 -05:00
