Nate Jensen
91c8b9ac1d
Issue #1989 use camel's built-in DirectVm component
...
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: d74936ef3ed7b8e04bb7
2013-05-23 10:06:28 -05:00
Nate Jensen
431e97742d
Issue #1989 fix clustered routes suspending/starting
...
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: 4ab1d90d67a6d525ec96
2013-05-22 16:39:24 -05:00
Steve Harris
0f9e0b343d
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 84968320643590310f17
2013-05-22 16:13:08 -05:00
Steve Harris
299690a202
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 097617fa26462652e31e
2013-05-22 16:10:04 -05:00
Steve Harris
bd4f93e859
13.4.1-12 baseline
...
Former-commit-id: 6a97b4325ae53ada66b8
2013-05-22 16:42:39 -04:00
Benjamin Phillippe
ce20ead9e7
Issue #2022 Removed data delivery project from feature
...
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: 4d1252523e3e9fe9892e
2013-05-22 12:49:46 -05:00
David Gillingham
60aeb71652
Issue #1759 : Fix regression to ISC request reply due to missing import.
...
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: 5cba0f5e40801c659108
2013-05-22 11:42:08 -05:00
Benjamin Phillippe
ad039bae0c
Issue #2022 Added registry federation capabilities
...
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: b9f2bde20ec3a376475b
2013-05-22 11:38:42 -05:00
Richard Peter
489fdf49b1
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
...
Former-commit-id: c9c1570960b4344d3c04
2013-05-21 13:07:51 -05:00
Greg Armendariz
525cd5c751
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: 20a9ad95e5eecbf2718a
2013-05-21 12:24:19 -05:00
Richard Peter
81ae3ea8bf
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: 8aa4b0025c930ff50fb8
2013-05-21 12:11:21 -05:00
Bryan Kowal
62d21498a6
Issue #1952 - remove duplicate filesystem hierarchy
...
Former-commit-id: 4b8868ca547027f97e2a
2013-05-21 11:09:57 -05:00
Nate Jensen
d2cccd342b
Merge "Issue #2001 fix message handling" into development
...
Former-commit-id: 737b265c344d519da3a9
2013-05-21 11:00:32 -05:00
Richard Peter
427f54a878
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 73372622f777a08ebd31
2013-05-21 10:35:00 -05:00
Nate Jensen
e575c19ab6
Issue #2001 fix message handling
...
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b
Former-commit-id: 1ab118958f960bc6db69
2013-05-21 10:26:18 -05:00
Nate Jensen
80b1a9d18c
Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
...
Former-commit-id: f16606cfbad02ce9d389
2013-05-21 10:22:24 -05:00
Dustin Johnson
5695c4f967
Merge "Issue #2000 Subscription overlap configuration GUI" into development
...
Former-commit-id: 195cd5f2108fcc958d84
2013-05-21 08:19:34 -05:00
Steve Harris
6df093ef48
13.4.1-11 baseline
...
Former-commit-id: 2edee36158c0376ce9ed
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
5147eb18d4
Issue #1869 Rewrite dataURI property mappings.
...
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: 1a31aa2211931e76ae59
2013-05-20 18:00:32 -05:00
Richard Peter
8b7cf1beb8
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
...
Former-commit-id: e0740990ce59c38fdb78
2013-05-20 17:49:22 -05:00
Roger Ferrel
c9e6e367fe
Issue #1966 Interim changes Brad needs for his work.
...
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: 16c7de874adfd586fca6
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
13b2b4afef
Issue #1869 Remove DataURI column from sat plot types.
...
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb
Former-commit-id: 26e80bbd18885b106652
2013-05-20 17:27:15 -05:00
Dustin Johnson
7858a3b57f
Issue #2000 Subscription overlap configuration GUI
...
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 5b62669f8e38249cd7b9
2013-05-20 17:12:47 -05:00
Bryan Kowal
13febf859e
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: e4cdc64c0735be00792e
2013-05-20 16:58:56 -05:00
Bryan Kowal
31605b7a94
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
...
Former-commit-id: 99ba7adfe7e4874a873a
2013-05-20 15:03:33 -05:00
Richard Peter
0ced8c87e4
Merge "Issue #1869 Remove DataURI column from qc." into development
...
Former-commit-id: 30a61c3e173d861eca69
2013-05-20 14:48:47 -05:00
Steve Harris
b1fc4e625b
13.4.1-10 baseline
...
Former-commit-id: 9a403b361592152778b9
2013-05-20 10:52:47 -04:00
Bryan Kowal
7dd9b1e1c0
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
...
Former-commit-id: d8ce0f369ca070d28ecc
2013-05-17 18:21:03 -05:00
Richard Peter
c47eb36e43
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: a33ddbd1a6a9869f07ba
2013-05-17 10:33:18 -05:00
Bryan Kowal
9ea4bab577
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 63f57de31f79816de308
2013-05-16 23:56:47 -05:00
Max Schenkelberg
a94469df82
Issue #1638 Fixed updates for resource datas that override update without checking update object
...
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f
Former-commit-id: c421240835d07de0870f
2013-05-16 18:04:26 -05:00
Nate Jensen
ffa74c3bdb
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: 39543d7ee06ef214f1b8
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
6353b7e04b
Issue #1869 Remove DataURI column from qc.
...
Former-commit-id: c0d8dad8aef2b11b8a49
2013-05-16 17:48:37 -05:00
Nate Jensen
e7001cfba5
Merge "Issue #1989 disable camel JMX to speed up edex" into development
...
Former-commit-id: a5372205e6b710a7c288
2013-05-16 17:33:18 -05:00
Nate Jensen
c3bafc88cd
Issue #1989 disable camel JMX to speed up edex
...
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: bfcdcb607ad905453660
2013-05-16 17:13:46 -05:00
Steve Harris
26664e6615
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: 16ba74496db76d359695
2013-05-16 13:45:58 -05:00
Bryan Kowal
560fb81038
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: 7e849f0af322d4494918
2013-05-16 11:01:40 -05:00
Bryan Kowal
37461e68dd
Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
...
Former-commit-id: 1e726506e039b12ee0fb
2013-05-16 11:00:47 -05:00
Max Schenkelberg
0038138fdc
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: 67e0d17aed8b4d47c690
2013-05-16 10:54:52 -05:00
Nate Jensen
04c7c4a4da
Issue #1989 remove dead files
...
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: 1ecdd989dfce2579a289
2013-05-16 10:25:38 -05:00
Bryan Kowal
97cff7bf9c
Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
...
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e
Former-commit-id: 11c93f548e43ec909008
2013-05-16 10:21:11 -05:00
Bryan Kowal
7ec8600dc1
Issue #1872 - merge 2002; do not include .gitignore files in the rpm
...
Former-commit-id: b0122e794e20fd227d99
2013-05-16 10:19:31 -05:00
Steve Harris
0766ae20dd
13.4.1-9 baseline
...
Former-commit-id: bcf7f15c90aff41713f9
2013-05-16 11:12:07 -04:00
Nate Jensen
e4b47d1eb9
Merge "Issue #1989 removing dead plugins from repo" into development
...
Former-commit-id: 03f93712a2367784bd99
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
4a8a5b16af
Issue #1869 Switch acars back to original plot resource.
...
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85
Former-commit-id: 51015cd5921a1592ea3d
2013-05-15 18:22:25 -05:00
Richard Peter
57698cc95b
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
...
Former-commit-id: fc5b621973a073bf2702
2013-05-15 18:14:00 -05:00
Dustin Johnson
00e9f3305d
Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
...
Former-commit-id: 8eeb2f4f9cd62e51ad7e
2013-05-15 17:06:42 -05:00
Dustin Johnson
b8d6f54206
Issue #2000 Fix broken stuff after Spring 3 upgrade
...
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 8a9e1f643aef1e80b61f
2013-05-15 16:54:40 -05:00
Nate Jensen
ae5df55dba
Issue #1989 removing dead plugins from repo
...
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: 2abccdfe2b662fac5b31
2013-05-15 16:25:23 -05:00
Richard Peter
fb1197ecb7
Merge "Issue #1989 removing unused jars" into development
...
Former-commit-id: 303267be4dad43b7bab5
2013-05-15 16:17:57 -05:00
