Commit graph

2574 commits

Author SHA1 Message Date
Brian.Dyke
db44e7f0ec ASM #124 - Display GLD360 lightning data
Former-commit-id: 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly eefe8c45fe [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 6ef9f7fd37 [formerly 26140187b1] [formerly 44a38ade0727afc9f135777d46659f273033a036 [formerly b657767cb1]]
Former-commit-id: 5fde31dc71e51a7f747df35d265aff302392ec26 [formerly b9e9126e11]
Former-commit-id: 8de6b2d57b
2014-03-06 10:54:15 -05:00
Brian.Dyke
9db7ca881a Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
2014-02-24 14:51:00 -05:00
Brad Gonzales
e906d71ac4 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: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6 [formerly 1b76488111] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e]
Former-commit-id: b0421675ff
2014-02-18 11:10:44 -06:00
Ron Anderson
c3b687b9a5 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 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
2014-02-18 10:45:20 -06:00
Nate Jensen
8e8e9141e7 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 742217ded0 [formerly 0160ab0464] [formerly 0c4de50218] [formerly 742217ded0 [formerly 0160ab0464] [formerly 0c4de50218] [formerly 4d68994525 [formerly 0c4de50218 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]]
Former-commit-id: 4d68994525
Former-commit-id: 60fd298721 [formerly 121bcd184a] [formerly 4ab3a27b137394410a2b8da012bfe21a237dd4b6 [formerly 228ab8dd60]]
Former-commit-id: 38e7719aa70d69e4f2268ba3d82ba8df10a7cace [formerly 944df080f4]
Former-commit-id: 0dd9cd1094
2014-02-17 17:10:07 -06:00
Nate Jensen
9c67149bf9 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: 34c7c3cba1 [formerly c8e70cd6b1] [formerly 15ff4ab5d7] [formerly 34c7c3cba1 [formerly c8e70cd6b1] [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 15ff4ab5d7 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]]
Former-commit-id: 2486e39192
Former-commit-id: 62739b7936 [formerly b801b36ca7] [formerly 961e5c0a4aa129e13bdd51a1f6be5cc7caf172c0 [formerly 0314d61773]]
Former-commit-id: 991546c580399668225c99bbb7a4506b93bf17d6 [formerly e6dae7a23c]
Former-commit-id: 695d03b815
2014-02-17 11:58:04 -06:00
Steve Harris
a5d78a7f44 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
2014-02-17 08:54:34 -06:00
Mike Duff
8f8300320c Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
Former-commit-id: b34c9eedd0 [formerly 43ea3b0918] [formerly ac62d322ed] [formerly b34c9eedd0 [formerly 43ea3b0918] [formerly ac62d322ed] [formerly 346dc4afff [formerly ac62d322ed [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]]
Former-commit-id: 346dc4afff
Former-commit-id: fad65749a8 [formerly 6601dff483] [formerly 2be8bfeadfd1af814a97057e7cfe23152263de88 [formerly 5b3a55d11f]]
Former-commit-id: 3add04f6f2835f888f0452d213544d97cca8f1c0 [formerly c5f33b0ed0]
Former-commit-id: fe38928d33
2014-02-14 08:53:40 -06:00
Ron Anderson
52aac6e855 Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
Former-commit-id: ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly ce72867ab9 [formerly 21e95cc2f0] [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 51c9d27a39 [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: c2e56111c1 [formerly ca11555427] [formerly c5382d8fbd02ce98c80e76cb3bcd2d718cfc584a [formerly b84a83eb6f]]
Former-commit-id: 038e150875b793ce7a2afd8a7cfae08a2e921c3f [formerly 828738b81f]
Former-commit-id: 3598139635
2014-02-13 10:46:27 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
2014-02-13 10:10:34 -06:00
Lee Venable
06eb20431a Issue #2773 - added code to help prevent eclipse bug from occurring.
Former-commit-id: 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly 328aebb4a6 [formerly 8073fd22b1] [formerly 7099472204] [formerly ce08022db7 [formerly 7099472204 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]]
Former-commit-id: ce08022db7
Former-commit-id: c17a417cbe [formerly a7302a3232] [formerly 1b4a9c2bf36e763585bfbc84e3a5a6ce5dbd03e0 [formerly c74ae6b83d]]
Former-commit-id: cd29c83d449fdcaba1122415142340d3b6f1881f [formerly 5ae2a544ca]
Former-commit-id: 3a195bd22e
2014-02-12 13:47:20 -06:00
Brian.Dyke
fc21d2dee4 14.1.1-18 baseline
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
2014-02-11 15:52:50 -05:00
Lee Venable
bd92b85084 Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
Former-commit-id: 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly 6773d174ec [formerly c7cfd49622] [formerly 5c256dc19c] [formerly f078971b5d [formerly 5c256dc19c [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]]
Former-commit-id: f078971b5d
Former-commit-id: f8ae04bce2 [formerly ab6fab4199] [formerly fb3d041cae5b972726c8f92403f7ef7c6570c7bf [formerly 42fdfa4964]]
Former-commit-id: fbc5baf5f9b34b3a8ed1c177ca437f4840d40632 [formerly 22aab74e8d]
Former-commit-id: c1543acd86
2014-02-11 09:15:44 -06:00
Nate Jensen
aba5c50bfe Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 1dcb3a77c3 [formerly c0256ac19e] [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497]]
Former-commit-id: 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5 [formerly 9e09da8bb6]
Former-commit-id: 93a740106d
2014-02-10 16:48:29 -06:00
Max Schenkelberg
75cde90e40 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly 7de6ff30da [formerly 3c1fafe328] [formerly 7822511754] [formerly a8a67634f9 [formerly 7822511754 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]]
Former-commit-id: a8a67634f9
Former-commit-id: 8ddc6b95e4 [formerly dd872433c7] [formerly a6667b70df86f17d8dea3939535e720a8767c67d [formerly e2e9eaaf35]]
Former-commit-id: 724e3e430da7d1dade1094fde0ea1cb4e6b99344 [formerly 9d6d418d48]
Former-commit-id: 560bc77a16
2014-02-10 13:43:16 -06:00
Lee Venable
f41d73618d Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
Former-commit-id: b90abb03c1 [formerly d6fa79f1a7] [formerly 27be4297e6] [formerly b90abb03c1 [formerly d6fa79f1a7] [formerly 27be4297e6] [formerly 88a9d20316 [formerly 27be4297e6 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]]]
Former-commit-id: 88a9d20316
Former-commit-id: e9e5667274 [formerly 65e6fa1963] [formerly e7218f6aecd2d4898858f31ff591b76d092b3d14 [formerly d975dcf01e]]
Former-commit-id: 2aa0d25045e6db0c7585d4a56307a543da16bf81 [formerly 78df434dba]
Former-commit-id: 1a8f530d0d
2014-02-10 11:50:07 -06:00
Nate Jensen
46442acd0f Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
Former-commit-id: fb8ce8da65 [formerly d16d679809] [formerly 5c7c14a6c4] [formerly fb8ce8da65 [formerly d16d679809] [formerly 5c7c14a6c4] [formerly a48c1c6783 [formerly 5c7c14a6c4 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]]]
Former-commit-id: a48c1c6783
Former-commit-id: c65669a6bf [formerly 3047063c6e] [formerly 56b6cef3203d3700e7f7c9be8f7525f5d508e9c2 [formerly 57aa678883]]
Former-commit-id: 2745a51d0fadc11fe20353c3bf2ba06fabdef183 [formerly 9459523de9]
Former-commit-id: 2effa29507
2014-02-10 09:53:41 -06:00
Mike Duff
239b4a038f Issue #2453 - Notification Center refactor
Former-commit-id: c20018d0ba [formerly 61c57d2254] [formerly eeb78f7f20] [formerly c20018d0ba [formerly 61c57d2254] [formerly eeb78f7f20] [formerly 2c9d603e50 [formerly eeb78f7f20 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]]]
Former-commit-id: 2c9d603e50
Former-commit-id: b62abd4219 [formerly 7535b51fe7] [formerly 54e4296d2e02deec8772b1aa27026f2486ecd7da [formerly 4a87525df0]]
Former-commit-id: 22f20d75e586ec99c087bbc87cae6dd9e95f7f6d [formerly f005aa3d8d]
Former-commit-id: a87ce0b532
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
f2b9191863 Issue #2211 Fix data mapped sampling.
Former-commit-id: e7baa5b186 [formerly d219a687c9] [formerly 724bb85676] [formerly e7baa5b186 [formerly d219a687c9] [formerly 724bb85676] [formerly 3d76d6655b [formerly 724bb85676 [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]]
Former-commit-id: 3d76d6655b
Former-commit-id: 7f8ff5efc0 [formerly a37a910f67] [formerly 6fc70ed6daf823669783c4000e189cbb10a17f8d [formerly 6a95dd6242]]
Former-commit-id: 9362efc90ebebf4fffc157294abf0ea1f20992bc [formerly a8c075d7e3]
Former-commit-id: eb65002cf6
2014-02-07 13:00:00 -06:00
David Gillingham
cc3256e77a Issue #2509: Fix baseline merge breakage to ifpIMAGE.
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00

Former-commit-id: dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly dc8f0dde25 [formerly b12e29dd7c] [formerly 03d36b8309] [formerly e8ffc73893 [formerly 03d36b8309 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]]
Former-commit-id: e8ffc73893
Former-commit-id: 8cdf1ce158 [formerly ad8c40032f] [formerly bcf359e669db6d450eb89b007e4262c8f81e5b91 [formerly 94ec272ab2]]
Former-commit-id: 6d66a54db19d8e116fa26979efe8601acefd73a2 [formerly 06d68cc0be]
Former-commit-id: e20060f1da
2014-02-07 09:51:42 -06:00
Richard Peter
1956e06576 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]]]]
Former-commit-id: 36d3d21b57
Former-commit-id: 5a7e7af23b [formerly c3c1205848] [formerly 15e05c73cb80bc97c2edc96c60ee1065b9f736b4 [formerly c965993d17]]
Former-commit-id: 34784310173da5accc225bf38ea0abccf3c639e4 [formerly 15c2f761be]
Former-commit-id: 8471e5dd46
2014-02-05 18:20:36 -06:00
Mike Duff
6f00321a11 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 229efa7c5b [formerly 9edf591218] [formerly c5c924842a196e06e1a50bd0c39e0bc05f4fb139 [formerly 6a2f75e8d5]]
Former-commit-id: 48997d15c589f0dd6cb352af2ea838edf7a6e2dd [formerly bb43ec00b1]
Former-commit-id: 377beb33a8
2014-02-05 16:08:01 -06:00
Brian.Dyke
99b2a226bc Issue #124
Former-commit-id: 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 6d35a4b1bc [formerly 3ba93b175e] [formerly 439f053309] [formerly 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: d274021768 [formerly e1d788683d] [formerly 1e605ca4a47aef453131de36960bb5a057128099 [formerly 90b4e7ebf0]]
Former-commit-id: 5a34ed2e1d56f086517b4572c3b7029b51000d64 [formerly ff2ccb40e4]
Former-commit-id: 4b9bccad66
2014-02-04 16:56:47 -05:00
Brian.Dyke
2bc1fcbaa2 Issue #83
Former-commit-id: 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly 89422cef7c [formerly f2e56b268c] [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 484119f6b0 [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 8e78870c71 [formerly 3c160bb05e] [formerly 75d1cbbdb2e42e3d0ad9d5112f388174acbf50f1 [formerly f088dab5ef]]
Former-commit-id: 799ac9274e6dd53615f019c76b975281bd597c94 [formerly 870b355263]
Former-commit-id: 42e17bf5f3
2014-02-04 16:32:42 -05:00
Mike Duff
a67dbae2a2 Issue #2722 - Add auto refresh to sub manager dialog
Former-commit-id: 8d92217e94 [formerly 227eb23157] [formerly 04ee397f2b] [formerly 8d92217e94 [formerly 227eb23157] [formerly 04ee397f2b] [formerly ab9621698f [formerly 04ee397f2b [formerly f678a39b37040bd637cf210f73aaef0841bda36e]]]]
Former-commit-id: ab9621698f
Former-commit-id: e1023f0bc4 [formerly f7566298b2] [formerly 81c8a2b9d2b37711be589b2c809d03532ae8c45f [formerly e984863c1c]]
Former-commit-id: ceb81e0f4adc6721ecab300474a9f86d1762a8f0 [formerly bb919f7d09]
Former-commit-id: 267f0aac0b
2014-02-04 12:45:33 -06:00
Brian.Dyke
e0236cc20a 14.1.1-17 baseline
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361]
Former-commit-id: b8f7317b9d
2014-02-04 12:33:46 -05:00
Ben Steffensmeier
0f46b1035c Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834

Former-commit-id: fc0d044bd9 [formerly 921401ffe9] [formerly 8865177c6b] [formerly fc0d044bd9 [formerly 921401ffe9] [formerly 8865177c6b] [formerly 97a64f89f1 [formerly 8865177c6b [formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]]]
Former-commit-id: 97a64f89f1
Former-commit-id: a63cd52b14 [formerly 1f34342948] [formerly e17a311de5c08292ece4f9c8f0ed3adc52531127 [formerly 2be72739b5]]
Former-commit-id: 5f02ff107456e1919928842ef0b933df4109d5d0 [formerly d05d31fa34]
Former-commit-id: f81c6dd1b9
2014-02-03 14:07:07 -06:00
Max Schenkelberg
de4a452a07 Issue #2680 Fixed various OpenGL errors
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 431ffa97ae4b1c9159c4607e51dbed23c77b76d2 [formerly f4765d1577] [formerly 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly 037cd48c62 [formerly 5d488d27b9] [formerly 83c600ada9] [formerly f4765d1577 [formerly 83c600ada9 [formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]]])

Former-commit-id: b63edcc8a7 [formerly 122c3442f8] [formerly 0c840cf724] [formerly b63edcc8a7 [formerly 122c3442f8] [formerly 0c840cf724] [formerly d566ed9927 [formerly 0c840cf724 [formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]]]
Former-commit-id: d566ed9927
Former-commit-id: b495451e3f [formerly e1717b2729] [formerly 5c9afda4f5c9656fe346333485798a21a785033b [formerly f5ff746126]]
Former-commit-id: 59db9c4c77b351f78f275bd48b818837b3a50530 [formerly 1cdbdfceba]
Former-commit-id: 6953e81887
2014-01-29 10:15:38 -06:00
Mike Duff
78c69c43df Issue #2459 - Last change from unscheduled to deactivated.
Former-commit-id: 9a0665ccc8 [formerly 3766f6a0f4] [formerly e46c226489] [formerly 9a0665ccc8 [formerly 3766f6a0f4] [formerly e46c226489] [formerly 81aa9ce0cb [formerly e46c226489 [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]]
Former-commit-id: 81aa9ce0cb
Former-commit-id: 07fb9b74d5 [formerly ef5d3f370c] [formerly 36d2c58bed76ee7aef5431b41fe9592aebf50dc7 [formerly 5fc96739b9]]
Former-commit-id: d8450dac1871558df8eb12f7c659cd02e05826d2 [formerly 0b39c2977b]
Former-commit-id: c030596afe
2014-01-26 18:57:26 -06:00
Mike Duff
855a7081af Issue #2452 - Changed label based on feedback.
Former-commit-id: bb8b6eea5f [formerly fb6194c464] [formerly 1da1285311] [formerly bb8b6eea5f [formerly fb6194c464] [formerly 1da1285311] [formerly 6dcd1a7969 [formerly 1da1285311 [formerly dd74aef827f0892c64a7efd60b0edd1156ef31ec]]]]
Former-commit-id: 6dcd1a7969
Former-commit-id: 3e4b74c79d [formerly eaaab3b082] [formerly 28722ea6fd1407967384474a85ef503f13c4099c [formerly be59be53d4]]
Former-commit-id: 7bf78841300ce9e51221e865a2fb98549039cad1 [formerly df6c94e317]
Former-commit-id: c9ca18c0ef
2014-01-25 14:41:20 -06:00
Nate Jensen
c00ad2c4b6 Issue #2359 printout shutdown of application to try and detect kills
Change-Id: I113890428cfd5a22c2fbb0a4abdcff18a4ccd11e

Former-commit-id: 567a18dab4 [formerly f5ce7b485d] [formerly 47d6e5b54f] [formerly 567a18dab4 [formerly f5ce7b485d] [formerly 47d6e5b54f] [formerly cdbd05b293 [formerly 47d6e5b54f [formerly 34b2c7a402bcf7f3b04ea1e98090f7e0df48566f]]]]
Former-commit-id: cdbd05b293
Former-commit-id: a773aec724 [formerly e6e9cab9f9] [formerly 53e2e8b666941bdcfe30a8f595600e7f0cdd6072 [formerly 7dd0b1c978]]
Former-commit-id: 1766fe6489d42b8e43a44ef7a033149db835047d [formerly 0c9e613674]
Former-commit-id: ff4eb32010
2014-01-23 19:02:37 -06:00
Ben Steffensmeier
73582268f7 Issue #2363 Add General implementation od IColormapShadedShapeExtension so that all targets will be able to render filled wind barbs.
Former-commit-id: 33bf8e9c44 [formerly 9c65c5b07b] [formerly 6aa6683258] [formerly 33bf8e9c44 [formerly 9c65c5b07b] [formerly 6aa6683258] [formerly a92f6e9bb6 [formerly 6aa6683258 [formerly e214a045c4d45532ed80fb4cdd51355c7884a2ee]]]]
Former-commit-id: a92f6e9bb6
Former-commit-id: 3f053ee508 [formerly 9b788b49b0] [formerly beeaf72ec6549c4e1072090e287697ca2d2233bf [formerly b90004e46a]]
Former-commit-id: 302e89b036ed4b5f75a49983016fe4fad5d7ce09 [formerly 8cdb888e20]
Former-commit-id: 27cbedca7a
2014-01-23 12:41:16 -06:00
Ben Steffensmeier
b2796fad17 Issue #2602 Don't try to load classes from uninstalled bundles.
Former-commit-id: f1de2aaded [formerly c7357863b9] [formerly 0c4fc0dd01] [formerly f1de2aaded [formerly c7357863b9] [formerly 0c4fc0dd01] [formerly 3187754736 [formerly 0c4fc0dd01 [formerly 30ca0135046851884e4a07b36559fce086ccd3f2]]]]
Former-commit-id: 3187754736
Former-commit-id: 159642b200 [formerly 32bac228db] [formerly 983c7624df570de47db5a313760f0b69fec21954 [formerly d1dbd0c9b6]]
Former-commit-id: fefd0b88a3ec29be5c62491680dd70324b14dee9 [formerly 5c14bbf179]
Former-commit-id: 6b7e12df21
2014-01-22 15:46:51 -06:00
Mike Duff
0672db6081 Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.
Former-commit-id: 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 4038246f93 [formerly 9bd8e84b9f] [formerly bdf6a002f6] [formerly 9a2d2af4a9 [formerly bdf6a002f6 [formerly 5fc6b9fcc55b6e93c9837c7b99347df8f28fc90a]]]]
Former-commit-id: 9a2d2af4a9
Former-commit-id: 7e3e76e9da [formerly e929abf7d7] [formerly d100328be0c1140a5b43dcb2f41ad9e6ab41095e [formerly 9112366cae]]
Former-commit-id: d799b7c4eda4917284ed7af90a20dbf028cb2301 [formerly 8844bbbe2d]
Former-commit-id: e8d473b9c6
2014-01-20 17:44:02 -06:00
Lee Venable
4bdf61e5c8 Merge "Issue #2291 - Fixed resizing of components." into omaha_14.2.1
Former-commit-id: c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly c3022f8274 [formerly d825d627bd] [formerly b3928f4f49] [formerly dd12515ca2 [formerly b3928f4f49 [formerly 277513c8d810a3996d93fd04a5691eb730c78630]]]]
Former-commit-id: dd12515ca2
Former-commit-id: b40ae43582 [formerly 82eafd385d] [formerly 4206ad0dee836a41182154fcefd07a187f71acab [formerly 4e121d1261]]
Former-commit-id: e8ca26070331c161e10162a907845e0d45540ed2 [formerly edab55763c]
Former-commit-id: 916f05e2bd
2014-01-20 17:32:38 -06:00
Nate Jensen
c05a8445aa Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1
Former-commit-id: 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 55203d0486 [formerly c598185130] [formerly d78dbb85d5] [formerly 54262ad318 [formerly d78dbb85d5 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]]
Former-commit-id: 54262ad318
Former-commit-id: c2340dfd07 [formerly 5b84b27087] [formerly 3b53bce38675c75e649c3c5c70ab3876d1503296 [formerly f13cb9ae26]]
Former-commit-id: 787abc1e824a9e298d32cfcb5fc6c03b5dcb589c [formerly 1ee13de1db]
Former-commit-id: 8c247a36e6
2014-01-20 17:32:15 -06:00
Lee Venable
36195992bd Issue #2291 - Fixed resizing of components.
Former-commit-id: ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly ea96ce87e9 [formerly 39e8124ef7] [formerly 1927ba49ea] [formerly d3eb6c16ec [formerly 1927ba49ea [formerly 9956936125611cd67aaaf6ba6e617e01b004a738]]]]
Former-commit-id: d3eb6c16ec
Former-commit-id: 9ecbd3bc7a [formerly dad11aca88] [formerly 3951681cd94fb490f91e2f28a8cc25e01dca0872 [formerly b8520d1e12]]
Former-commit-id: 01a9b6f90dbcee7c5d6fccf8f0fae83e9311a50b [formerly 9bf640f116]
Former-commit-id: 19d90c676f
2014-01-20 17:26:28 -06:00
Ron Anderson
643c0819b1 Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]]
Former-commit-id: 66bbc99784
Former-commit-id: 9b8c8310ab [formerly 0048ef6a96] [formerly c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]]
Former-commit-id: 52bde166e586e19680a1aa9f75a55d0e29557a25 [formerly 841504f145]
Former-commit-id: 385547a5e5
2014-01-20 17:22:26 -06:00
Richard Peter
caf9de2ed6 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 007de15a53 [formerly e6bc012925] [formerly 6b859c9a42] [formerly 29ba337367 [formerly 6b859c9a42 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]]]]
Former-commit-id: 29ba337367
Former-commit-id: fa5e160245 [formerly 4796beec29] [formerly 4d7e2eae126edb00fa4f829dd78950b4c1bcb955 [formerly 4887054146]]
Former-commit-id: d0dd309b0a417a6444396ea3b859924e5cfdca56 [formerly b147653a66]
Former-commit-id: d0ef42d528
2014-01-20 17:21:21 -06:00
Steve Harris
f8496662a0 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 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb]
Former-commit-id: ccd2f6cdaa
2014-01-20 10:17:44 -06:00
Mike Duff
67bab78c2f Issue #2459 - Remove unscheduled status from UI
Former-commit-id: e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly e6efbf5663 [formerly 0cfa9ee36c] [formerly 93cb80cfc7] [formerly 25d1d39fc2 [formerly 93cb80cfc7 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]]]]
Former-commit-id: 25d1d39fc2
Former-commit-id: 5097ed2ad7 [formerly a492ec6a4d] [formerly 77ea703f0626d7ff1caa2689bf5deb3e8b0b0c00 [formerly a04430e334]]
Former-commit-id: 8d18315d712b7d954433a4d91c196a329a74eeaa [formerly dcb5b4a111]
Former-commit-id: 45bef29f75
2014-01-17 15:34:48 -06:00
gerritcm
e924818487 14.1.1-16 baseline
Former-commit-id: 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly 57472968be [formerly 9e935404d8] [formerly 6be938e6eb] [formerly b84f7d4203 [formerly 6be938e6eb [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]]
Former-commit-id: b84f7d4203
Former-commit-id: c1df3eb55c [formerly b72cd19055] [formerly 8a149ceb12545503e179389c0569fad3eefaed15 [formerly 644da23327]]
Former-commit-id: d2214c65a6550cba23bc7837777ef6a2fc6d443a [formerly 5f79da2501]
Former-commit-id: 6bf3189db9
2014-01-16 16:43:05 -05:00
Nate Jensen
9081058ca2 Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 26ce19331e [formerly 9028260386] [formerly ae10129713] [formerly 9d529b3b21 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]]]
Former-commit-id: 9d529b3b21
Former-commit-id: 9f4360fdda [formerly 98e1bf9194] [formerly 194b6af74ffb08201bff51fb4de3ff2d6d3448d9 [formerly 1be41d69c6]]
Former-commit-id: d4f72fd00fd9496a9587b235b75d9efcd7bc6b81 [formerly 3d6d9118ea]
Former-commit-id: 86b9311ed4
2014-01-15 17:36:30 -06:00
Nate Jensen
96501f3ee6 Issue #2359 printout connection exceptions to aid in diagnosing
connectivity problems

Change-Id: I957abb82cd3a736485f289a266b00cdbd89a578c

Former-commit-id: aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly aa0639a878 [formerly ccaa9dbde1] [formerly fc6b31c1c0] [formerly 5f39322d59 [formerly fc6b31c1c0 [formerly 8d7445a4ba4b76335166569de32c00bac1a2a84b]]]]
Former-commit-id: 5f39322d59
Former-commit-id: 472cf2905c [formerly 4533642f26] [formerly 6ed8c7d69c73010ecba0450f2c9d1203bc9f3ab4 [formerly deb57e3b35]]
Former-commit-id: 2fda878e376a0359217f3278b54cbfd5b9f6ba63 [formerly fd32fb6c6e]
Former-commit-id: 2ff7910650
2014-01-15 13:39:28 -06:00
Mike Duff
5ea95dbca9 Issue #2459 - Refactor the subscription status
Former-commit-id: 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 43810aa5f5 [formerly d03c012a54] [formerly f94593867e] [formerly 245d76358e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]]
Former-commit-id: 245d76358e
Former-commit-id: c5f28e0f37 [formerly 9a45b95db6] [formerly ebd7027d07dcf26d5e0b30ecd0d661a72afa18e1 [formerly d96a9d2937]]
Former-commit-id: 86f4629abcfe03116c78ec209c22d6df91eac0b9 [formerly 3c0634b1e8]
Former-commit-id: c8f7edbcad
2014-01-15 09:21:30 -06:00
Ron Anderson
f33f5aec85 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: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
2014-01-13 17:45:20 -06:00
Richard Peter
35aff78756 Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]]
Former-commit-id: e6d7acb609
Former-commit-id: 1e10acc664 [formerly 5b687c7bd5] [formerly 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]]
Former-commit-id: 0d5015fa8d377254f6d7ba50cf3545c4029a7b43 [formerly b14835bae6]
Former-commit-id: d047e8210a
2014-01-10 15:42:48 -06:00
Mike Duff
6467415631 Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]]
Former-commit-id: 7081c26823
Former-commit-id: c8885b34f1 [formerly b616f34af2] [formerly e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]]
Former-commit-id: 27bd74b3d39111665cada21d7ce2034177a0ed3b [formerly c1e3dd57b6]
Former-commit-id: 0823eab3bf
2014-01-10 12:05:30 -06:00
Mike Duff
fa2d6a608f Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]]
Former-commit-id: 28114764a5
Former-commit-id: 5f19ccc46e [formerly 12c47ea375] [formerly 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]]
Former-commit-id: a84c6000a796403c7b1ca87aa3d889b74de0ab97 [formerly 2906b0bed2]
Former-commit-id: ca2667855c
2014-01-10 10:57:18 -06:00
Richard Peter
b96f5d0716 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]]
Former-commit-id: 52850fe95a
Former-commit-id: a25ad86347 [formerly b833c4333c] [formerly 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]]
Former-commit-id: eb0676b7f5eb5f662c1df67b863f2502f758d1d2 [formerly fd7fde3cdf]
Former-commit-id: e60037e842
2014-01-09 16:58:39 -06:00