Nate Jensen
b8f3307f50
Merge "Issue #1989 use camel's built-in DirectVm component" into development
...
Former-commit-id: f608d0ec297d85ba3e72c23905375f086fef2477
2013-05-23 10:43:15 -05:00
Richard Peter
57933400b9
Merge "Issue #1989 fix clustered routes suspending/starting" into development
...
Former-commit-id: 6b013a490dd450de349fbe40f0fd5b8ca7a86efa
2013-05-23 10:10:51 -05:00
Nate Jensen
d74936ef3e
Issue #1989 use camel's built-in DirectVm component
...
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 90397159ef98097da0754a846d1f67d4839a300d
2013-05-23 10:06:28 -05:00
Greg Armendariz
2089732453
Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
...
Former-commit-id: 1b071a6258127495f9f8c419abae65b27519cf6e
2013-05-23 09:10:41 -05:00
Greg Armendariz
2fe2b0c5fb
Merge "Issue #1927 - patch ant includegen task" into development
...
Former-commit-id: 16a342bd89e1d087603dfa4d03f45d22524e074a
2013-05-23 09:10:11 -05:00
Lee Venable
cb156533f4
Merge "Issue #1966 Feature place holders for the dialogs." into development
...
Former-commit-id: b86a90abaa162805c2790ce007fcf38ea80d9779
2013-05-23 09:05:11 -05:00
Richard Peter
df415f7088
Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
...
Former-commit-id: 0338f3bb4ccace045099b6b60f338e18e5d05913
2013-05-23 08:52:47 -05:00
Roger Ferrel
e55f73b4f7
Issue #1966 Feature place holders for the dialogs.
...
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f
Former-commit-id: 04684460d021089818509726b1dd23d53fb90440
2013-05-23 07:36:15 -05:00
Bryan Kowal
bfd08efaa9
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
...
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: 87f9ac72782df2bd133ac415a28d2c56a984cd07
2013-05-22 22:34:45 -05:00
Bryan Kowal
40e8f544ea
Issue #1927 - patch ant includegen task
...
Former-commit-id: 912ec4daa384140f583d05d650734a9871ae1735
2013-05-22 18:00:43 -05:00
Nate Jensen
4ab1d90d67
Issue #1989 fix clustered routes suspending/starting
...
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b
2013-05-22 16:39:24 -05:00
Steve Harris
8496832064
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 702d49b30f4b86a120dd032394c314f5db6c985c
2013-05-22 16:13:08 -05:00
Steve Harris
097617fa26
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: eef8340cb8e904e4469e9c99271a34268ca2ce23
2013-05-22 16:10:04 -05:00
Steve Harris
6a97b4325a
13.4.1-12 baseline
...
Former-commit-id: 398b25dee65cd6154c467b657ced5c9d2bada11a
2013-05-22 16:42:39 -04:00
Benjamin Phillippe
4d1252523e
Issue #2022 Removed data delivery project from feature
...
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e
2013-05-22 12:49:46 -05:00
David Gillingham
5cba0f5e40
Issue #1759 : Fix regression to ISC request reply due to missing import.
...
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca
2013-05-22 11:42:08 -05:00
Benjamin Phillippe
b9f2bde20e
Issue #2022 Added registry federation capabilities
...
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa
2013-05-22 11:38:42 -05:00
Brad Gonzales
4bc98160ab
Issue #1965 Add org.apache.commons.io package to cots.
...
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed
Former-commit-id: e04606333b5dd3248a7b7cdb3056d29c15a0036a
2013-05-21 16:29:01 -05:00
Richard Peter
c9c1570960
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
...
Former-commit-id: 6c7371738300221d0d861ef10bb904a483d0655c
2013-05-21 13:07:51 -05:00
Greg Armendariz
20a9ad95e5
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3
2013-05-21 12:24:19 -05:00
Richard Peter
8aa4b0025c
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: 8a78f99345016db3d38c0b846a8a6ccf77fb3e89
2013-05-21 12:11:21 -05:00
Bryan Kowal
4b8868ca54
Issue #1952 - remove duplicate filesystem hierarchy
...
Former-commit-id: 51d97b526a708d896c2935baeab27a0ae627960a
2013-05-21 11:09:57 -05:00
Nate Jensen
737b265c34
Merge "Issue #2001 fix message handling" into development
...
Former-commit-id: 50ea25c2563c109b92e4251c05174b9b3d077909
2013-05-21 11:00:32 -05:00
Richard Peter
73372622f7
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 306527aa5e90782da8232acdce39b56358d10dd0
2013-05-21 10:35:00 -05:00
Nate Jensen
1ab118958f
Issue #2001 fix message handling
...
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b
Former-commit-id: 2863f68dd5da6ca323c9cd84dfc06a589524e176
2013-05-21 10:26:18 -05:00
Nate Jensen
f16606cfba
Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
...
Former-commit-id: a6b4bd31146009e3d958efde759408daec52d2f4
2013-05-21 10:22:24 -05:00
Dustin Johnson
195cd5f210
Merge "Issue #2000 Subscription overlap configuration GUI" into development
...
Former-commit-id: 9a475b865a49ce636746583dec45a3f2a683afe9
2013-05-21 08:19:34 -05:00
Steve Harris
2edee36158
13.4.1-11 baseline
...
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
1a31aa2211
Issue #1869 Rewrite dataURI property mappings.
...
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956
2013-05-20 18:00:32 -05:00
Richard Peter
e0740990ce
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
...
Former-commit-id: 4e30da9f358aa552733e97328e8ff866bf49df33
2013-05-20 17:49:22 -05:00
Roger Ferrel
16c7de874a
Issue #1966 Interim changes Brad needs for his work.
...
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: 57a43dfefb79d49895beace44930db630cd502be
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
26e80bbd18
Issue #1869 Remove DataURI column from sat plot types.
...
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb
Former-commit-id: 0acecd7e4397543ca31c1bca719831fef8e65d95
2013-05-20 17:27:15 -05:00
Dustin Johnson
5b62669f8e
Issue #2000 Subscription overlap configuration GUI
...
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8
2013-05-20 17:12:47 -05:00
Bryan Kowal
e4cdc64c07
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: cf94670fe9807a5253209da892f7305defaf32a8
2013-05-20 16:58:56 -05:00
Bryan Kowal
99ba7adfe7
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
...
Former-commit-id: 5d7bf83507e91f9dc6b748c54ad00d010f3f790a
2013-05-20 15:03:33 -05:00
Richard Peter
30a61c3e17
Merge "Issue #1869 Remove DataURI column from qc." into development
...
Former-commit-id: 279038141fd88cdb1ccdd9a570d89eb6c651cd45
2013-05-20 14:48:47 -05:00
Steve Harris
9a403b3615
13.4.1-10 baseline
...
Former-commit-id: bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4
2013-05-20 10:52:47 -04:00
Bryan Kowal
d8ce0f369c
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
...
Former-commit-id: 16613c208fee90c5a11b948f61f34e201402ff30
2013-05-17 18:21:03 -05:00
Richard Peter
a33ddbd1a6
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: d8543a8dc09565c12c3aebc21466ed43108a9c85
2013-05-17 10:33:18 -05:00
Bryan Kowal
63f57de31f
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 977de6e3ab58905fada220a766039ff6e014b9ec
2013-05-16 23:56:47 -05:00
Max Schenkelberg
c421240835
Issue #1638 Fixed updates for resource datas that override update without checking update object
...
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f
Former-commit-id: 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8
2013-05-16 18:04:26 -05:00
Nate Jensen
39543d7ee0
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: 75de1f5405d24d0eb63d366c4da73a56f4c9d947
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
c0d8dad8ae
Issue #1869 Remove DataURI column from qc.
...
Former-commit-id: e54b02e75b3534f829f0cc4be2639ae5ed26663e
2013-05-16 17:48:37 -05:00
Nate Jensen
a5372205e6
Merge "Issue #1989 disable camel JMX to speed up edex" into development
...
Former-commit-id: d9e7d87f7eb454e66ecd42446544fcec473e95b6
2013-05-16 17:33:18 -05:00
Nate Jensen
bfcdcb607a
Issue #1989 disable camel JMX to speed up edex
...
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: e620cf1f588ded1ba331b49c8d0bd4630d0c17bc
2013-05-16 17:13:46 -05:00
Steve Harris
16ba74496d
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: 27dff26c47d68e83682e4ac3c61898378838bc5b
2013-05-16 13:45:58 -05:00
Bryan Kowal
7e849f0af3
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: eb3a64c073ce95be0993b5aff1bd057b6d42f015
2013-05-16 11:01:40 -05:00
Bryan Kowal
1e726506e0
Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
...
Former-commit-id: 4d804cd0de708904368f0a26ed8421379278bddd
2013-05-16 11:00:47 -05:00
Max Schenkelberg
67e0d17aed
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: dad0108065ac5f208f59ce6bc6493000278e2c21
2013-05-16 10:54:52 -05:00
Nate Jensen
1ecdd989df
Issue #1989 remove dead files
...
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: 354c2f6a304bb48d82243daf2e80236f7fe05a54
2013-05-16 10:25:38 -05:00
