Commit graph

1938 commits

Author SHA1 Message Date
Richard Peter
8d69735af5 Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c

Former-commit-id: cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]]
Former-commit-id: 7349808131
Former-commit-id: d4eb77b248 [formerly 53190601f6] [formerly 58c6245c0b25ac72406612c59ba4ec5f003980c0 [formerly f3e0966966]]
Former-commit-id: 7b9c4e5c34cbc503c4e1e2d503397fafc52e7632 [formerly c51e6750b4]
Former-commit-id: 62191a8d82
2013-05-23 11:50:34 -05:00
Nate Jensen
de2f575c94 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Mike Duff
afc3142888 Issue #1902 - fix to forced guidance
Peer review comments

Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e

Former-commit-id: 44ef119c41 [formerly b331a68a08] [formerly 11423a7465] [formerly 44ef119c41 [formerly b331a68a08] [formerly 11423a7465] [formerly 2a733fa5f8 [formerly 11423a7465 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: f603c80988 [formerly 2878cde676] [formerly 3698ac621952b956b533e97d2a14a12f002e3478 [formerly 7d177607bf]]
Former-commit-id: 9f4ea3bc120ccb55677c8ae5d8fce8572a9a2e4f [formerly a1dd9d73ba]
Former-commit-id: 12bad74ca8
2013-05-23 09:52:07 -05:00
Greg Armendariz
f0f31d2c81 Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]]
Former-commit-id: a4457f8c83
Former-commit-id: 806a417f0f [formerly 7c97422501] [formerly 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c]]
Former-commit-id: 1cc75374aa871e0feaf7158e22e192dd600ac395 [formerly 28475200b6]
Former-commit-id: b0e11947dd
2013-05-23 09:10:11 -05:00
Roger Ferrel
1282bbbe35 Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]]
Former-commit-id: d35424df4f
Former-commit-id: 3aa439216d [formerly 760b0f3366] [formerly 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]]
Former-commit-id: 4b447312fbfd772bb147bae920d49ac18c6c401c [formerly 6d3604e629]
Former-commit-id: 3ac1658261
2013-05-23 07:36:15 -05:00
Bryan Kowal
c08dd6be23 Issue #1927 - patch ant includegen task
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]]
Former-commit-id: 24c0728db9
Former-commit-id: 0f23a3a390 [formerly e6cfad1759] [formerly 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]]
Former-commit-id: 6660f13270d1f9b3caee0a5a45c859ddb79247bd [formerly 897c70d90c]
Former-commit-id: 58b7ec2195
2013-05-22 18:00:43 -05:00
Steve Harris
6a5b97e11e Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: d477564678 [formerly 389eefd1f9] [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]]
Former-commit-id: 95db422c792e933bcfe1e19c2b8955eb8698bece [formerly c184d31779]
Former-commit-id: 61debd93bf
2013-05-22 16:13:08 -05:00
Steve Harris
32c2d3e5e9 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]]
Former-commit-id: 462652e31e
Former-commit-id: a6bb8b38dd [formerly 026674d0b2] [formerly 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]]
Former-commit-id: 1b7b8110c512177341c86e9272a2b79f0ae52bbb [formerly bd9b2e493e]
Former-commit-id: 6dbe80b1af
2013-05-22 16:10:04 -05:00
Steve Harris
cf67535a3a 13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2]
Former-commit-id: 71e13c4d4d
2013-05-22 16:42:39 -04:00
Richard Peter
c7eba20f0a Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]]
Former-commit-id: b4344d3c04
Former-commit-id: b3c32889b1 [formerly 1bbddf8fdf] [formerly 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]]
Former-commit-id: a7440882bd726d94a23b78fb9f3b0850a75ef7d5 [formerly b3688d78d1]
Former-commit-id: 7d73a32b0a
2013-05-21 13:07:51 -05:00
Richard Peter
c8484145dd Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: ffe0b35085 [formerly 76f11f00ae] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]]
Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd]
Former-commit-id: 7966576f23
2013-05-21 12:11:21 -05:00
Richard Peter
27c6d6f318 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 8e252f89f0 [formerly 21b87e9ea7] [formerly 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]]
Former-commit-id: 7abbd80f0599361a183f199c4e0c507ff370195e [formerly 69e6ea4847]
Former-commit-id: 2a8115770f
2013-05-21 10:35:00 -05:00
Nate Jensen
53916d0ddf Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]]
Former-commit-id: 960bc6db69
Former-commit-id: 22d9440b6a [formerly a06bb176ba] [formerly c70110d442b8e122c8572c0d2850cbac6c42bc1a [formerly e575c19ab6]]
Former-commit-id: 94baa73a7594f7d3c225dc43954967a9ffe4758e [formerly 942855e9f8]
Former-commit-id: c183650ebd
2013-05-21 10:26:18 -05:00
Dustin Johnson
7dc0125c17 Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bf3f162fc9 [formerly bd65447c9f] [formerly 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]]
Former-commit-id: fda3573ffd9d2ba70777c5464631155544a07d85 [formerly 566273cf69]
Former-commit-id: 2cf8ffac1a
2013-05-21 08:19:34 -05:00
Steve Harris
603bc2535a 13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 5db95cce55 [formerly 4d88863515] [formerly d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]]
Former-commit-id: b076884dd48bff50b64587e186d178820fa5b5cf [formerly 2767fd893c]
Former-commit-id: d9f967c811
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
20d086140b Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]]
Former-commit-id: 931e76ae59
Former-commit-id: bd89419f5e [formerly 30eb486e45] [formerly b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]]
Former-commit-id: 2c5b16494b7aca40f1b0a8f7493dcb483fd2f2cf [formerly 9bac8c566c]
Former-commit-id: 4687ddcd62
2013-05-20 18:00:32 -05:00
Richard Peter
e797da83e1 Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 5efe58df0b [formerly 72206676ee] [formerly 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]]
Former-commit-id: 53ab371d1386f1626ee68b7d6007336d6c3b7dc8 [formerly 1418dbf556]
Former-commit-id: a664883d97
2013-05-20 17:49:22 -05:00
Roger Ferrel
51f7ee1219 Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

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

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

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 4d30dc16c6 [formerly 3a504d1e7b] [formerly 97b3d509a5df6b5067753a00490a5ec5d5462760 [formerly 7858a3b57f]]
Former-commit-id: 89d6680a67c8ed3519146cf6dc8353ec7345e96c [formerly d12b26ac1d]
Former-commit-id: a314bd8f4a
2013-05-20 17:12:47 -05:00
Richard Peter
653714f52e Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]]
Former-commit-id: 3d861eca69
Former-commit-id: 5cfae97674 [formerly e03cf56895] [formerly 8cf1fe91f6ba1e424448c5cb7262a1998e5c2cfc [formerly 0ced8c87e4]]
Former-commit-id: 5da2c4b21999884ff9e2a6246faba4e63d76be99 [formerly b032b405ed]
Former-commit-id: 6a6b25ebda
2013-05-20 14:48:47 -05:00
Steve Harris
0b9bf76434 13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244 [formerly 7e04d8cd13] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82]
Former-commit-id: b41118326c
2013-05-20 10:52:47 -04:00
Richard Peter
4a410e92b9 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 d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]]
Former-commit-id: a9869f07ba
Former-commit-id: f186912fe1 [formerly aff520d61b] [formerly fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]]
Former-commit-id: 597cb507dad744955c6d4c7e9004386c40c57fbc [formerly 969fa704e5]
Former-commit-id: fb910196c0
2013-05-17 10:33:18 -05:00
Max Schenkelberg
7e752cffa0 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 71624ccda3 [formerly 4d435d3dd5] [formerly c421240835] [formerly d07de0870f [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]]
Former-commit-id: d07de0870f
Former-commit-id: 0c954fc284 [formerly 7ce0b7ef13] [formerly ccf927342ef0766ab38c884f7d5b2cc881d0fb52 [formerly a94469df82]]
Former-commit-id: 35a8dce332b5100cbbddbe7f715be4d0882e97d4 [formerly 6adbb139ab]
Former-commit-id: 9921ea5cb1
2013-05-16 18:04:26 -05:00
Nate Jensen
9a18e30b74 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 c7868a028e [formerly 9a3f855a1a] [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 39543d7ee0 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 8ff1aae296 [formerly 7f58e8a568] [formerly 45406f4e5394c5620f8f9c11ae40ea432dc3982e [formerly ffa74c3bdb]]
Former-commit-id: 92cae226d845513b55b72a82416dfd545fb6e6d6 [formerly 3f2bb17ce4]
Former-commit-id: 779a299440
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
5c26308dca Issue #1869 Remove DataURI column from qc.
Former-commit-id: c7b7f58de8 [formerly 89b4bd571a] [formerly c0d8dad8ae] [formerly c7b7f58de8 [formerly 89b4bd571a] [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 7651920be7 [formerly 777f12fbad] [formerly 50574b57e3d993a195cef03df3a9392ebf66dafd [formerly 6353b7e04b]]
Former-commit-id: adc1338b1816b6406b4e3a457d2c77661d6cb3a7 [formerly 998330955a]
Former-commit-id: ea3d3660f3
2013-05-16 17:48:37 -05:00
Steve Harris
721e568859 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 f9535abb10 [formerly 87a31f9990] [formerly 16ba74496d] [formerly b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]]
Former-commit-id: b76d359695
Former-commit-id: 9b898a6478 [formerly b5d3ff1867] [formerly 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615]]
Former-commit-id: da72fecb259457811b70cacd5d31fd4a085b41bd [formerly 4827d8f1d9]
Former-commit-id: 34145afafe
2013-05-16 13:45:58 -05:00
Bryan Kowal
0e982dd20b 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 da601e2c35 [formerly dccc6e4a96] [formerly 7e849f0af3] [formerly 22d4494918 [formerly 7e849f0af3 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]]
Former-commit-id: 22d4494918
Former-commit-id: ad92c1c79e [formerly 88cc3a6011] [formerly bc694aaf1872e8bd9a930f4cc339550e297ab627 [formerly 560fb81038]]
Former-commit-id: 9ec6370be28f2b472c45e03272645e471c1fe428 [formerly e95c2d36b4]
Former-commit-id: 7446376b42
2013-05-16 11:01:40 -05:00
Max Schenkelberg
64b917ed3b 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 33f7156a45 [formerly 62efca5041] [formerly 67e0d17aed] [formerly 8b4d47c690 [formerly 67e0d17aed [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]]]
Former-commit-id: 8b4d47c690
Former-commit-id: 6ddb455763 [formerly a3ad1c7c45] [formerly 9c30edc05a7e1827e11b53976977decdf367c0eb [formerly 0038138fdc]]
Former-commit-id: 40f28fd18b2fab46805a6d5d8bcf4d24c169b81c [formerly 91d38b1e87]
Former-commit-id: 012be9fc97
2013-05-16 10:54:52 -05:00
Steve Harris
202e373f01 13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]]
Former-commit-id: aff41713f9
Former-commit-id: 7d55d0e959 [formerly 67a95d07d2] [formerly b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]]
Former-commit-id: a7c4bec32a032d07ef14566103e744b20ea31401 [formerly 3f87ea1a15]
Former-commit-id: 1730b6c41e
2013-05-16 11:12:07 -04:00
Nate Jensen
d88235afb8 Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 367784bd99 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]]
Former-commit-id: 367784bd99
Former-commit-id: c90f9d93c4 [formerly 1355010c38] [formerly 02ae66490caf635a65f4c6e90eb7bba1df7b05a1 [formerly e4b47d1eb9]]
Former-commit-id: 2785a34bbe8a1c607b8c364ffe9c42d09ffc2745 [formerly 6408ef5425]
Former-commit-id: 7549733d5d
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
40a94337d0 Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: da6bf90b2d [formerly 5a8118b5a8] [formerly 51015cd592] [formerly da6bf90b2d [formerly 5a8118b5a8] [formerly 51015cd592] [formerly 1a1592ea3d [formerly 51015cd592 [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 7c5e49cf35 [formerly 4fa2a21323] [formerly 039dcec9a1c91a057d7e28627ea17b7cb99824f6 [formerly 4a8a5b16af]]
Former-commit-id: 601b971edf39643b03ec3724bb9b4c3795ab4cab [formerly 3b5a3a8a3b]
Former-commit-id: 017e025cc6
2013-05-15 18:22:25 -05:00
Nate Jensen
55e1bc3c3c Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

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

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

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

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

Former-commit-id: 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 1c3e60a5ff [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 676bd25f45 [formerly cb335861c2] [formerly 20ed4a4554d6c5b51d73a5b064aa0c228a1bc816 [formerly 8ea143a147]]
Former-commit-id: 37ce01ea9d49382306b604a118d3474e0c68f44b [formerly ff9ce2b7c4]
Former-commit-id: 7a8b41876e
2013-05-15 12:50:08 -05:00
Richard Peter
0f429b89e0 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 5714866fc5 [formerly d81cee387b] [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 0523d790f8 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: 9b717cdeea [formerly e0c4287959] [formerly 27cc1cc3fc9fe261074c7a9de671269bbc5b9df3 [formerly b40e0ca1c9]]
Former-commit-id: eda0a11482b84ccb38cc8a9693c5ea13d48b7463 [formerly 69ce5d7529]
Former-commit-id: d847f413af
2013-05-15 12:44:48 -05:00
Nate Jensen
e25bc42522 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: b1ed04a275 [formerly 0c718e1cd1] [formerly 5280b54277] [formerly b1ed04a275 [formerly 0c718e1cd1] [formerly 5280b54277] [formerly 4e63b88031 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]]
Former-commit-id: 4e63b88031
Former-commit-id: 47be3995a9 [formerly 65fdf84101] [formerly 5cf8e53ac89e47650c22747cbc9c44014230f489 [formerly 1e059ee8d9]]
Former-commit-id: 94a45bae766a98d27590ffd7fb1d2a8f5125013f [formerly 4973acb807]
Former-commit-id: 338bbc4216
2013-05-15 09:22:16 -05:00
Nate Jensen
55a9265069 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 a9dcdd018b [formerly 8c03ad79d6] [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: 3e3ca41da5 [formerly eb75eaf6ce] [formerly f100c9c2896648c965a1faa49f8fe19b7324d50e [formerly e7f638ce3b]]
Former-commit-id: 94d5b020ad5a983848f33c8876f83ea28fdd5cee [formerly dc98eb524f]
Former-commit-id: 8ca2d65342
2013-05-14 16:36:47 -05:00
Nate Jensen
24f0c91d8f Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 45c3d17eb7 [formerly 521420916e] [formerly 6c42b5af64] [formerly 45c3d17eb7 [formerly 521420916e] [formerly 6c42b5af64] [formerly 661482f1dd [formerly 6c42b5af64 [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]]]
Former-commit-id: 661482f1dd
Former-commit-id: 11d5713451 [formerly 9680f63df2] [formerly 48e574f0b537470c8877c74ef60bb21105a29b84 [formerly 301b294d66]]
Former-commit-id: 81a8f79896bc5e0272fc76a5a6788130d1d04f84 [formerly 851885b8c5]
Former-commit-id: befeae603d
2013-05-14 16:23:00 -05:00
Nate Jensen
6b9fa8445b 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 c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 575b6335c3 [formerly dac803ca07] [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]]
Former-commit-id: ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d [formerly 925339b84c]
Former-commit-id: 0080d492e2
2013-05-14 16:16:13 -05:00
Dustin Johnson
e190b625c3 Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: dd1b2d0472 [formerly c302fafbd2] [formerly 341ce0c8c2] [formerly dd1b2d0472 [formerly c302fafbd2] [formerly 341ce0c8c2] [formerly a5a0e3e280 [formerly 341ce0c8c2 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]]]
Former-commit-id: a5a0e3e280
Former-commit-id: dac25447e5 [formerly 66126d5411] [formerly 21a28c8d1bddb4689b443e78a68fb08d1fd36c4b [formerly 21e66394be]]
Former-commit-id: 220f6cb041c88ef444eef674b7d25c34d09422c8 [formerly f625b26373]
Former-commit-id: bf3655da4c
2013-05-14 15:48:58 -05:00
Dustin Johnson
2ca9de593d Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

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

Former-commit-id: ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly ab2caee84c [formerly fad208e0ee] [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly 0a02d5e018 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]]
Former-commit-id: 9f9f85f875
Former-commit-id: c233a43561 [formerly fb15e2d0a6] [formerly 1979b4a6badaebd7c518bd6e2d3e6e39ee777737 [formerly ab75cd5107]]
Former-commit-id: 781e3641b1d9f236c4e0b0f924f6e0472f4ad74c [formerly 532787c043]
Former-commit-id: 4dbb2fda4a
2013-05-14 13:49:53 -05:00
Richard Peter
1ecaa93d18 Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 3a6d627a69 [formerly 7683bfd122] [formerly 57d6790d5e] [formerly 6c406d6a8e [formerly 57d6790d5e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]]]
Former-commit-id: 6c406d6a8e
Former-commit-id: 0bb437873f [formerly b4e46593a8] [formerly 261e579f04551c139fed42c204c4a8c3d9be208b [formerly 3309e0c3b7]]
Former-commit-id: d16a7bd63c965117fe1af4e955370487108040eb [formerly a734c8594a]
Former-commit-id: 5f097830db
2013-05-14 09:40:21 -05:00
Steve Harris
4b1a9ad438 13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]]
Former-commit-id: c59b52a266
Former-commit-id: fddef92bf3 [formerly 5465764527] [formerly c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]]
Former-commit-id: 39606e2ce74e5380d44e132dd22716b3b06b5051 [formerly 395d21565f]
Former-commit-id: 5bdcf5c0a1
2013-05-14 09:21:41 -04:00