Dustin Johnson
7dc0125c17
Merge "Issue #2000 Subscription overlap configuration GUI" into development
...
Former-commit-id: 150ae88ebafef73ac960195cd5f210150ae88ebafef73ac960195cd5f2108fcc958d84195cd5f2108fcc958d84bf3f162fc9bd65447c9f5695c4f967566273cf692cf8ffac1a
2013-05-21 08:19:34 -05:00
Richard Peter
e797da83e1
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
...
Former-commit-id: c699240a1b8b2ecd5771e0740990cec699240a1b8b2ecd5771e0740990ce59c38fdb78e0740990ce59c38fdb785efe58df0b72206676ee8b7cf1beb81418dbf556a664883d97
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: 0b4fb8d04ce3c06b643b16c7de874a0b4fb8d04ce3c06b643b16c7de874adfd586fca616c7de874adfd586fca60db7741ce54a5073902fc9e6e367fe7bf7c508b084b75ff489
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: 7d52bbbaa0aa3b8c80f426e80bbd187d52bbbaa0aa3b8c80f426e80bbd18885b10665226e80bbd18885b106652a075a5d665a03dbd284b13b2b4afef8c9db383354f575058e0
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: 095acb5ac3554347f17c5b62669f8e095acb5ac3554347f17c5b62669f8e38249cd7b95b62669f8e38249cd7b94d30dc16c63a504d1e7b7858a3b57fd12b26ac1da314bd8f4a
2013-05-20 17:12:47 -05:00
Bryan Kowal
fbdf4d0b7a
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
...
Former-commit-id: 3a5ae717cb081d1c724a99ba7adfe73a5ae717cb081d1c724a99ba7adfe7e4874a873a99ba7adfe7e4874a873a0ad544cd3e3f20eed97531605b7a94fbdcd29129ce778c45ea
2013-05-20 15:03:33 -05:00
Richard Peter
653714f52e
Merge "Issue #1869 Remove DataURI column from qc." into development
...
Former-commit-id: 0d7f36c84c807956103230a61c3e170d7f36c84c807956103230a61c3e173d861eca6930a61c3e173d861eca695cfae97674e03cf568950ced8c87e4b032b405ed6a6b25ebda
2013-05-20 14:48:47 -05: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: d37ba352e2648a1b25aea33ddbd1a6d37ba352e2648a1b25aea33ddbd1a6a9869f07baa33ddbd1a6a9869f07baf186912fe1aff520d61bc47eb36e43969fa704e5fb910196c0
2013-05-17 10:33:18 -05:00
Bryan Kowal
8b2615ae3c
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 3f924f74b884c3c114a963f57de31f3f924f74b884c3c114a963f57de31f79816de30863f57de31f79816de3080694a914855d21fa1fd79ea4bab5773f4e377f05bb0432ea77
2013-05-16 23:56:47 -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: 71624ccda34d435d3dd5c42124083571624ccda34d435d3dd5c421240835d07de0870fc421240835d07de0870f0c954fc2847ce0b7ef13a94469df826adbb139ab9921ea5cb1
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: c7868a028e9a3f855a1a39543d7ee0c7868a028e9a3f855a1a39543d7ee06ef214f1b839543d7ee06ef214f1b88ff1aae2967f58e8a568ffa74c3bdb3f2bb17ce4779a299440
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
5c26308dca
Issue #1869 Remove DataURI column from qc.
...
Former-commit-id: c7b7f58de889b4bd571ac0d8dad8aec7b7f58de889b4bd571ac0d8dad8aef2b11b8a49c0d8dad8aef2b11b8a497651920be7777f12fbad6353b7e04b998330955aea3d3660f3
2013-05-16 17:48:37 -05:00
Nate Jensen
7720b874b6
Merge "Issue #1989 disable camel JMX to speed up edex" into development
...
Former-commit-id: 2376c4593f0704a0a610a5372205e62376c4593f0704a0a610a5372205e6b710a7c288a5372205e6b710a7c288f3f2475bec7fb7c68b89e7001cfba5539959dfbfb28ee1a572
2013-05-16 17:33:18 -05:00
Nate Jensen
9637af4b1c
Issue #1989 disable camel JMX to speed up edex
...
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: 2c6fbd0c68bc8d798973bfcdcb607a2c6fbd0c68bc8d798973bfcdcb607ad905453660bfcdcb607ad905453660009ed8605db57c84d12bc3bafc88cd75499add432396b63eda
2013-05-16 17:13:46 -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: f9535abb1087a31f999016ba74496df9535abb1087a31f999016ba74496db76d35969516ba74496db76d3596959b898a6478b5d3ff186726664e66154827d8f1d934145afafe
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: da601e2c35dccc6e4a967e849f0af3da601e2c35dccc6e4a967e849f0af322d44949187e849f0af322d4494918ad92c1c79e88cc3a6011560fb81038e95c2d36b47446376b42
2013-05-16 11:01:40 -05:00
Bryan Kowal
1b865fa33c
Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
...
Former-commit-id: 3abd701fa417101171b61e726506e03abd701fa417101171b61e726506e039b12ee0fb1e726506e039b12ee0fb4a6d46f29c381256789437461e68ddd792059e3ce0a1431c69
2013-05-16 11:00:47 -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: 33f7156a4562efca504167e0d17aed33f7156a4562efca504167e0d17aed8b4d47c69067e0d17aed8b4d47c6906ddb455763a3ad1c7c450038138fdc91d38b1e87012be9fc97
2013-05-16 10:54:52 -05:00
Nate Jensen
298b3ed015
Issue #1989 remove dead files
...
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: b01f942e669f8654e4ff1ecdd989dfb01f942e669f8654e4ff1ecdd989dfce2579a2891ecdd989dfce2579a289d71f24664553f994c0a804c7c4a4dab9bfcead056a1c713e6f
2013-05-16 10:25:38 -05:00
Bryan Kowal
aeb613c15a
Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
...
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e
Former-commit-id: 443fa1a1252149099abb11c93f548e443fa1a1252149099abb11c93f548e43ec90900811c93f548e43ec909008fd6dec8c03c03d61587c97cff7bf9cc00e145831fc9f89b497
2013-05-16 10:21:11 -05:00
Bryan Kowal
6c802f2f8f
Issue #1872 - merge 2002; do not include .gitignore files in the rpm
...
Former-commit-id: 34c87d5256c83d93b527b0122e794e34c87d5256c83d93b527b0122e794e20fd227d99b0122e794e20fd227d99c7cd48449e8cba03d5a57ec8600dc11a63d07768c7a9750841
2013-05-16 10:19:31 -05:00
Steve Harris
202e373f01
13.4.1-9 baseline
...
Former-commit-id: 301821988e88eee9cbfabcf7f15c90301821988e88eee9cbfabcf7f15c90aff41713f9bcf7f15c90aff41713f97d55d0e95967a95d07d20766ae20dd3f87ea1a151730b6c41e
2013-05-16 11:12:07 -04:00
Nate Jensen
d88235afb8
Merge "Issue #1989 removing dead plugins from repo" into development
...
Former-commit-id: 3777b1bdec5b4c91d73403f93712a23777b1bdec5b4c91d73403f93712a2367784bd9903f93712a2367784bd99c90f9d93c41355010c38e4b47d1eb96408ef54257549733d5d
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: da6bf90b2d5a8118b5a851015cd592da6bf90b2d5a8118b5a851015cd5921a1592ea3d51015cd5921a1592ea3d7c5e49cf354fa2a213234a8a5b16af3b5a3a8a3b017e025cc6
2013-05-15 18:22:25 -05:00
Richard Peter
b273bbc62e
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
...
Former-commit-id: 55bface8749a8bc5871ffc5b62197355bface8749a8bc5871ffc5b621973a073bf2702fc5b621973a073bf2702d3dc818b4d671aaba9d957698cc95bda0fc8057cff16d49977
2013-05-15 18:14:00 -05:00
Dustin Johnson
3a9c527c52
Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
...
Former-commit-id: 29bdf1cf7e28a4f022168eeb2f4f9c29bdf1cf7e28a4f022168eeb2f4f9cd62e51ad7e8eeb2f4f9cd62e51ad7ef1217c26236fa299ecd800e9f3305dab15adabe20f69c0b64d
2013-05-15 17:06:42 -05:00
Dustin Johnson
cc22cc26f5
Issue #2000 Fix broken stuff after Spring 3 upgrade
...
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 38714c1547695c64a9f48a9e1f643a38714c1547695c64a9f48a9e1f643aef1e80b61f8a9e1f643aef1e80b61f7f1f50d8b931fbf71aa2b8d6f542066db9b3f8d9a7a948bf3a
2013-05-15 16:54:40 -05:00
Nate Jensen
55e1bc3c3c
Issue #1989 removing dead plugins from repo
...
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: a818b84f5fb7076f69472abccdfe2ba818b84f5fb7076f69472abccdfe2b662fac5b312abccdfe2b662fac5b31eb47297ab18b1298777cae5df55dba8cffed145199bd7bc4eb
2013-05-15 16:25:23 -05:00
Richard Peter
b4fdaba9b9
Merge "Issue #1989 removing unused jars" into development
...
Former-commit-id: 1a8735e7603e1fe851e4303267be4d1a8735e7603e1fe851e4303267be4dad43b7bab5303267be4dad43b7bab5e793f3059aa504d84327fb1197ecb744b7de35fc06a146f5d3
2013-05-15 16:17:57 -05:00
Bryan Kowal
0fcc9710db
Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
...
Former-commit-id: 9dd01b7aa407408178a858115852299dd01b7aa407408178a8581158522941f4075e6f581158522941f4075e6fcdbb3688b8edaa5339d7aabc22cc2ee39c66a454a6ba3a9ba2
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
d747955f91
Issue #1869 Remove DataURI column from ldadmesonet.
...
Former-commit-id: 84e531ba2c89fe0b301d080b43444a84e531ba2c89fe0b301d080b43444abbe2667522080b43444abbe26675226afa65fd07b3a2cd22c7f813b403796333ed48411824606f71
2013-05-15 15:35:02 -05:00
Nate Jensen
75548c60a0
Issue #1989 removing unused jars
...
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301
Former-commit-id: 25c2e983c1c75bfeb9a59c2b6bad3e25c2e983c1c75bfeb9a59c2b6bad3ef4b8c0dc609c2b6bad3ef4b8c0dc60fb7be885b06caa681ed30234e6788b2b72b5c530546249897b
2013-05-15 14:44:30 -05:00
Richard Peter
b9fb88aa95
Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
...
Former-commit-id: 9112e3b2b0186f7169af286ec23fab9112e3b2b0186f7169af286ec23fabbcbe24f489286ec23fabbcbe24f48954bde542cd589fcada8bce6452daac89fc805bfe6117554b65
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: 058e32d421bb307ed68535830d317d058e32d421bb307ed68535830d317d7f9ef5ce9835830d317d7f9ef5ce98686ad54de8dbe24d00fd4c7b2d73d3f7d304c51b921d851ef1
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: df43f4a6240cbf36df799c688f7070df43f4a6240cbf36df799c688f707084158e76c79c688f707084158e76c7cde903747e9f79748cd2ca10ac1598fab4021ce47f956add77
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: a0b1b9053a86d3bf5a7c948e47a2c6a0b1b9053a86d3bf5a7c948e47a2c6fecadf104b948e47a2c6fecadf104b4b070839899284c27dddba3bda461c43369f0cf3351989c61f
2013-05-15 13:36:09 -05:00
Bryan Kowal
9e2e30d040
Issue #2002 - do not include .gitignore files in the rpm
...
Former-commit-id: f2f288c6b5413237030160ae5df378f2f288c6b5413237030160ae5df378107055781d60ae5df378107055781d938027634143db530ddb7df8e11ed3a2a6d0bdad9e9498b002
2013-05-15 13:31:24 -05:00
Nate Jensen
ec4eaafaf3
Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
...
Former-commit-id: 7ba3ba65ce6952b172cf591eb2d6e27ba3ba65ce6952b172cf591eb2d6e2b621d417e5591eb2d6e2b621d417e5509011805893568fff0bb9275b3c2b0a491695751329d58062
2013-05-15 13:02:58 -05:00
Ben Steffensmeier
330f048d66
Issue #1869 Remove DataURI from goes/poes soundings.
...
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416
Former-commit-id: 61b468a9f522b20b5f8eb905ee013c61b468a9f522b20b5f8eb905ee013c1c3e60a5ffb905ee013c1c3e60a5ff676bd25f45cb335861c28ea143a147ff9ce2b7c47a8b41876e
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: 5714866fc5d81cee387b0523d790f85714866fc5d81cee387b0523d790f882ccd32ee00523d790f882ccd32ee09b717cdeeae0c4287959b40e0ca1c969ce5d7529d847f413af
2013-05-15 12:44:48 -05:00
Richard Peter
56cc89710e
Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
...
Former-commit-id: 60a4188f71b687ddef04f1d65e702860a4188f71b687ddef04f1d65e702848b67522d5f1d65e702848b67522d59ad1a480b711b33a5b14aa3ef285273e60ceec0304be1d3807
2013-05-15 12:44:28 -05:00
Bryan Kowal
47d6de2275
Issue #1927 - add quartz as a RadarServer build dependency
...
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56
Former-commit-id: 1b8179bbf201413b17dd047a3de7bd1b8179bbf201413b17dd047a3de7bd99a5290083047a3de7bd99a52900830493669c67f57a73030963fa948ba876927011682deeffdb51
2013-05-15 12:38:02 -05:00
Bryan Kowal
1af23d1007
Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
...
Former-commit-id: e02ad5d555e1794dd03ff9e77e90b7e02ad5d555e1794dd03ff9e77e90b70e3e3e891bf9e77e90b70e3e3e891b92db4c41211fccd550360af34bbe4c59024f8dd784ed22cf52
2013-05-15 11:55:56 -05:00
Ben Steffensmeier
303f78c36c
Issue #1869 Revert changes to bufrmos types used by ncep.
...
Former-commit-id: b4d305a294507ce2888862b85f3afeb4d305a294507ce2888862b85f3afedd320f2a5662b85f3afedd320f2a56ba431afe94884922687e27b0b4a2897ce819184a1846170387
2013-05-15 11:45:51 -05:00
Dustin Johnson
4b96e46b34
Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
...
Former-commit-id: c6fa2f32bfa00364b2948a70a773d5c6fa2f32bfa00364b2948a70a773d5c88be3579c8a70a773d5c88be3579c481448d7e5bd7c38a1608c26413d238276c2a9c9dbde58d5eb
2013-05-15 10:50:53 -05:00
Dustin Johnson
07e46d67b1
Issue #2000 Fix reinitializing of bandwidth manager
...
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267
Former-commit-id: 0116e7d8ebb700ef7a95e38e8d7dc50116e7d8ebb700ef7a95e38e8d7dc5e374011c49e38e8d7dc5e374011c49f8f13e2df7b6a3c3ae8098d99250b2c2c849fe7e7240a99ce7
2013-05-15 10:24:33 -05:00
Richard Peter
a01285caea
Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
...
Former-commit-id: c5fd30cc751a7fbec35ef1920eb8d9c5fd30cc751a7fbec35ef1920eb8d947124d2411f1920eb8d947124d2411988b13568b1a5bb1a9d5f4974ebd196cc24d855fa9a4b2cfcc
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
2525042e00
Issue #1869 Remove DataURI column from bufrmos.
...
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e
Former-commit-id: 713a2f201fcad31c0ce6026a824e60713a2f201fcad31c0ce6026a824e60fabbc29fe8026a824e60fabbc29fe8004b6c54316acaa992563f540d16f05dc7de691b2ffe811d07
2013-05-15 09:40:05 -05:00
Nate Jensen
e25bc42522
Issue #1989 fix build
...
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89
Former-commit-id: b1ed04a2750c718e1cd15280b54277b1ed04a2750c718e1cd15280b542774e63b880315280b542774e63b8803147be3995a965fdf841011e059ee8d94973acb807338bbc4216
2013-05-15 09:22:16 -05:00
Nate Jensen
e9f7997013
Issue #1989 jetty fixes
...
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d
Former-commit-id: 6578fafd0fce19737a49d894aca7686578fafd0fce19737a49d894aca768958ed1f6a2d894aca768958ed1f6a2d178b7c93ca1215230491b62b066c958eeca454a122aea2c8e
2013-05-14 18:27:00 -05:00
