Commit graph

2798 commits

Author SHA1 Message Date
Mike Duff
e3804d48ec Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]
Former-commit-id: 192ce891d0
Former-commit-id: 80b1f95f0c
2013-05-24 09:20:55 -05:00
Roger Ferrel
ff1dac4143 Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: e5867cbb79 [formerly 9533bb686d [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]
Former-commit-id: 9533bb686d
Former-commit-id: 75a2fc4723
2013-05-23 13:43:53 -05:00
Nate Jensen
e8ebe1a123 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
2013-05-23 11:20:40 -05:00
Nate Jensen
d7f5eea402 Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]
Former-commit-id: b8f3307f50
Former-commit-id: 876d741ab8
2013-05-23 10:43:15 -05:00
Richard Peter
25ace04a31 Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]
Former-commit-id: 57933400b9
Former-commit-id: edd70dfe47
2013-05-23 10:10:51 -05:00
Nate Jensen
4ae00040e3 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d74936ef3e
Former-commit-id: 65b9bafed7
2013-05-23 10:06:28 -05:00
Greg Armendariz
362195f3a3 Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
Former-commit-id: db8cf0d35f [formerly 2089732453 [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]
Former-commit-id: 2089732453
Former-commit-id: 8cf9ef2527
2013-05-23 09:10:41 -05:00
Greg Armendariz
cabcb3e574 Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]
Former-commit-id: 2fe2b0c5fb
Former-commit-id: dc9623df11
2013-05-23 09:10:11 -05:00
Lee Venable
8f2b44a49e Merge "Issue #1966 Feature place holders for the dialogs." into development
Former-commit-id: 7245dff8b9 [formerly cb156533f4 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]
Former-commit-id: cb156533f4
Former-commit-id: 6e7ed9e02b
2013-05-23 09:05:11 -05:00
Richard Peter
4dc4b4131d Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
Former-commit-id: 041c0ad948 [formerly df415f7088 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]
Former-commit-id: df415f7088
Former-commit-id: 895866b6d9
2013-05-23 08:52:47 -05:00
Roger Ferrel
7c7f9c01a6 Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]
Former-commit-id: e55f73b4f7
Former-commit-id: d7e7a56b84
2013-05-23 07:36:15 -05:00
Bryan Kowal
a73d607544 Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8

Former-commit-id: 8061922b70 [formerly bfd08efaa9 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]
Former-commit-id: bfd08efaa9
Former-commit-id: 73dfc7a5e1
2013-05-22 22:34:45 -05:00
Bryan Kowal
fba4b33fe1 Issue #1927 - patch ant includegen task
Former-commit-id: 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]
Former-commit-id: 40e8f544ea
Former-commit-id: 575944f70d
2013-05-22 18:00:43 -05:00
Nate Jensen
516eca979e Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]
Former-commit-id: 4ab1d90d67
Former-commit-id: 57e560b745
2013-05-22 16:39:24 -05:00
Steve Harris
511f938c3f Merge branch 'omaha_13.4.1' into development
Former-commit-id: 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]
Former-commit-id: 8496832064
Former-commit-id: 570128b986
2013-05-22 16:13:08 -05:00
Steve Harris
df612396fb Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]
Former-commit-id: 097617fa26
Former-commit-id: dce0dc3692
2013-05-22 16:10:04 -05:00
Steve Harris
623f813923 13.4.1-12 baseline
Former-commit-id: e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: 6a97b4325a
Former-commit-id: 397bbf674a
2013-05-22 16:42:39 -04:00
Benjamin Phillippe
feeb6126bb Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

Former-commit-id: 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]
Former-commit-id: 4d1252523e
Former-commit-id: 0308f217d6
2013-05-22 12:49:46 -05:00
David Gillingham
511098fffd Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]
Former-commit-id: 5cba0f5e40
Former-commit-id: 2555cf9819
2013-05-22 11:42:08 -05:00
Benjamin Phillippe
aab1aa57d4 Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]
Former-commit-id: b9f2bde20e
Former-commit-id: 7a908bbeaf
2013-05-22 11:38:42 -05:00
Brad Gonzales
819160fcde Issue #1965 Add org.apache.commons.io package to cots.
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed

Former-commit-id: 598a7a221e [formerly 4bc98160ab [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]
Former-commit-id: 4bc98160ab
Former-commit-id: 33045d73a6
2013-05-21 16:29:01 -05:00
Richard Peter
8fac7f2fd9 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]
Former-commit-id: c9c1570960
Former-commit-id: 62c8176486
2013-05-21 13:07:51 -05:00
Greg Armendariz
da4e717772 Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
Former-commit-id: eecbf2718a [formerly 20a9ad95e5 [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]
Former-commit-id: 20a9ad95e5
Former-commit-id: fce1512b37
2013-05-21 12:24:19 -05:00
Richard Peter
efd545925e 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: 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 8aa4b0025c
Former-commit-id: 3d84e1dd53
2013-05-21 12:11:21 -05:00
Bryan Kowal
b14dd898ac Issue #1952 - remove duplicate filesystem hierarchy
Former-commit-id: 7027f97e2a [formerly 4b8868ca54 [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]
Former-commit-id: 4b8868ca54
Former-commit-id: e9abe7185b
2013-05-21 11:09:57 -05:00
Nate Jensen
2bf84e9044 Merge "Issue #2001 fix message handling" into development
Former-commit-id: 4d519da3a9 [formerly 737b265c34 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]
Former-commit-id: 737b265c34
Former-commit-id: 8438eb1b4a
2013-05-21 11:00:32 -05:00
Richard Peter
c40709229f Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]
Former-commit-id: 73372622f7
Former-commit-id: 4809b3c15b
2013-05-21 10:35:00 -05:00
Nate Jensen
deea93d7e7 Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]
Former-commit-id: 1ab118958f
Former-commit-id: 56309efafe
2013-05-21 10:26:18 -05:00
Nate Jensen
8e7905197a Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
Former-commit-id: d02ce9d389 [formerly f16606cfba [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]
Former-commit-id: f16606cfba
Former-commit-id: 18e6f84418
2013-05-21 10:22:24 -05:00
Dustin Johnson
150ae88eba Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]
Former-commit-id: 195cd5f210
Former-commit-id: fef73ac960
2013-05-21 08:19:34 -05:00
Steve Harris
65d8f51034 13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: 2edee36158
Former-commit-id: d6319a2ca6
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
5219bd8426 Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]
Former-commit-id: 1a31aa2211
Former-commit-id: c11631c7da
2013-05-20 18:00:32 -05:00
Richard Peter
c699240a1b Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]
Former-commit-id: e0740990ce
Former-commit-id: 8b2ecd5771
2013-05-20 17:49:22 -05:00
Roger Ferrel
0b4fb8d04c Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]
Former-commit-id: 16c7de874a
Former-commit-id: e3c06b643b
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
7d52bbbaa0 Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]
Former-commit-id: 26e80bbd18
Former-commit-id: aa3b8c80f4
2013-05-20 17:27:15 -05:00
Dustin Johnson
095acb5ac3 Issue #2000 Subscription overlap configuration GUI
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]
Former-commit-id: 5b62669f8e
Former-commit-id: 554347f17c
2013-05-20 17:12:47 -05:00
Bryan Kowal
4452ec48d9 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: 35be00792e [formerly e4cdc64c07 [formerly cf94670fe9807a5253209da892f7305defaf32a8]]
Former-commit-id: e4cdc64c07
Former-commit-id: 5b6fa4e360
2013-05-20 16:58:56 -05:00
Bryan Kowal
3a5ae717cb Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: e4874a873a [formerly 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]
Former-commit-id: 99ba7adfe7
Former-commit-id: 081d1c724a
2013-05-20 15:03:33 -05:00
Richard Peter
0d7f36c84c Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]
Former-commit-id: 30a61c3e17
Former-commit-id: 8079561032
2013-05-20 14:48:47 -05:00
Steve Harris
294c127b0a 13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 9a403b3615
Former-commit-id: 68fe2134b8
2013-05-20 10:52:47 -04:00
Bryan Kowal
dd508d5bdd Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: a070d28ecc [formerly d8ce0f369c [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]
Former-commit-id: d8ce0f369c
Former-commit-id: db9b06cc9d
2013-05-17 18:21:03 -05:00
Richard Peter
d37ba352e2 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: a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a33ddbd1a6
Former-commit-id: 648a1b25ae
2013-05-17 10:33:18 -05:00
Bryan Kowal
3f924f74b8 Issue #1927 - handle common base until new build implementation
Former-commit-id: 79816de308 [formerly 63f57de31f [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]
Former-commit-id: 63f57de31f
Former-commit-id: 84c3c114a9
2013-05-16 23:56:47 -05:00
Max Schenkelberg
71624ccda3 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: d07de0870f [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]
Former-commit-id: c421240835
Former-commit-id: 4d435d3dd5
2013-05-16 18:04:26 -05:00
Nate Jensen
c7868a028e 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: 6ef214f1b8 [formerly 39543d7ee0 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]
Former-commit-id: 39543d7ee0
Former-commit-id: 9a3f855a1a
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
c7b7f58de8 Issue #1869 Remove DataURI column from qc.
Former-commit-id: f2b11b8a49 [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]
Former-commit-id: c0d8dad8ae
Former-commit-id: 89b4bd571a
2013-05-16 17:48:37 -05:00
Nate Jensen
2376c4593f Merge "Issue #1989 disable camel JMX to speed up edex" into development
Former-commit-id: b710a7c288 [formerly a5372205e6 [formerly d9e7d87f7eb454e66ecd42446544fcec473e95b6]]
Former-commit-id: a5372205e6
Former-commit-id: 0704a0a610
2013-05-16 17:33:18 -05:00
Nate Jensen
2c6fbd0c68 Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]
Former-commit-id: bfcdcb607a
Former-commit-id: bc8d798973
2013-05-16 17:13:46 -05:00
Steve Harris
f9535abb10 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: b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]
Former-commit-id: 16ba74496d
Former-commit-id: 87a31f9990
2013-05-16 13:45:58 -05:00
Bryan Kowal
da601e2c35 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: 22d4494918 [formerly 7e849f0af3 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]
Former-commit-id: 7e849f0af3
Former-commit-id: dccc6e4a96
2013-05-16 11:01:40 -05:00