Richard Peter
7966576f23
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: 3d84e1dd538aa4b0025c3d84e1dd538aa4b0025c930ff50fb8930ff50fb876f11f00ae81ae3ea8bf046de916fd
2013-05-21 12:11:21 -05:00
Nate Jensen
741abd24bb
Merge "Issue #2001 fix message handling" into development
...
Former-commit-id: 8438eb1b4a737b265c348438eb1b4a737b265c344d519da3a94d519da3a90fc260728bd2cccd342b9ef848d0c7
2013-05-21 11:00:32 -05:00
Richard Peter
2a8115770f
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 4809b3c15b73372622f74809b3c15b73372622f777a08ebd3177a08ebd3121b87e9ea7427f54a87869e6ea4847
2013-05-21 10:35:00 -05:00
Nate Jensen
c183650ebd
Issue #2001 fix message handling
...
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b
Former-commit-id: 56309efafe1ab118958f56309efafe1ab118958f960bc6db69960bc6db69a06bb176bae575c19ab6942855e9f8
2013-05-21 10:26:18 -05:00
Nate Jensen
256721e481
Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
...
Former-commit-id: 18e6f84418f16606cfba18e6f84418f16606cfbad02ce9d389d02ce9d38951a31a08ca80b1a9d18cd19e7f9c39
2013-05-21 10:22:24 -05:00
Dustin Johnson
2cf8ffac1a
Merge "Issue #2000 Subscription overlap configuration GUI" into development
...
Former-commit-id: fef73ac960195cd5f210fef73ac960195cd5f2108fcc958d848fcc958d84bd65447c9f5695c4f967566273cf69
2013-05-21 08:19:34 -05:00
Steve Harris
d9f967c811
13.4.1-11 baseline
...
Former-commit-id: d6319a2ca62edee36158d6319a2ca62edee36158c0376ce9edc0376ce9ed4d888635156df093ef482767fd893c
2013-05-21 09:19:25 -04:00
Richard Peter
a664883d97
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
...
Former-commit-id: 8b2ecd5771e0740990ce8b2ecd5771e0740990ce59c38fdb7859c38fdb7872206676ee8b7cf1beb81418dbf556
2013-05-20 17:49:22 -05:00
Roger Ferrel
84b75ff489
Issue #1966 Interim changes Brad needs for his work.
...
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: e3c06b643b16c7de874ae3c06b643b16c7de874adfd586fca6dfd586fca64a5073902fc9e6e367fe7bf7c508b0
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
4f575058e0
Issue #1869 Remove DataURI column from sat plot types.
...
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb
Former-commit-id: aa3b8c80f426e80bbd18aa3b8c80f426e80bbd18885b106652885b106652a03dbd284b13b2b4afef8c9db38335
2013-05-20 17:27:15 -05:00
Dustin Johnson
a314bd8f4a
Issue #2000 Subscription overlap configuration GUI
...
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 554347f17c5b62669f8e554347f17c5b62669f8e38249cd7b938249cd7b93a504d1e7b7858a3b57fd12b26ac1d
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: 5b6fa4e360e4cdc64c075b6fa4e360e4cdc64c0735be00792e35be00792e07188502aa13febf859e1710cd9a3f
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: 081d1c724a99ba7adfe7081d1c724a99ba7adfe7e4874a873ae4874a873a3f20eed97531605b7a94fbdcd29129
2013-05-20 15:03:33 -05:00
Richard Peter
6a6b25ebda
Merge "Issue #1869 Remove DataURI column from qc." into development
...
Former-commit-id: 807956103230a61c3e17807956103230a61c3e173d861eca693d861eca69e03cf568950ced8c87e4b032b405ed
2013-05-20 14:48:47 -05:00
Steve Harris
b41118326c
13.4.1-10 baseline
...
Former-commit-id: 68fe2134b89a403b361568fe2134b89a403b361592152778b992152778b97e04d8cd13b1fc4e625b322036ea82
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: db9b06cc9dd8ce0f369cdb9b06cc9dd8ce0f369ca070d28ecca070d28ecca52363e2df7dd9b1e1c0bef3b4c74f
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: 648a1b25aea33ddbd1a6648a1b25aea33ddbd1a6a9869f07baa9869f07baaff520d61bc47eb36e43969fa704e5
2013-05-17 10:33:18 -05:00
Bryan Kowal
bb0432ea77
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 84c3c114a963f57de31f84c3c114a963f57de31f79816de30879816de3085d21fa1fd79ea4bab5773f4e377f05
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: 4d435d3dd5c4212408354d435d3dd5c421240835d07de0870fd07de0870f7ce0b7ef13a94469df826adbb139ab
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: 9a3f855a1a39543d7ee09a3f855a1a39543d7ee06ef214f1b86ef214f1b87f58e8a568ffa74c3bdb3f2bb17ce4
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
ea3d3660f3
Issue #1869 Remove DataURI column from qc.
...
Former-commit-id: 89b4bd571ac0d8dad8ae89b4bd571ac0d8dad8aef2b11b8a49f2b11b8a49777f12fbad6353b7e04b998330955a
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: 0704a0a610a5372205e60704a0a610a5372205e6b710a7c288b710a7c2887fb7c68b89e7001cfba5539959dfbf
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: bc8d798973bfcdcb607abc8d798973bfcdcb607ad905453660d905453660b57c84d12bc3bafc88cd75499add43
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: 87a31f999016ba74496d87a31f999016ba74496db76d359695b76d359695b5d3ff186726664e66154827d8f1d9
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: dccc6e4a967e849f0af3dccc6e4a967e849f0af322d449491822d449491888cc3a6011560fb81038e95c2d36b4
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: 17101171b61e726506e017101171b61e726506e039b12ee0fb39b12ee0fb381256789437461e68ddd792059e3c
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: 62efca504167e0d17aed62efca504167e0d17aed8b4d47c6908b4d47c690a3ad1c7c450038138fdc91d38b1e87
2013-05-16 10:54:52 -05:00
Nate Jensen
6a1c713e6f
Issue #1989 remove dead files
...
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: 9f8654e4ff1ecdd989df9f8654e4ff1ecdd989dfce2579a289ce2579a28953f994c0a804c7c4a4dab9bfcead05
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: 2149099abb11c93f548e2149099abb11c93f548e43ec90900843ec909008c03d61587c97cff7bf9cc00e145831
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: c83d93b527b0122e794ec83d93b527b0122e794e20fd227d9920fd227d998cba03d5a57ec8600dc11a63d07768
2013-05-16 10:19:31 -05:00
Steve Harris
1730b6c41e
13.4.1-9 baseline
...
Former-commit-id: 88eee9cbfabcf7f15c9088eee9cbfabcf7f15c90aff41713f9aff41713f967a95d07d20766ae20dd3f87ea1a15
2013-05-16 11:12:07 -04:00
Nate Jensen
7549733d5d
Merge "Issue #1989 removing dead plugins from repo" into development
...
Former-commit-id: 5b4c91d73403f93712a25b4c91d73403f93712a2367784bd99367784bd991355010c38e4b47d1eb96408ef5425
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: 5a8118b5a851015cd5925a8118b5a851015cd5921a1592ea3d1a1592ea3d4fa2a213234a8a5b16af3b5a3a8a3b
2013-05-15 18:22:25 -05:00
Richard Peter
ff16d49977
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
...
Former-commit-id: 9a8bc5871ffc5b6219739a8bc5871ffc5b621973a073bf2702a073bf2702671aaba9d957698cc95bda0fc8057c
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: 28a4f022168eeb2f4f9c28a4f022168eeb2f4f9cd62e51ad7ed62e51ad7e6fa299ecd800e9f3305dab15adabe2
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: 695c64a9f48a9e1f643a695c64a9f48a9e1f643aef1e80b61fef1e80b61f31fbf71aa2b8d6f542066db9b3f8d9
2013-05-15 16:54:40 -05:00
Nate Jensen
99bd7bc4eb
Issue #1989 removing dead plugins from repo
...
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: b7076f69472abccdfe2bb7076f69472abccdfe2b662fac5b31662fac5b318b1298777cae5df55dba8cffed1451
2013-05-15 16:25:23 -05:00
Richard Peter
06a146f5d3
Merge "Issue #1989 removing unused jars" into development
...
Former-commit-id: 3e1fe851e4303267be4d3e1fe851e4303267be4dad43b7bab5ad43b7bab5a504d84327fb1197ecb744b7de35fc
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: 07408178a8581158522907408178a8581158522941f4075e6f41f4075e6fedaa5339d7aabc22cc2ee39c66a454
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
1824606f71
Issue #1869 Remove DataURI column from ldadmesonet.
...
Former-commit-id: 89fe0b301d080b43444a89fe0b301d080b43444abbe2667522bbe2667522b3a2cd22c7f813b403796333ed4841
2013-05-15 15:35:02 -05:00
Nate Jensen
546249897b
Issue #1989 removing unused jars
...
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301
Former-commit-id: c75bfeb9a59c2b6bad3ec75bfeb9a59c2b6bad3ef4b8c0dc60f4b8c0dc606caa681ed30234e6788b2b72b5c530
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: 186f7169af286ec23fab186f7169af286ec23fabbcbe24f489bcbe24f489589fcada8bce6452daac89fc805bfe
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: bb307ed68535830d317dbb307ed68535830d317d7f9ef5ce987f9ef5ce98dbe24d00fd4c7b2d73d3f7d304c51b
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: 0cbf36df799c688f70700cbf36df799c688f707084158e76c784158e76c79f79748cd2ca10ac1598fab4021ce4
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: 86d3bf5a7c948e47a2c686d3bf5a7c948e47a2c6fecadf104bfecadf104b9284c27dddba3bda461c43369f0cf3
2013-05-15 13:36:09 -05:00
Bryan Kowal
9e9498b002
Issue #2002 - do not include .gitignore files in the rpm
...
Former-commit-id: 413237030160ae5df378413237030160ae5df378107055781d107055781d43db530ddb7df8e11ed3a2a6d0bdad
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: 6952b172cf591eb2d6e26952b172cf591eb2d6e2b621d417e5b621d417e593568fff0bb9275b3c2b0a49169575
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: 22b20b5f8eb905ee013c22b20b5f8eb905ee013c1c3e60a5ff1c3e60a5ffcb335861c28ea143a147ff9ce2b7c4
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: d81cee387b0523d790f8d81cee387b0523d790f882ccd32ee082ccd32ee0e0c4287959b40e0ca1c969ce5d7529
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: b687ddef04f1d65e7028b687ddef04f1d65e702848b67522d548b67522d511b33a5b14aa3ef285273e60ceec03
2013-05-15 12:44:28 -05:00
