Commit graph

3275 commits

Author SHA1 Message Date
Dustin Johnson
a314bd8f4a Issue #2000 Subscription overlap configuration GUI
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 554347f17c [formerly 5b62669f8e] [formerly 554347f17c [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 3a504d1e7b [formerly 7858a3b57f]
Former-commit-id: d12b26ac1d
2013-05-20 17:12:47 -05:00
Bryan Kowal
7fd5d33b7c Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries
- removed only python 2.5 native libraries
- removed old scripts utilized by IzPack


Former-commit-id: 5b6fa4e360 [formerly e4cdc64c07] [formerly 5b6fa4e360 [formerly e4cdc64c07] [formerly 35be00792e [formerly cf94670fe9807a5253209da892f7305defaf32a8]]]
Former-commit-id: 35be00792e
Former-commit-id: 07188502aa [formerly 13febf859e]
Former-commit-id: 1710cd9a3f
2013-05-20 16:58:56 -05:00
Bryan Kowal
ce778c45ea Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: 081d1c724a [formerly 99ba7adfe7] [formerly 081d1c724a [formerly 99ba7adfe7] [formerly e4874a873a [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]
Former-commit-id: e4874a873a
Former-commit-id: 3f20eed975 [formerly 31605b7a94]
Former-commit-id: fbdcd29129
2013-05-20 15:03:33 -05:00
Richard Peter
6a6b25ebda Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 8079561032 [formerly 30a61c3e17] [formerly 8079561032 [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: e03cf56895 [formerly 0ced8c87e4]
Former-commit-id: b032b405ed
2013-05-20 14:48:47 -05:00
Steve Harris
b41118326c 13.4.1-10 baseline
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
2013-05-20 10:52:47 -04:00
Bryan Kowal
7425d2c695 Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: db9b06cc9d [formerly d8ce0f369c] [formerly db9b06cc9d [formerly d8ce0f369c] [formerly a070d28ecc [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: a52363e2df [formerly 7dd9b1e1c0]
Former-commit-id: bef3b4c74f
2013-05-17 18:21:03 -05:00
Richard Peter
fb910196c0 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: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
2013-05-17 10:33:18 -05:00
Bryan Kowal
bb0432ea77 Issue #1927 - handle common base until new build implementation
Former-commit-id: 84c3c114a9 [formerly 63f57de31f] [formerly 84c3c114a9 [formerly 63f57de31f] [formerly 79816de308 [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]]
Former-commit-id: 79816de308
Former-commit-id: 5d21fa1fd7 [formerly 9ea4bab577]
Former-commit-id: 3f4e377f05
2013-05-16 23:56:47 -05:00
Max Schenkelberg
9921ea5cb1 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 4d435d3dd5 [formerly c421240835] [formerly 4d435d3dd5 [formerly c421240835] [formerly d07de0870f [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: 7ce0b7ef13 [formerly a94469df82]
Former-commit-id: 6adbb139ab
2013-05-16 18:04:26 -05:00
Nate Jensen
779a299440 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: 9a3f855a1a [formerly 39543d7ee0] [formerly 9a3f855a1a [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 7f58e8a568 [formerly ffa74c3bdb]
Former-commit-id: 3f2bb17ce4
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
ea3d3660f3 Issue #1869 Remove DataURI column from qc.
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 777f12fbad [formerly 6353b7e04b]
Former-commit-id: 998330955a
2013-05-16 17:48:37 -05:00
Nate Jensen
b28ee1a572 Merge "Issue #1989 disable camel JMX to speed up edex" into development
Former-commit-id: 0704a0a610 [formerly a5372205e6] [formerly 0704a0a610 [formerly a5372205e6] [formerly b710a7c288 [formerly d9e7d87f7eb454e66ecd42446544fcec473e95b6]]]
Former-commit-id: b710a7c288
Former-commit-id: 7fb7c68b89 [formerly e7001cfba5]
Former-commit-id: 539959dfbf
2013-05-16 17:33:18 -05:00
Nate Jensen
2396b63eda Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: bc8d798973 [formerly bfcdcb607a] [formerly bc8d798973 [formerly bfcdcb607a] [formerly d905453660 [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]
Former-commit-id: d905453660
Former-commit-id: b57c84d12b [formerly c3bafc88cd]
Former-commit-id: 75499add43
2013-05-16 17:13:46 -05:00
Steve Harris
34145afafe 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: 87a31f9990 [formerly 16ba74496d] [formerly 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: b5d3ff1867 [formerly 26664e6615]
Former-commit-id: 4827d8f1d9
2013-05-16 13:45:58 -05:00
Bryan Kowal
7446376b42 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: dccc6e4a96 [formerly 7e849f0af3] [formerly dccc6e4a96 [formerly 7e849f0af3] [formerly 22d4494918 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918
Former-commit-id: 88cc3a6011 [formerly 560fb81038]
Former-commit-id: e95c2d36b4
2013-05-16 11:01:40 -05:00
Bryan Kowal
e0a1431c69 Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
Former-commit-id: 17101171b6 [formerly 1e726506e0] [formerly 17101171b6 [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 3812567894 [formerly 37461e68dd]
Former-commit-id: d792059e3c
2013-05-16 11:00:47 -05:00
Max Schenkelberg
012be9fc97 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: 62efca5041 [formerly 67e0d17aed] [formerly 62efca5041 [formerly 67e0d17aed] [formerly 8b4d47c690 [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]]
Former-commit-id: 8b4d47c690
Former-commit-id: a3ad1c7c45 [formerly 0038138fdc]
Former-commit-id: 91d38b1e87
2013-05-16 10:54:52 -05:00
Nate Jensen
6a1c713e6f Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: 9f8654e4ff [formerly 1ecdd989df] [formerly 9f8654e4ff [formerly 1ecdd989df] [formerly ce2579a289 [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]
Former-commit-id: ce2579a289
Former-commit-id: 53f994c0a8 [formerly 04c7c4a4da]
Former-commit-id: b9bfcead05
2013-05-16 10:25:38 -05:00
Bryan Kowal
fc9f89b497 Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: 2149099abb [formerly 11c93f548e] [formerly 2149099abb [formerly 11c93f548e] [formerly 43ec909008 [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]
Former-commit-id: 43ec909008
Former-commit-id: c03d61587c [formerly 97cff7bf9c]
Former-commit-id: c00e145831
2013-05-16 10:21:11 -05:00
Bryan Kowal
c7a9750841 Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: c83d93b527 [formerly b0122e794e] [formerly c83d93b527 [formerly b0122e794e] [formerly 20fd227d99 [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]
Former-commit-id: 20fd227d99
Former-commit-id: 8cba03d5a5 [formerly 7ec8600dc1]
Former-commit-id: 1a63d07768
2013-05-16 10:19:31 -05:00
Steve Harris
1730b6c41e 13.4.1-9 baseline
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: 67a95d07d2 [formerly 0766ae20dd]
Former-commit-id: 3f87ea1a15
2013-05-16 11:12:07 -04:00
Nate Jensen
7549733d5d Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 5b4c91d734 [formerly 03f93712a2] [formerly 5b4c91d734 [formerly 03f93712a2] [formerly 367784bd99 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]
Former-commit-id: 367784bd99
Former-commit-id: 1355010c38 [formerly e4b47d1eb9]
Former-commit-id: 6408ef5425
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
017e025cc6 Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: 5a8118b5a8 [formerly 51015cd592] [formerly 5a8118b5a8 [formerly 51015cd592] [formerly 1a1592ea3d [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 4fa2a21323 [formerly 4a8a5b16af]
Former-commit-id: 3b5a3a8a3b
2013-05-15 18:22:25 -05:00
Richard Peter
ff16d49977 Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 9a8bc5871f [formerly fc5b621973] [formerly 9a8bc5871f [formerly fc5b621973] [formerly a073bf2702 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]
Former-commit-id: a073bf2702
Former-commit-id: 671aaba9d9 [formerly 57698cc95b]
Former-commit-id: da0fc8057c
2013-05-15 18:14:00 -05:00
Dustin Johnson
0f69c0b64d Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 28a4f02216 [formerly 8eeb2f4f9c] [formerly 28a4f02216 [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]
Former-commit-id: d62e51ad7e
Former-commit-id: 6fa299ecd8 [formerly 00e9f3305d]
Former-commit-id: ab15adabe2
2013-05-15 17:06:42 -05:00
Dustin Johnson
a7a948bf3a Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 695c64a9f4 [formerly 8a9e1f643a] [formerly 695c64a9f4 [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 31fbf71aa2 [formerly b8d6f54206]
Former-commit-id: 6db9b3f8d9
2013-05-15 16:54:40 -05:00
Nate Jensen
99bd7bc4eb Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: b7076f6947 [formerly 2abccdfe2b] [formerly b7076f6947 [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]
Former-commit-id: 662fac5b31
Former-commit-id: 8b1298777c [formerly ae5df55dba]
Former-commit-id: 8cffed1451
2013-05-15 16:25:23 -05:00
Richard Peter
06a146f5d3 Merge "Issue #1989 removing unused jars" into development
Former-commit-id: 3e1fe851e4 [formerly 303267be4d] [formerly 3e1fe851e4 [formerly 303267be4d] [formerly ad43b7bab5 [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]]
Former-commit-id: ad43b7bab5
Former-commit-id: a504d84327 [formerly fb1197ecb7]
Former-commit-id: 44b7de35fc
2013-05-15 16:17:57 -05:00
Bryan Kowal
a6ba3a9ba2 Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
Former-commit-id: 07408178a8 [formerly 5811585229] [formerly 07408178a8 [formerly 5811585229] [formerly 41f4075e6f [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]
Former-commit-id: 41f4075e6f
Former-commit-id: edaa5339d7 [formerly aabc22cc2e]
Former-commit-id: e39c66a454
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
1824606f71 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 89fe0b301d [formerly 080b43444a] [formerly 89fe0b301d [formerly 080b43444a] [formerly bbe2667522 [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]
Former-commit-id: bbe2667522
Former-commit-id: b3a2cd22c7 [formerly f813b40379]
Former-commit-id: 6333ed4841
2013-05-15 15:35:02 -05:00
Nate Jensen
546249897b Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: c75bfeb9a5 [formerly 9c2b6bad3e] [formerly c75bfeb9a5 [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 6caa681ed3 [formerly 0234e6788b]
Former-commit-id: 2b72b5c530
2013-05-15 14:44:30 -05:00
Richard Peter
6117554b65 Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 186f7169af [formerly 286ec23fab] [formerly 186f7169af [formerly 286ec23fab] [formerly bcbe24f489 [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]
Former-commit-id: bcbe24f489
Former-commit-id: 589fcada8b [formerly ce6452daac]
Former-commit-id: 89fc805bfe
2013-05-15 14:41:04 -05:00
Nate Jensen
921d851ef1 Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: bb307ed685 [formerly 35830d317d] [formerly bb307ed685 [formerly 35830d317d] [formerly 7f9ef5ce98 [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: dbe24d00fd [formerly 4c7b2d73d3]
Former-commit-id: f7d304c51b
2013-05-15 14:00:15 -05:00
David Gillingham
7f956add77 Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

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

Former-commit-id: 86d3bf5a7c [formerly 948e47a2c6] [formerly 86d3bf5a7c [formerly 948e47a2c6] [formerly fecadf104b [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]
Former-commit-id: fecadf104b
Former-commit-id: 9284c27ddd [formerly ba3bda461c]
Former-commit-id: 43369f0cf3
2013-05-15 13:36:09 -05:00
Bryan Kowal
9e9498b002 Issue #2002 - do not include .gitignore files in the rpm
Former-commit-id: 4132370301 [formerly 60ae5df378] [formerly 4132370301 [formerly 60ae5df378] [formerly 107055781d [formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]]
Former-commit-id: 107055781d
Former-commit-id: 43db530ddb [formerly 7df8e11ed3]
Former-commit-id: a2a6d0bdad
2013-05-15 13:31:24 -05:00
Nate Jensen
1329d58062 Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
Former-commit-id: 6952b172cf [formerly 591eb2d6e2] [formerly 6952b172cf [formerly 591eb2d6e2] [formerly b621d417e5 [formerly 5db35fcaef26b2817bfcd4a051f4c1f05d8fdcdd]]]
Former-commit-id: b621d417e5
Former-commit-id: 93568fff0b [formerly b9275b3c2b]
Former-commit-id: 0a49169575
2013-05-15 13:02:58 -05:00
Ben Steffensmeier
7a8b41876e Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: 22b20b5f8e [formerly b905ee013c] [formerly 22b20b5f8e [formerly b905ee013c] [formerly 1c3e60a5ff [formerly 836239896aace50e37896f6219015a75aea117b7]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: cb335861c2 [formerly 8ea143a147]
Former-commit-id: ff9ce2b7c4
2013-05-15 12:50:08 -05:00
Richard Peter
d847f413af Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: d81cee387b [formerly 0523d790f8] [formerly d81cee387b [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: e0c4287959 [formerly b40e0ca1c9]
Former-commit-id: 69ce5d7529
2013-05-15 12:44:48 -05:00
Richard Peter
04be1d3807 Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: b687ddef04 [formerly f1d65e7028] [formerly b687ddef04 [formerly f1d65e7028] [formerly 48b67522d5 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]]
Former-commit-id: 48b67522d5
Former-commit-id: 11b33a5b14 [formerly aa3ef28527]
Former-commit-id: 3e60ceec03
2013-05-15 12:44:28 -05:00
Bryan Kowal
2deeffdb51 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 01413b17dd [formerly 047a3de7bd] [formerly 01413b17dd [formerly 047a3de7bd] [formerly 99a5290083 [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]]
Former-commit-id: 99a5290083
Former-commit-id: f57a730309 [formerly 63fa948ba8]
Former-commit-id: 7692701168
2013-05-15 12:38:02 -05:00
Bryan Kowal
84ed22cf52 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: e1794dd03f [formerly f9e77e90b7] [formerly e1794dd03f [formerly f9e77e90b7] [formerly 0e3e3e891b [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 1fccd55036 [formerly 0af34bbe4c]
Former-commit-id: 59024f8dd7
2013-05-15 11:55:56 -05:00
Ben Steffensmeier
1846170387 Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: 507ce28888 [formerly 62b85f3afe] [formerly 507ce28888 [formerly 62b85f3afe] [formerly dd320f2a56 [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]]
Former-commit-id: dd320f2a56
Former-commit-id: 884922687e [formerly 27b0b4a289]
Former-commit-id: 7ce819184a
2013-05-15 11:45:51 -05:00
Dustin Johnson
dbde58d5eb Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: a00364b294 [formerly 8a70a773d5] [formerly a00364b294 [formerly 8a70a773d5] [formerly c88be3579c [formerly f300554c735266999f57e0331eda63420e5a6ef3]]]
Former-commit-id: c88be3579c
Former-commit-id: bd7c38a160 [formerly 8c26413d23]
Former-commit-id: 8276c2a9c9
2013-05-15 10:50:53 -05:00
Dustin Johnson
7240a99ce7 Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267

Former-commit-id: b700ef7a95 [formerly e38e8d7dc5] [formerly b700ef7a95 [formerly e38e8d7dc5] [formerly e374011c49 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]]
Former-commit-id: e374011c49
Former-commit-id: b6a3c3ae80 [formerly 98d99250b2]
Former-commit-id: c2c849fe7e
2013-05-15 10:24:33 -05:00
Richard Peter
a9a4b2cfcc Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: 1a7fbec35e [formerly f1920eb8d9] [formerly 1a7fbec35e [formerly f1920eb8d9] [formerly 47124d2411 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]]
Former-commit-id: 47124d2411
Former-commit-id: 1a5bb1a9d5 [formerly f4974ebd19]
Former-commit-id: 6cc24d855f
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
2ffe811d07 Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e

Former-commit-id: cad31c0ce6 [formerly 026a824e60] [formerly cad31c0ce6 [formerly 026a824e60] [formerly fabbc29fe8 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]]
Former-commit-id: fabbc29fe8
Former-commit-id: 6acaa99256 [formerly 3f540d16f0]
Former-commit-id: 5dc7de691b
2013-05-15 09:40:05 -05:00
Nate Jensen
338bbc4216 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 0c718e1cd1 [formerly 5280b54277] [formerly 0c718e1cd1 [formerly 5280b54277] [formerly 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]
Former-commit-id: 4e63b88031
Former-commit-id: 65fdf84101 [formerly 1e059ee8d9]
Former-commit-id: 4973acb807
2013-05-15 09:22:16 -05:00
Nate Jensen
122aea2c8e Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: ce19737a49 [formerly d894aca768] [formerly ce19737a49 [formerly d894aca768] [formerly 958ed1f6a2 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]]
Former-commit-id: 958ed1f6a2
Former-commit-id: a121523049 [formerly 1b62b066c9]
Former-commit-id: 58eeca454a
2013-05-14 18:27:00 -05:00
Nate Jensen
8ca2d65342 Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: 8c03ad79d6 [formerly a6f8174d0c] [formerly 8c03ad79d6 [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: eb75eaf6ce [formerly e7f638ce3b]
Former-commit-id: dc98eb524f
2013-05-14 16:36:47 -05:00