Richard Peter
|
0dfa8cc4c6
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]
Former-commit-id: 6966b79246
|
2014-04-28 16:27:40 -05:00 |
|
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: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]
Former-commit-id: bf3758efa3
|
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: 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17]
Former-commit-id: 953236aad8
|
2014-04-23 14:05:50 -04:00 |
|
Brian.Dyke
|
9c4385efbe
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]
Former-commit-id: 6f35818917
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
17544a32ba
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]
Former-commit-id: 19f0be6afc
|
2014-04-16 16:17:05 -05:00 |
|
Nate Jensen
|
134f34c4df
|
Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin
Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a
Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]
Former-commit-id: ceec3d48f0
Former-commit-id: d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]
Former-commit-id: dfe50ee038
|
2014-04-14 14:28:11 -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: 9b12d9ddaf [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]
Former-commit-id: d65b11d404
|
2014-04-11 16:23:09 -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: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]
Former-commit-id: afc1da9015
|
2014-04-10 13:26:42 -04:00 |
|
David Gillingham
|
969dccd366
|
Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]
Former-commit-id: da31ab2042
Former-commit-id: cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94]
Former-commit-id: 0385a4395e
|
2014-04-10 11:24:40 -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: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]
Former-commit-id: f1b85f6964
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
a6ebdbfc3a
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]
Former-commit-id: 929b736038
Former-commit-id: ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]
Former-commit-id: d76d3a26cb
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
8ba2694d8e
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]
Former-commit-id: dd98c213c7
Former-commit-id: 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]
Former-commit-id: 47d9095211
|
2014-04-04 12:57:32 -04:00 |
|
Ron Anderson
|
bb12a4b904
|
Merge "Issue #2737 Make iscMosaic remove data from ISC when grids are deleted." into development
Former-commit-id: d4d7e81799 [formerly 83d660cf2e] [formerly 9aca9a23b621306e017fb3123a6902ff25149da6 [formerly 2042d975c2]] [formerly debde74356 [formerly 2042d975c2 [formerly 93c224f21b0aec4eef0eaf0f57c5f48237c68265]]]
Former-commit-id: debde74356
Former-commit-id: 108d722236ee29849900176e85dc9365b6df27dd [formerly d4fabcc4b1]
Former-commit-id: c3a4664534
|
2014-04-04 08:35:12 -05:00 |
|
Ron Anderson
|
1c032ab6f0
|
Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe
Former-commit-id: 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly ea250a253f [formerly 01ab6ce52d [formerly 5db8738783d79e8a48bfffac49910cc46df61ad2]]]
Former-commit-id: ea250a253f
Former-commit-id: 11feb3f28beaaea54d7cf1c0af9fce201f9ec319 [formerly de50c5e47d]
Former-commit-id: 4d9d2f59aa
|
2014-04-03 16:56:36 -05:00 |
|
Ron Anderson
|
11df67c9f4
|
Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development
Former-commit-id: 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 52c2092e1c [formerly 90429229f7 [formerly 4e57b93f72b9e73a4ac2e1205393b3cae8e21958]]]
Former-commit-id: 52c2092e1c
Former-commit-id: 6fa5ea130dedea2082686ac70b1f9913fc8f6110 [formerly 2bee12cb02]
Former-commit-id: 3e144c80a6
|
2014-04-03 14:27:41 -05:00 |
|
Ron Anderson
|
5d84747472
|
Issue #2961 Fixed issue where ISC grids are selected based on the start time of the
Fcst and not the grid that overlaps the spatial editor time.
Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2
Former-commit-id: 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly db080f3eba [formerly eb90c1f216 [formerly 131f9c0933280d25f61458e270b5bb9715c2d67b]]]
Former-commit-id: db080f3eba
Former-commit-id: f40c2938a553a6bd3809588d95bac2b3641d2765 [formerly c7b392e36b]
Former-commit-id: c880002b1e
|
2014-04-03 13:04:55 -05:00 |
|
Ron Anderson
|
2a0c06c814
|
Merge "Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py" into development
Former-commit-id: dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly 822acbb32b [formerly b67c36c08b [formerly dc953f5285a2fb5c56148b78c5db31c4ccdda3a7]]]
Former-commit-id: 822acbb32b
Former-commit-id: 2376fd5832ad8d1cfd61ec7ab3b9ba1df3cefd08 [formerly f7910616ca]
Former-commit-id: b5680ce7f3
|
2014-04-03 12:57:16 -05:00 |
|
Ron Anderson
|
f35fcf7c6f
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: I75d37583d15decaeb50db0d70fc0ba1f3a8a7b7c
Former-commit-id: 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]]
Former-commit-id: 2abfe6de77
Former-commit-id: 2d2d6d92129690dc9335d9253ddd5235606cc9bd [formerly bd502fbe07]
Former-commit-id: 8dcbe3a815
|
2014-04-03 12:42:42 -05:00 |
|
Ron Anderson
|
048d7d363b
|
Merge "Issue #2847: Add option to export only selected parms to GFE KML export dialog." into development
Former-commit-id: 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 60f3ad27e2 [formerly b61a1b346d [formerly 17ab17280bc6e4c990edec44a40f78f1f36f5ced]]]
Former-commit-id: 60f3ad27e2
Former-commit-id: 62d6e4880917155c00a538024e1217517051a84e [formerly d1e5fdd365]
Former-commit-id: 6f9cadafa7
|
2014-04-03 11:47:15 -05:00 |
|
David Gillingham
|
87ce104d67
|
Issue #2847: Add option to export only selected parms to GFE KML export dialog.
Change-Id: I6f0111d0f8eaed302c18dcd08e4433a7e544e669
Former-commit-id: f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly 7f36b8ba9c [formerly 965d76c139 [formerly cdb6f07f0a514c159e792e3bb911ef93a8354b2d]]]
Former-commit-id: 7f36b8ba9c
Former-commit-id: aa5f9f82bfce0e52bd621bb6427bfb10d3b1447a [formerly 017ea69812]
Former-commit-id: 9fcb3f6920
|
2014-04-03 11:30:59 -05:00 |
|
Ron Anderson
|
ec74556c48
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c
Former-commit-id: ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly 69cd6a1598 [formerly 8da64048e7 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]
Former-commit-id: 69cd6a1598
Former-commit-id: ef0141d58da5e73da45520afce6c1175f7c71496 [formerly dde9253f15]
Former-commit-id: b16405ecb3
|
2014-04-02 18:22:51 -05:00 |
|
Ron Anderson
|
8463514df0
|
Issue #2961 Code clean up. Issue was fixed under #2703
Added listener to redo time matching when ISC mode changes
Change-Id: Ic2a883c6255a81cac1316d268225fb6078921cb1
Former-commit-id: 82062553f0 [formerly 51ffcd7ce8] [formerly f4b31b336a] [formerly efb27793f4 [formerly f4b31b336a [formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]
Former-commit-id: efb27793f4
Former-commit-id: 3dc1bbaea04ff0ad7927eabe00966a8cca040dc6 [formerly bfed3dc521]
Former-commit-id: c1e5e2fd18
|
2014-04-02 16:55:02 -05:00 |
|
Ron Anderson
|
5001c1f2be
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]
Former-commit-id: d556055299
Former-commit-id: dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]
Former-commit-id: 3ac3d5de1b
|
2014-04-02 09:07:22 -05:00 |
|
David Friedman
|
1e4ac84f99
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]
Former-commit-id: 1168a3eae5
|
2014-03-27 19:17:03 +00:00 |
|
Rici.Yu
|
a3e865e011
|
ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 58f9857344 [formerly 74b1c827ee [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]
Former-commit-id: 58f9857344
Former-commit-id: 8ff482b2584775bc71dc4df96949f7260608e124 [formerly 0ee8baf0c3]
Former-commit-id: e877c81c88
|
2014-03-14 14:39:56 -04:00 |
|
Ben Steffensmeier
|
bf5b777b0d
|
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]
Former-commit-id: 8650074737
Former-commit-id: b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]
Former-commit-id: 5e4c35e93f
|
2014-03-07 18:15:32 -06:00 |
|
Steve Harris
|
edeb1833ae
|
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 f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
a94f800324
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]
Former-commit-id: 4d1fbf8743
|
2014-03-07 15:16:18 -06:00 |
|
Steve Harris
|
d2a6b0c18b
|
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 ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]
Former-commit-id: 587f15a95d
|
2014-03-06 08:39:43 -06:00 |
|
Max Schenkelberg
|
c37910a689
|
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]
Former-commit-id: 1854bbb477
Former-commit-id: 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]
Former-commit-id: bff80c3ee9
|
2014-03-03 17:59:48 -06:00 |
|
Nate Jensen
|
7ab7887199
|
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: f763c6864aae7276537781234c118f3f876d018c [formerly 92527f1ffa]
Former-commit-id: fb68c4c07f
|
2014-02-28 09:53:27 -06:00 |
|
Richard Peter
|
1d6e9816e0
|
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 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]
Former-commit-id: 50a1b270c5
|
2014-02-27 15:18:26 -06:00 |
|
Ben Steffensmeier
|
66b052cd5a
|
Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6]
Former-commit-id: 0fde78c595
|
2014-02-26 14:45:19 -06:00 |
|
Brian.Dyke
|
6b1b6d38e3
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]
Former-commit-id: 73a1c238f4
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
5831f8d79e
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]
Former-commit-id: 7d3af157f8
|
2014-02-24 13:46:48 -06:00 |
|
Brian.Dyke
|
5a11fbbfdb
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]
Former-commit-id: c41dd22ff2
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
84bea14340
|
Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 5f3248574f [formerly 663cb4cb62] [formerly 5258aecf45] [formerly 419e9d0b8d [formerly 5258aecf45 [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2 [formerly 8a41723ba6]
Former-commit-id: 908e43039e
|
2014-02-19 11:55:11 -06:00 |
|
Ron Anderson
|
8779564e3a
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]
Former-commit-id: 0135771eec
|
2014-02-18 10:45:20 -06:00 |
|
Steve Harris
|
1fbbb6e73f
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]
Former-commit-id: 146412a8bd
|
2014-02-17 08:54:34 -06:00 |
|
Ron Anderson
|
4d8ebf6712
|
Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]
Former-commit-id: d9b82b4ebe
|
2014-02-13 10:10:34 -06:00 |
|
Brian.Dyke
|
1c7bf39f73
|
14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]
Former-commit-id: d61ae6c5f4
|
2014-02-11 15:52:50 -05:00 |
|
David Gillingham
|
8cdf1ce158
|
Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]
Former-commit-id: e8ffc73893
Former-commit-id: bcf359e669db6d450eb89b007e4262c8f81e5b91 [formerly 94ec272ab2]
Former-commit-id: ad8c40032f
|
2014-02-07 09:51:42 -06:00 |
|
Rici.Yu
|
6d8b43f409
|
ASM #102
Change-Id: Idae87ce34f52bc79144742b92cff7e3537a84e99
Former-commit-id: 44656c81d9 [formerly 6c8fa82be2] [formerly 4010ef5fd8] [formerly 3bc070a8ec [formerly 4010ef5fd8 [formerly 6874b003afcebb837e11579eae048e2aa90cbfc7]]]
Former-commit-id: 3bc070a8ec
Former-commit-id: 5509a4c749f5f68a66da2385f84326060b3347d2 [formerly 7cd5b3e16d]
Former-commit-id: b35b74ca23
|
2014-02-07 10:43:29 -05:00 |
|
Brian.Dyke
|
8e78870c71
|
Issue #83
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]
Former-commit-id: 3c160bb05e
|
2014-02-04 16:32:42 -05:00 |
|
Brian.Dyke
|
6e66bb7b6e
|
14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]
Former-commit-id: f1cc9d6ee2
|
2014-02-04 12:33:46 -05:00 |
|
brian.dyke
|
ac37e2ea2e
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: becf6322c6 [formerly 4a62e83835] [formerly 2294c81a57] [formerly f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 83bf7b38976fc3a19f898b0fe2c8e7790a8d7629 [formerly e9e2eb3be0]
Former-commit-id: 621464ac0d
|
2014-01-27 15:27:49 -05:00 |
|
Ben Steffensmeier
|
467cd5a9f2
|
Issue #2703 Hook GFEResource into KML Export.
Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963
Former-commit-id: 39fae5c109 [formerly 48bb8a59a1] [formerly 1897336455] [formerly 7b1245b0cf [formerly 1897336455 [formerly 547e9ac7212b5a9842d064d5669772e8e50a4828]]]
Former-commit-id: 7b1245b0cf
Former-commit-id: a5d0c33c597d28090b6fd7ad4486e862006ffc35 [formerly 76e76198d6]
Former-commit-id: c9a89659c3
|
2014-01-23 18:43:14 -06:00 |
|
Ben Steffensmeier
|
5298304b65
|
Issue #2312 Add extra frame selection option to GFE image export.
Change-Id: Ic62448c703e59a5318f361e141de7ffb65055f74
Former-commit-id: 744d199be6 [formerly 3196471d18] [formerly 81b38e2ddf] [formerly 4f9e60c658 [formerly 81b38e2ddf [formerly cb4db2bfd5a659c59d5c5e450c92207b3a81088c]]]
Former-commit-id: 4f9e60c658
Former-commit-id: 9c47a4b5169c16e1c59ee4226a6eab5b09ec5636 [formerly 85eb694b23]
Former-commit-id: 831d904de2
|
2014-01-22 16:53:04 -06:00 |
|
Steve Harris
|
6cb92b1f57
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]
Former-commit-id: b62efa9387
|
2014-01-21 12:36:54 -06:00 |
|
Steve Harris
|
9843517cb3
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]
Former-commit-id: 7ea285c48b
|
2014-01-20 10:17:44 -06:00 |
|