Commit graph

1723 commits

Author SHA1 Message Date
Nate Jensen
22d9440b6a Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: c70110d442b8e122c8572c0d2850cbac6c42bc1a [formerly e575c19ab6]
Former-commit-id: a06bb176ba
2013-05-21 10:26:18 -05:00
Dustin Johnson
bf3f162fc9 Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]
Former-commit-id: bd65447c9f
2013-05-21 08:19:34 -05:00
Richard Peter
5efe58df0b Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]
Former-commit-id: 72206676ee
2013-05-20 17:49:22 -05:00
Roger Ferrel
0db7741ce5 Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe]
Former-commit-id: 4a5073902f
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
a075a5d665 Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: 7d52bbbaa0 [formerly aa3b8c80f4] [formerly 26e80bbd18] [formerly 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]
Former-commit-id: 885b106652
Former-commit-id: cbee870e9d200703dc59998e51a5ad2251e0852a [formerly 13b2b4afef]
Former-commit-id: a03dbd284b
2013-05-20 17:27:15 -05:00
Dustin Johnson
4d30dc16c6 Issue #2000 Subscription overlap configuration GUI
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 97b3d509a5df6b5067753a00490a5ec5d5462760 [formerly 7858a3b57f]
Former-commit-id: 3a504d1e7b
2013-05-20 17:12:47 -05:00
Richard Peter
5cfae97674 Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: 8cf1fe91f6ba1e424448c5cb7262a1998e5c2cfc [formerly 0ced8c87e4]
Former-commit-id: e03cf56895
2013-05-20 14:48:47 -05:00
Richard Peter
f186912fe1 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]
Former-commit-id: aff520d61b
2013-05-17 10:33:18 -05:00
Max Schenkelberg
0c954fc284 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 71624ccda3 [formerly 4d435d3dd5] [formerly c421240835] [formerly d07de0870f [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: ccf927342ef0766ab38c884f7d5b2cc881d0fb52 [formerly a94469df82]
Former-commit-id: 7ce0b7ef13
2013-05-16 18:04:26 -05:00
Nate Jensen
8ff1aae296 Merge "Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource." into development
Former-commit-id: c7868a028e [formerly 9a3f855a1a] [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 39543d7ee0 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 45406f4e5394c5620f8f9c11ae40ea432dc3982e [formerly ffa74c3bdb]
Former-commit-id: 7f58e8a568
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
7651920be7 Issue #1869 Remove DataURI column from qc.
Former-commit-id: c7b7f58de8 [formerly 89b4bd571a] [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 50574b57e3d993a195cef03df3a9392ebf66dafd [formerly 6353b7e04b]
Former-commit-id: 777f12fbad
2013-05-16 17:48:37 -05:00
Steve Harris
9b898a6478 Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: f9535abb10 [formerly 87a31f9990] [formerly 16ba74496d] [formerly b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615]
Former-commit-id: b5d3ff1867
2013-05-16 13:45:58 -05:00
Bryan Kowal
ad92c1c79e Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds
- The new p2 director is not able to install zipped repositories; so, each repository
  is now unzipped before installation during the CAVE Assembly phase of the Windows
  32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
  in the correct order during the CAVE Assembly phase of the Windows 32-bit build


Former-commit-id: da601e2c35 [formerly dccc6e4a96] [formerly 7e849f0af3] [formerly 22d4494918 [formerly 7e849f0af3 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918
Former-commit-id: bc694aaf1872e8bd9a930f4cc339550e297ab627 [formerly 560fb81038]
Former-commit-id: 88cc3a6011
2013-05-16 11:01:40 -05:00
Max Schenkelberg
6ddb455763 Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource.
Amend: Corrected ticket number

Change-Id: Ice336b6b4fb286dd4905f43b6f16259f23dea0c6

Former-commit-id: 33f7156a45 [formerly 62efca5041] [formerly 67e0d17aed] [formerly 8b4d47c690 [formerly 67e0d17aed [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]]
Former-commit-id: 8b4d47c690
Former-commit-id: 9c30edc05a7e1827e11b53976977decdf367c0eb [formerly 0038138fdc]
Former-commit-id: a3ad1c7c45
2013-05-16 10:54:52 -05:00
Steve Harris
7d55d0e959 13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]
Former-commit-id: 67a95d07d2
2013-05-16 11:12:07 -04:00
Nate Jensen
c90f9d93c4 Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 367784bd99 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]
Former-commit-id: 367784bd99
Former-commit-id: 02ae66490caf635a65f4c6e90eb7bba1df7b05a1 [formerly e4b47d1eb9]
Former-commit-id: 1355010c38
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
7c5e49cf35 Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: da6bf90b2d [formerly 5a8118b5a8] [formerly 51015cd592] [formerly 1a1592ea3d [formerly 51015cd592 [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 039dcec9a1c91a057d7e28627ea17b7cb99824f6 [formerly 4a8a5b16af]
Former-commit-id: 4fa2a21323
2013-05-15 18:22:25 -05:00
Nate Jensen
eb47297ab1 Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]
Former-commit-id: 662fac5b31
Former-commit-id: 2ff5c10f02a0d7646fee845f2165008d3070734a [formerly ae5df55dba]
Former-commit-id: 8b1298777c
2013-05-15 16:25:23 -05:00
Ben Steffensmeier
6afa65fd07 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly bbe2667522 [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]
Former-commit-id: bbe2667522
Former-commit-id: 2d0c00b44c52062e4bb1a079d156e9a7a0b2bbdf [formerly f813b40379]
Former-commit-id: b3a2cd22c7
2013-05-15 15:35:02 -05:00
Richard Peter
54bde542cd Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 9112e3b2b0 [formerly 186f7169af] [formerly 286ec23fab] [formerly bcbe24f489 [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]
Former-commit-id: bcbe24f489
Former-commit-id: 7f3ecaa744db0e047ec3e78cd18a3055a56c4668 [formerly ce6452daac]
Former-commit-id: 589fcada8b
2013-05-15 14:41:04 -05:00
Nate Jensen
686ad54de8 Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 058e32d421 [formerly bb307ed685] [formerly 35830d317d] [formerly 7f9ef5ce98 [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: 209109c17ddec84f38f3a259f5a4ad89242e92a2 [formerly 4c7b2d73d3]
Former-commit-id: dbe24d00fd
2013-05-15 14:00:15 -05:00
David Gillingham
cde903747e Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

Former-commit-id: df43f4a624 [formerly 0cbf36df79] [formerly 9c688f7070] [formerly 84158e76c7 [formerly 9c688f7070 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]
Former-commit-id: 84158e76c7
Former-commit-id: a8636a4e98415e0e3d55ec975e4e04cbd7c92415 [formerly ca10ac1598]
Former-commit-id: 9f79748cd2
2013-05-15 13:56:53 -05:00
Nate Jensen
4b07083989 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: a0b1b9053a [formerly 86d3bf5a7c] [formerly 948e47a2c6] [formerly fecadf104b [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]
Former-commit-id: fecadf104b
Former-commit-id: 45cf8bb5f9314dc1648e43987c8690bb4bf5a8d8 [formerly ba3bda461c]
Former-commit-id: 9284c27ddd
2013-05-15 13:36:09 -05:00
Ben Steffensmeier
676bd25f45 Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 1c3e60a5ff [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 20ed4a4554d6c5b51d73a5b064aa0c228a1bc816 [formerly 8ea143a147]
Former-commit-id: cb335861c2
2013-05-15 12:50:08 -05:00
Richard Peter
9b717cdeea Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: 5714866fc5 [formerly d81cee387b] [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 0523d790f8 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: 27cc1cc3fc9fe261074c7a9de671269bbc5b9df3 [formerly b40e0ca1c9]
Former-commit-id: e0c4287959
2013-05-15 12:44:48 -05:00
Nate Jensen
47be3995a9 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: b1ed04a275 [formerly 0c718e1cd1] [formerly 5280b54277] [formerly 4e63b88031 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]
Former-commit-id: 4e63b88031
Former-commit-id: 5cf8e53ac89e47650c22747cbc9c44014230f489 [formerly 1e059ee8d9]
Former-commit-id: 65fdf84101
2013-05-15 09:22:16 -05:00
Nate Jensen
3e3ca41da5 Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: a9dcdd018b [formerly 8c03ad79d6] [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: f100c9c2896648c965a1faa49f8fe19b7324d50e [formerly e7f638ce3b]
Former-commit-id: eb75eaf6ce
2013-05-14 16:36:47 -05:00
Nate Jensen
11d5713451 Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 45c3d17eb7 [formerly 521420916e] [formerly 6c42b5af64] [formerly 661482f1dd [formerly 6c42b5af64 [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]]
Former-commit-id: 661482f1dd
Former-commit-id: 48e574f0b537470c8877c74ef60bb21105a29b84 [formerly 301b294d66]
Former-commit-id: 9680f63df2
2013-05-14 16:23:00 -05:00
Nate Jensen
575b6335c3 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]
Former-commit-id: dac803ca07
2013-05-14 16:16:13 -05:00
Dustin Johnson
dac25447e5 Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: dd1b2d0472 [formerly c302fafbd2] [formerly 341ce0c8c2] [formerly a5a0e3e280 [formerly 341ce0c8c2 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]]
Former-commit-id: a5a0e3e280
Former-commit-id: 21a28c8d1bddb4689b443e78a68fb08d1fd36c4b [formerly 21e66394be]
Former-commit-id: 66126d5411
2013-05-14 15:48:58 -05:00
Dustin Johnson
cb3d9d1bb9 Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: b4e94bbebe [formerly 3447a3726b] [formerly db2e3cd9bb] [formerly fdf3ac7897 [formerly db2e3cd9bb [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]]
Former-commit-id: fdf3ac7897
Former-commit-id: d257155045c32d99334087cafb3c78dab9537c29 [formerly 085058e788]
Former-commit-id: 5f2de42ebe
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
05c7617fae Issue #1869 Get plots working without dataURI
Former-commit-id: 7267acf078 [formerly 2ce2fc8a17] [formerly 79139629a6] [formerly a84c975426 [formerly 79139629a6 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]]
Former-commit-id: a84c975426
Former-commit-id: 9e224448a5b9a9f4dba22a128d1db00c81a90c9d [formerly 2dfb65b594]
Former-commit-id: 9ebbfb262d
2013-05-14 14:42:47 -05:00
Roger Ferrel
c233a43561 Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]
Former-commit-id: 9f9f85f875
Former-commit-id: 1979b4a6badaebd7c518bd6e2d3e6e39ee777737 [formerly ab75cd5107]
Former-commit-id: fb15e2d0a6
2013-05-14 13:49:53 -05:00
Richard Peter
0bb437873f Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 6c406d6a8e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]]
Former-commit-id: 6c406d6a8e
Former-commit-id: 261e579f04551c139fed42c204c4a8c3d9be208b [formerly 3309e0c3b7]
Former-commit-id: b4e46593a8
2013-05-14 09:40:21 -05:00
Steve Harris
fddef92bf3 13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]
Former-commit-id: 5465764527
2013-05-14 09:21:41 -04:00
Ben Steffensmeier
246c696a0c Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: 51d638c7d3 [formerly 4d3f9ee7d0] [formerly f856d0e02b] [formerly 1d900e6b94 [formerly f856d0e02b [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]]
Former-commit-id: 1d900e6b94
Former-commit-id: 33d95552094ab81225c39706c24033b1385d6730 [formerly d0e1ff7ce3]
Former-commit-id: edcd8df871
2013-05-13 18:33:24 -05:00
Richard Peter
2813a8fc47 Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: 31a84fb91f [formerly c63a4882e7] [formerly 99391cfe12] [formerly d4135dba62 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]]
Former-commit-id: d4135dba62
Former-commit-id: adfd41ab237c568aeecc21759b668b8afa0b7822 [formerly a02955e40c]
Former-commit-id: 43a90c062c
2013-05-13 17:16:57 -05:00
Richard Peter
994357c357 Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]
Former-commit-id: 6c09ab9bdf
2013-05-13 17:11:05 -05:00
Richard Peter
b2b66da141 Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: b374309faf [formerly 4ae23b93d9] [formerly 8062c38b71] [formerly ba590e2f93 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]
Former-commit-id: ba590e2f93
Former-commit-id: 845e355d3758a8223bad200d62847aef296e66cc [formerly 8e5929406c]
Former-commit-id: faf22cc925
2013-05-13 16:33:50 -05:00
Steve Harris
6e1e454a9f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]
Former-commit-id: ff7a21ac37
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
c9c011aecc Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1823c1850c [formerly 926da8983e] [formerly e5fc3f3835] [formerly 598ce2ae6c [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: f1b73d9e52924ffdea1445f4fde629bcef0cc742 [formerly b4c645f99f]
Former-commit-id: bb257fc9e5
2013-05-13 11:42:54 -05:00
Ben Steffensmeier
e261ac41b8 Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 019f4ce7ef [formerly 8e550124f4] [formerly 2b4dd1521b] [formerly baf051a27e [formerly 2b4dd1521b [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]]
Former-commit-id: baf051a27e
Former-commit-id: 1be14a07a2404076176e3055753709833e1992be [formerly 9aab9c6034]
Former-commit-id: c862d04d57
2013-05-13 11:26:47 -05:00
Mike Duff
8fa2b8ce8c Issue #1919 - Fix VGBs in FFMP
Former-commit-id: 66f929fb14 [formerly d087b03eb3] [formerly f887a41875] [formerly 7874521269 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]
Former-commit-id: 7874521269
Former-commit-id: 130559fc1d4fb0be58387838e519191858bc2120 [formerly d262dc63f0]
Former-commit-id: 311ce09129
2013-05-10 09:58:02 -05:00
Roger Ferrel
2370bb2932 Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen.
Change-Id: If8045d03084b9085b573cc11c42b6a2f93ffacc8

Former-commit-id: 7636a7fcad [formerly 3b27e54b31] [formerly d1a3e3dc2f] [formerly 938cd275cc [formerly d1a3e3dc2f [formerly b794f0b882d88cec6f552bf10f7f58096dfd5a69]]]
Former-commit-id: 938cd275cc
Former-commit-id: 68d47f06839ee2e4b2e5e7f584b42183fbf5fe7d [formerly 2be6266c9b]
Former-commit-id: 6523560a48
2013-05-09 08:56:44 -05:00
Nate Jensen
353c62d44a Merge "Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication." into development
Former-commit-id: ef16da1c62 [formerly 6dae59d1ac] [formerly 19f0ca1fb0] [formerly d2a108ed8a [formerly 19f0ca1fb0 [formerly 3ba0adb830cc0839d39a8cd938fbde3cf27e4651]]]
Former-commit-id: d2a108ed8a
Former-commit-id: 7fc605abba0b3c2d0f35f1ec7b54181967ee3fb9 [formerly a5bedd2a27]
Former-commit-id: fce991dac7
2013-05-08 18:42:28 -05:00
Nate Jensen
148a005bfd Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
Former-commit-id: 928953493d [formerly 11965c031f] [formerly 9e0f3acbc0] [formerly e753329f47 [formerly 9e0f3acbc0 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]]
Former-commit-id: e753329f47
Former-commit-id: 017678ac36dc45fdfad60b080392f0b3fef458b8 [formerly 2299e22de2]
Former-commit-id: 84caf44a0c
2013-05-08 18:40:51 -05:00
Max Schenkelberg
6a7461bfb5 Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication.
Amend: Deleted old DecisionTree

Change-Id: Id51a32c42f5485a5261dd73f88f55a6fda3263c8

Former-commit-id: 76d2e27f3f [formerly 14dba9a749] [formerly ea2501abbb] [formerly 40c76c2c82 [formerly ea2501abbb [formerly 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106]]]
Former-commit-id: 40c76c2c82
Former-commit-id: 99c9ac745d21ab21d542ae5c708afb7d811bd08d [formerly fc27ac4a30]
Former-commit-id: 48a283f0f2
2013-05-08 17:58:19 -05:00
Richard Peter
8917cc0b8d Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: c2dcbedf63 [formerly ae84ced7be] [formerly 4f3e86574b] [formerly 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]
Former-commit-id: 697297803c
Former-commit-id: c40599aa14bfde53120b5b8c8af969cd6cc57c9e [formerly cfaeeaff5f]
Former-commit-id: 139c234452
2013-05-08 17:28:01 -05:00
Richard Peter
856824e025 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 289f73d1a4 [formerly 615a1182ea] [formerly f1f8260893] [formerly 785b402364 [formerly f1f8260893 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]]
Former-commit-id: 785b402364
Former-commit-id: c983d21a7d9365c0fb026918dc96f3e1f5d0face [formerly 4e878364c3]
Former-commit-id: 394018accf
2013-05-08 14:55:43 -05:00
Ben Steffensmeier
fcfbf66d4c Issue #1978 Perform variable substitution on subMenu IDs.
Former-commit-id: a631b73aa9 [formerly ff182c21e1] [formerly aec7e4200c] [formerly ef3086cf39 [formerly aec7e4200c [formerly d6ae38dcdde7984d5caebcb27c80780123599854]]]
Former-commit-id: ef3086cf39
Former-commit-id: 3a0e0a1c2c019d24b4fcd63f0eaef8088eff245a [formerly dd72b5cab1]
Former-commit-id: 13913892fa
2013-05-08 14:43:59 -05:00