Richard Peter
c7eba20f0a
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
...
Former-commit-id: 8fac7f2fd962c8176486c9c15709608fac7f2fd962c8176486c9c1570960b4344d3c04c9c1570960b4344d3c04b3c32889b11bbddf8fdf489fdf49b1b3688d78d17d73a32b0a
2013-05-21 13:07:51 -05:00
Greg Armendariz
e8e48bfc3a
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: da4e717772fce1512b3720a9ad95e5da4e717772fce1512b3720a9ad95e5eecbf2718a20a9ad95e5eecbf2718abb67a4fe0acd96d6d2e6525cd5c751065e9bd1f98c4a634c5a
2013-05-21 12:24:19 -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: efd545925e3d84e1dd538aa4b0025cefd545925e3d84e1dd538aa4b0025c930ff50fb88aa4b0025c930ff50fb8ffe0b3508576f11f00ae81ae3ea8bf046de916fd7966576f23
2013-05-21 12:11:21 -05:00
Bryan Kowal
a8764771b3
Issue #1952 - remove duplicate filesystem hierarchy
...
Former-commit-id: b14dd898ace9abe7185b4b8868ca54b14dd898ace9abe7185b4b8868ca547027f97e2a4b8868ca547027f97e2a1d462b582b61a613b49062d21498a61052f6cd98f1b7607385
2013-05-21 11:09:57 -05:00
Nate Jensen
3d617629d1
Merge "Issue #2001 fix message handling" into development
...
Former-commit-id: 2bf84e90448438eb1b4a737b265c342bf84e90448438eb1b4a737b265c344d519da3a9737b265c344d519da3a9e464b37ce30fc260728bd2cccd342b9ef848d0c7741abd24bb
2013-05-21 11:00:32 -05:00
Richard Peter
27c6d6f318
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: c40709229f4809b3c15b73372622f7c40709229f4809b3c15b73372622f777a08ebd3173372622f777a08ebd318e252f89f021b87e9ea7427f54a87869e6ea48472a8115770f
2013-05-21 10:35:00 -05:00
Nate Jensen
53916d0ddf
Issue #2001 fix message handling
...
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b
Former-commit-id: deea93d7e756309efafe1ab118958fdeea93d7e756309efafe1ab118958f960bc6db691ab118958f960bc6db6922d9440b6aa06bb176bae575c19ab6942855e9f8c183650ebd
2013-05-21 10:26:18 -05:00
Nate Jensen
fc5ea8785a
Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
...
Former-commit-id: 8e7905197a18e6f84418f16606cfba8e7905197a18e6f84418f16606cfbad02ce9d389f16606cfbad02ce9d3891c581fd60751a31a08ca80b1a9d18cd19e7f9c39256721e481
2013-05-21 10:22:24 -05:00
Dustin Johnson
7dc0125c17
Merge "Issue #2000 Subscription overlap configuration GUI" into development
...
Former-commit-id: 150ae88ebafef73ac960195cd5f210150ae88ebafef73ac960195cd5f2108fcc958d84195cd5f2108fcc958d84bf3f162fc9bd65447c9f5695c4f967566273cf692cf8ffac1a
2013-05-21 08:19:34 -05:00
Steve Harris
603bc2535a
13.4.1-11 baseline
...
Former-commit-id: 65d8f51034d6319a2ca62edee3615865d8f51034d6319a2ca62edee36158c0376ce9ed2edee36158c0376ce9ed5db95cce554d888635156df093ef482767fd893cd9f967c811
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
20d086140b
Issue #1869 Rewrite dataURI property mappings.
...
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: 5219bd8426c11631c7da1a31aa22115219bd8426c11631c7da1a31aa2211931e76ae591a31aa2211931e76ae59bd89419f5e30eb486e455147eb18d49bac8c566c4687ddcd62
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: 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
21b56b64d8
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: 4452ec48d95b6fa4e360e4cdc64c074452ec48d95b6fa4e360e4cdc64c0735be00792ee4cdc64c0735be00792e075f4bdd6a07188502aa13febf859e1710cd9a3f7fd5d33b7c
2013-05-20 16:58:56 -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
Steve Harris
0b9bf76434
13.4.1-10 baseline
...
Former-commit-id: 294c127b0a68fe2134b89a403b3615294c127b0a68fe2134b89a403b361592152778b99a403b361592152778b9ac83fff2447e04d8cd13b1fc4e625b322036ea82b41118326c
2013-05-20 10:52:47 -04:00
Bryan Kowal
d21a109185
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
...
Former-commit-id: dd508d5bdddb9b06cc9dd8ce0f369cdd508d5bdddb9b06cc9dd8ce0f369ca070d28eccd8ce0f369ca070d28ecc1e095fc20ba52363e2df7dd9b1e1c0bef3b4c74f7425d2c695
2013-05-17 18:21:03 -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
