Commit graph

2574 commits

Author SHA1 Message Date
Ron Anderson
3b2ea2d6ac 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: 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]
Former-commit-id: 2db5f26840
2014-02-24 13:46:48 -06:00
Nate Jensen
9f33e97c1b Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]
Former-commit-id: 0f81b80467
2014-02-20 10:53:21 -06:00
Brad Gonzales
3be3380944 Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]
Former-commit-id: ba4e308328
2014-02-18 11:10:44 -06:00
Ron Anderson
d4ba9eba94 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: 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 14a082a4e9
2014-02-18 10:45:20 -06:00
Nate Jensen
228ab8dd60 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 0c4de50218 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]
Former-commit-id: 4d68994525
2014-02-17 17:10:07 -06:00
Nate Jensen
0314d61773 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: 15ff4ab5d7 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]
Former-commit-id: 2486e39192
2014-02-17 11:58:04 -06:00
Steve Harris
e115197bb7 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]
Former-commit-id: 9fcc5ad930
2014-02-17 08:54:34 -06:00
Mike Duff
5b3a55d11f Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
Former-commit-id: ac62d322ed [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]
Former-commit-id: 346dc4afff
2014-02-14 08:53:40 -06:00
Ron Anderson
b84a83eb6f Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
Former-commit-id: 51c9d27a39 [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]
Former-commit-id: 42fd9c8f9a
2014-02-13 10:46:27 -06:00
Ron Anderson
2d7c87ac84 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]
Former-commit-id: 2f067699f2
2014-02-13 10:10:34 -06:00
Lee Venable
c74ae6b83d Issue #2773 - added code to help prevent eclipse bug from occurring.
Former-commit-id: 7099472204 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]
Former-commit-id: ce08022db7
2014-02-12 13:47:20 -06:00
Brian.Dyke
c5857c30f2 14.1.1-18 baseline
Former-commit-id: 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]
Former-commit-id: 1d6a9456b7
2014-02-11 15:52:50 -05:00
Lee Venable
42fdfa4964 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
Former-commit-id: 5c256dc19c [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]
Former-commit-id: f078971b5d
2014-02-11 09:15:44 -06:00
Nate Jensen
2111989497 Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]
Former-commit-id: fd43d9e095
2014-02-10 16:48:29 -06:00
Max Schenkelberg
e2e9eaaf35 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 7822511754 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]
Former-commit-id: a8a67634f9
2014-02-10 13:43:16 -06:00
Lee Venable
d975dcf01e Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
Former-commit-id: 27be4297e6 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]
Former-commit-id: 88a9d20316
2014-02-10 11:50:07 -06:00
Nate Jensen
57aa678883 Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
Former-commit-id: 5c7c14a6c4 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]
Former-commit-id: a48c1c6783
2014-02-10 09:53:41 -06:00
Mike Duff
4a87525df0 Issue #2453 - Notification Center refactor
Former-commit-id: eeb78f7f20 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]
Former-commit-id: 2c9d603e50
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
6a95dd6242 Issue #2211 Fix data mapped sampling.
Former-commit-id: 724bb85676 [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]
Former-commit-id: 3d76d6655b
2014-02-07 13:00:00 -06:00
David Gillingham
94ec272ab2 Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]
Former-commit-id: e8ffc73893
2014-02-07 09:51:42 -06:00
Richard Peter
c965993d17 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]
Former-commit-id: 36d3d21b57
2014-02-05 18:20:36 -06:00
Mike Duff
6a2f75e8d5 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]
Former-commit-id: 6b01c2957f
2014-02-05 16:08:01 -06:00
Brian.Dyke
90b4e7ebf0 Issue #124
Former-commit-id: 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]
Former-commit-id: 0cc11ddfd3
2014-02-04 16:56:47 -05:00
Brian.Dyke
f088dab5ef Issue #83
Former-commit-id: 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]
Former-commit-id: fb15dd5dfb
2014-02-04 16:32:42 -05:00
Mike Duff
e984863c1c Issue #2722 - Add auto refresh to sub manager dialog
Former-commit-id: 04ee397f2b [formerly f678a39b37040bd637cf210f73aaef0841bda36e]
Former-commit-id: ab9621698f
2014-02-04 12:45:33 -06:00
Brian.Dyke
947ec5fd96 14.1.1-17 baseline
Former-commit-id: 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]
Former-commit-id: 23280af290
2014-02-04 12:33:46 -05:00
Ben Steffensmeier
2be72739b5 Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: 8865177c6b [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]
Former-commit-id: 97a64f89f1
2014-02-03 14:07:07 -06:00
Max Schenkelberg
f5ff746126 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]])

Former-commit-id: 0c840cf724 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]
Former-commit-id: d566ed9927
2014-01-29 10:15:38 -06:00
Mike Duff
5fc96739b9 Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: e46c226489 [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]
Former-commit-id: 81aa9ce0cb
2014-01-26 18:57:26 -06:00
Mike Duff
be59be53d4 Issue #2452 - Changed label based on feedback.
Former-commit-id: 1da1285311 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]
Former-commit-id: 6dcd1a7969
2014-01-25 14:41:20 -06:00
Nate Jensen
7dd0b1c978 Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e

Former-commit-id: 47d6e5b54f [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]
Former-commit-id: cdbd05b293
2014-01-23 19:02:37 -06:00
Ben Steffensmeier
b90004e46a Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 6aa6683258 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]
Former-commit-id: a92f6e9bb6
2014-01-23 12:41:16 -06:00
Ben Steffensmeier
d1dbd0c9b6 Issue #2602 Don't try to load classes from uninstalled bundles.
Former-commit-id: 0c4fc0dd01 [formerly 30ca0135046851884e4a07b36559fce086ccd3f2]
Former-commit-id: 3187754736
2014-01-22 15:46:51 -06:00
Mike Duff
9112366cae Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]
Former-commit-id: 9a2d2af4a9
2014-01-20 17:44:02 -06:00
Lee Venable
4e121d1261 Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: b3928f4f49 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]
Former-commit-id: dd12515ca2
2014-01-20 17:32:38 -06:00
Nate Jensen
f13cb9ae26 Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]
Former-commit-id: 54262ad318
2014-01-20 17:32:15 -06:00
Lee Venable
b8520d1e12 Issue #2291 - Fixed resizing of components.
Former-commit-id: 1927ba49ea [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]
Former-commit-id: d3eb6c16ec
2014-01-20 17:26:28 -06:00
Ron Anderson
61d8aec23c Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]
Former-commit-id: 66bbc99784
2014-01-20 17:22:26 -06:00
Richard Peter
4887054146 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]
Former-commit-id: 29ba337367
2014-01-20 17:21:21 -06:00
Steve Harris
0ba307d616 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: 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]
Former-commit-id: 9371eeeee0
2014-01-20 10:17:44 -06:00
Mike Duff
a04430e334 Issue #2459 - Remove unscheduled status from UI
Former-commit-id: 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]
Former-commit-id: 25d1d39fc2
2014-01-17 15:34:48 -06:00
gerritcm
644da23327 14.1.1-16 baseline
Former-commit-id: 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]
Former-commit-id: b84f7d4203
2014-01-16 16:43:05 -05:00
Nate Jensen
1be41d69c6 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]
Former-commit-id: 9d529b3b21
2014-01-15 17:36:30 -06:00
Nate Jensen
deb57e3b35 Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: fc6b31c1c0 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]
Former-commit-id: 5f39322d59
2014-01-15 13:39:28 -06:00
Mike Duff
d96a9d2937 Issue #2459 - Refactor the subscription status
Former-commit-id: f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]
Former-commit-id: 245d76358e
2014-01-15 09:21:30 -06:00
Ron Anderson
624375267e Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: 62c445d872
2014-01-13 17:45:20 -06:00
Richard Peter
527408ddd4 Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]
Former-commit-id: e6d7acb609
2014-01-10 15:42:48 -06:00
Mike Duff
17d19cc0bb Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]
Former-commit-id: 7081c26823
2014-01-10 12:05:30 -06:00
Mike Duff
7d25b33cb6 Issue #2642 - Update header comment
Former-commit-id: 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]
Former-commit-id: 28114764a5
2014-01-10 10:57:18 -06:00
Richard Peter
690f1b15dd Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]
Former-commit-id: 52850fe95a
2014-01-09 16:58:39 -06:00