xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2947 commits 31 branches 40 tags 3.8 GiB
Commit graph

2947 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Peter
3d65441ec4 Merge "Issue #1989 fix clustered routes suspending/starting" into development 
Former-commit-id: edd70dfe47 [formerly 57933400b9] [formerly edd70dfe47 [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: e150a51871 [formerly 7a02b90690]
Former-commit-id: 6660e05379
 2013-05-23 10:10:51 -05:00
Nate Jensen
73290b1bb6 Issue #1989 use camel's built-in DirectVm component 
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 65b9bafed7 [formerly d74936ef3e] [formerly 65b9bafed7 [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: 882296f823 [formerly 91c8b9ac1d]
Former-commit-id: 0f319b9721
 2013-05-23 10:06:28 -05:00
Mike Duff
12bad74ca8 Issue #1902 - fix to forced guidance 
Peer review comments

Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e

Former-commit-id: b331a68a08 [formerly 11423a7465] [formerly b331a68a08 [formerly 11423a7465] [formerly 2a733fa5f8 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: 2878cde676 [formerly 7d177607bf]
Former-commit-id: a1dd9d73ba
 2013-05-23 09:52:07 -05:00
Greg Armendariz
e5c6e02f05 Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development 
Former-commit-id: 8cf9ef2527 [formerly 2089732453] [formerly 8cf9ef2527 [formerly 2089732453] [formerly db8cf0d35f [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]]
Former-commit-id: db8cf0d35f
Former-commit-id: c7e028a6ff [formerly 287f078150]
Former-commit-id: ba12811ed9
 2013-05-23 09:10:41 -05:00
Greg Armendariz
b0e11947dd Merge "Issue #1927 - patch ant includegen task" into development 
Former-commit-id: dc9623df11 [formerly 2fe2b0c5fb] [formerly dc9623df11 [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]
Former-commit-id: a4457f8c83
Former-commit-id: 7c97422501 [formerly 270269219c]
Former-commit-id: 28475200b6
 2013-05-23 09:10:11 -05:00
Matt Nash
63a4dd32c0 Issue #1871 fix for 64 bit ints from Python to Java 
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: bbc7406812 [formerly bd64f70d1a] [formerly bbc7406812 [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: 230e3d149e [formerly ca208f913c]
Former-commit-id: 1bfa549b40
 2013-05-23 09:07:56 -05:00
Lee Venable
236e7b39db Merge "Issue #1966 Feature place holders for the dialogs." into development 
Former-commit-id: 6e7ed9e02b [formerly cb156533f4] [formerly 6e7ed9e02b [formerly cb156533f4] [formerly 7245dff8b9 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]]
Former-commit-id: 7245dff8b9
Former-commit-id: a551d4b586 [formerly 8b13517100]
Former-commit-id: 415d9b74f7
 2013-05-23 09:05:11 -05:00
Richard Peter
e54a8c5c78 Merge "Issue #1965 Add org.apache.commons.io package to cots." into development 
Former-commit-id: 895866b6d9 [formerly df415f7088] [formerly 895866b6d9 [formerly df415f7088] [formerly 041c0ad948 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]]
Former-commit-id: 041c0ad948
Former-commit-id: b28bb05fde [formerly 08f45fe832]
Former-commit-id: 7f4e17f1ae
 2013-05-23 08:52:47 -05:00
Roger Ferrel
3ac1658261 Issue #1966 Feature place holders for the dialogs. 
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

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

Former-commit-id: 73dfc7a5e1 [formerly bfd08efaa9] [formerly 73dfc7a5e1 [formerly bfd08efaa9] [formerly 8061922b70 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]
Former-commit-id: 8061922b70
Former-commit-id: 1469cb15d6 [formerly 83c1e3127e]
Former-commit-id: f13a7f7ca5
 2013-05-22 22:34:45 -05:00
Bryan Kowal
58b7ec2195 Issue #1927 - patch ant includegen task 
Former-commit-id: 575944f70d [formerly 40e8f544ea] [formerly 575944f70d [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: e6cfad1759 [formerly 2a17b35e83]
Former-commit-id: 897c70d90c
 2013-05-22 18:00:43 -05:00
Nate Jensen
0b6011bc36 Issue #1989 fix clustered routes suspending/starting 
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 57e560b745 [formerly 4ab1d90d67] [formerly 57e560b745 [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]
Former-commit-id: a6d525ec96
Former-commit-id: 5525412779 [formerly 431e97742d]
Former-commit-id: f1bef6a3ac
 2013-05-22 16:39:24 -05:00
Steve Harris
61debd93bf Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 570128b986 [formerly 8496832064] [formerly 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 389eefd1f9 [formerly 0f9e0b343d]
Former-commit-id: c184d31779
 2013-05-22 16:13:08 -05:00
Steve Harris
6dbe80b1af Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: dce0dc3692 [formerly 097617fa26] [formerly dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 026674d0b2 [formerly 299690a202]
Former-commit-id: bd9b2e493e
 2013-05-22 16:10:04 -05:00
David Gillingham
8706da5f02 Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest. 
Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac

Former-commit-id: cf1f45d77f [formerly 8e8d71dc2f] [formerly cf1f45d77f [formerly 8e8d71dc2f] [formerly d5895e23c7 [formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]]
Former-commit-id: d5895e23c7
Former-commit-id: 2e6f7c8250 [formerly 0e1135ac1f]
Former-commit-id: 135ed9899f
 2013-05-22 15:48:32 -05:00
Steve Harris
71e13c4d4d 13.4.1-12 baseline 
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: b745b332ae [formerly bd4f93e859]
Former-commit-id: 0d9e71aee2
 2013-05-22 16:42:39 -04:00
Benjamin Phillippe
1b42f5d177 Issue #2022 Removed data delivery project from feature 
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

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

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

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

Former-commit-id: 33045d73a6 [formerly 4bc98160ab] [formerly 33045d73a6 [formerly 4bc98160ab] [formerly 598a7a221e [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]]
Former-commit-id: 598a7a221e
Former-commit-id: 6d483764e3 [formerly 858f68fc5c]
Former-commit-id: 0edf6a9b5e
 2013-05-21 16:29:01 -05:00
Richard Peter
7d73a32b0a Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development 
Former-commit-id: 62c8176486 [formerly c9c1570960] [formerly 62c8176486 [formerly c9c1570960] [formerly b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 1bbddf8fdf [formerly 489fdf49b1]
Former-commit-id: b3688d78d1
 2013-05-21 13:07:51 -05:00
Greg Armendariz
8c4a634c5a Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development 
Former-commit-id: fce1512b37 [formerly 20a9ad95e5] [formerly fce1512b37 [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]
Former-commit-id: eecbf2718a
Former-commit-id: cd96d6d2e6 [formerly 525cd5c751]
Former-commit-id: 065e9bd1f9
 2013-05-21 12:24:19 -05:00
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: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf]
Former-commit-id: 046de916fd
 2013-05-21 12:11:21 -05:00
Bryan Kowal
f1b7607385 Issue #1952 - remove duplicate filesystem hierarchy 
Former-commit-id: e9abe7185b [formerly 4b8868ca54] [formerly e9abe7185b [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 61a613b490 [formerly 62d21498a6]
Former-commit-id: 1052f6cd98
 2013-05-21 11:09:57 -05:00
Nate Jensen
741abd24bb Merge "Issue #2001 fix message handling" into development 
Former-commit-id: 8438eb1b4a [formerly 737b265c34] [formerly 8438eb1b4a [formerly 737b265c34] [formerly 4d519da3a9 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]]
Former-commit-id: 4d519da3a9
Former-commit-id: 0fc260728b [formerly d2cccd342b]
Former-commit-id: 9ef848d0c7
 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: 4809b3c15b [formerly 73372622f7] [formerly 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 21b87e9ea7 [formerly 427f54a878]
Former-commit-id: 69e6ea4847
 2013-05-21 10:35:00 -05:00
Nate Jensen
c183650ebd Issue #2001 fix message handling 
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 56309efafe [formerly 1ab118958f] [formerly 56309efafe [formerly 1ab118958f] [formerly 960bc6db69 [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: a06bb176ba [formerly e575c19ab6]
Former-commit-id: 942855e9f8
 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: 18e6f84418 [formerly f16606cfba] [formerly 18e6f84418 [formerly f16606cfba] [formerly d02ce9d389 [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]]
Former-commit-id: d02ce9d389
Former-commit-id: 51a31a08ca [formerly 80b1a9d18c]
Former-commit-id: d19e7f9c39
 2013-05-21 10:22:24 -05:00
Dustin Johnson
2cf8ffac1a Merge "Issue #2000 Subscription overlap configuration GUI" into development 
Former-commit-id: fef73ac960 [formerly 195cd5f210] [formerly fef73ac960 [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bd65447c9f [formerly 5695c4f967]
Former-commit-id: 566273cf69
 2013-05-21 08:19:34 -05:00
Steve Harris
d9f967c811 13.4.1-11 baseline 
Former-commit-id: d6319a2ca6 [formerly 2edee36158] [formerly d6319a2ca6 [formerly 2edee36158] [formerly c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 4d88863515 [formerly 6df093ef48]
Former-commit-id: 2767fd893c
 2013-05-21 09:19:25 -04:00
Ben Steffensmeier
4687ddcd62 Issue #1869 Rewrite dataURI property mappings. 
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: c11631c7da [formerly 1a31aa2211] [formerly c11631c7da [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: 30eb486e45 [formerly 5147eb18d4]
Former-commit-id: 9bac8c566c
 2013-05-20 18:00:32 -05:00
Richard Peter
a664883d97 Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development 
Former-commit-id: 8b2ecd5771 [formerly e0740990ce] [formerly 8b2ecd5771 [formerly e0740990ce] [formerly 59c38fdb78 [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 72206676ee [formerly 8b7cf1beb8]
Former-commit-id: 1418dbf556
 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: e3c06b643b [formerly 16c7de874a] [formerly e3c06b643b [formerly 16c7de874a] [formerly dfd586fca6 [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4a5073902f [formerly c9e6e367fe]
Former-commit-id: 7bf7c508b0
 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: aa3b8c80f4 [formerly 26e80bbd18] [formerly aa3b8c80f4 [formerly 26e80bbd18] [formerly 885b106652 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]
Former-commit-id: 885b106652
Former-commit-id: a03dbd284b [formerly 13b2b4afef]
Former-commit-id: 8c9db38335
 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: 554347f17c [formerly 5b62669f8e] [formerly 554347f17c [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 3a504d1e7b [formerly 7858a3b57f]
Former-commit-id: d12b26ac1d
 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: 5b6fa4e360 [formerly e4cdc64c07] [formerly 5b6fa4e360 [formerly e4cdc64c07] [formerly 35be00792e [formerly cf94670fe9807a5253209da892f7305defaf32a8]]]
Former-commit-id: 35be00792e
Former-commit-id: 07188502aa [formerly 13febf859e]
Former-commit-id: 1710cd9a3f
 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: 081d1c724a [formerly 99ba7adfe7] [formerly 081d1c724a [formerly 99ba7adfe7] [formerly e4874a873a [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]
Former-commit-id: e4874a873a
Former-commit-id: 3f20eed975 [formerly 31605b7a94]
Former-commit-id: fbdcd29129
 2013-05-20 15:03:33 -05:00
Richard Peter
6a6b25ebda Merge "Issue #1869 Remove DataURI column from qc." into development 
Former-commit-id: 8079561032 [formerly 30a61c3e17] [formerly 8079561032 [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: e03cf56895 [formerly 0ced8c87e4]
Former-commit-id: b032b405ed
 2013-05-20 14:48:47 -05:00
Steve Harris
b41118326c 13.4.1-10 baseline 
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
 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: db9b06cc9d [formerly d8ce0f369c] [formerly db9b06cc9d [formerly d8ce0f369c] [formerly a070d28ecc [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: a52363e2df [formerly 7dd9b1e1c0]
Former-commit-id: bef3b4c74f
 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: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
 2013-05-17 10:33:18 -05:00
Bryan Kowal
bb0432ea77 Issue #1927 - handle common base until new build implementation 
Former-commit-id: 84c3c114a9 [formerly 63f57de31f] [formerly 84c3c114a9 [formerly 63f57de31f] [formerly 79816de308 [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]]
Former-commit-id: 79816de308
Former-commit-id: 5d21fa1fd7 [formerly 9ea4bab577]
Former-commit-id: 3f4e377f05
 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: 4d435d3dd5 [formerly c421240835] [formerly 4d435d3dd5 [formerly c421240835] [formerly d07de0870f [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: 7ce0b7ef13 [formerly a94469df82]
Former-commit-id: 6adbb139ab
 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: 9a3f855a1a [formerly 39543d7ee0] [formerly 9a3f855a1a [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 7f58e8a568 [formerly ffa74c3bdb]
Former-commit-id: 3f2bb17ce4
 2013-05-16 18:02:20 -05:00
Ben Steffensmeier
ea3d3660f3 Issue #1869 Remove DataURI column from qc. 
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 777f12fbad [formerly 6353b7e04b]
Former-commit-id: 998330955a
 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: 0704a0a610 [formerly a5372205e6] [formerly 0704a0a610 [formerly a5372205e6] [formerly b710a7c288 [formerly d9e7d87f7eb454e66ecd42446544fcec473e95b6]]]
Former-commit-id: b710a7c288
Former-commit-id: 7fb7c68b89 [formerly e7001cfba5]
Former-commit-id: 539959dfbf
 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: bc8d798973 [formerly bfcdcb607a] [formerly bc8d798973 [formerly bfcdcb607a] [formerly d905453660 [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]
Former-commit-id: d905453660
Former-commit-id: b57c84d12b [formerly c3bafc88cd]
Former-commit-id: 75499add43
 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: 87a31f9990 [formerly 16ba74496d] [formerly 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: b5d3ff1867 [formerly 26664e6615]
Former-commit-id: 4827d8f1d9
 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: dccc6e4a96 [formerly 7e849f0af3] [formerly dccc6e4a96 [formerly 7e849f0af3] [formerly 22d4494918 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918
Former-commit-id: 88cc3a6011 [formerly 560fb81038]
Former-commit-id: e95c2d36b4
 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: 17101171b6 [formerly 1e726506e0] [formerly 17101171b6 [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 3812567894 [formerly 37461e68dd]
Former-commit-id: d792059e3c
 2013-05-16 11:00:47 -05:00