Dustin Johnson
f6c89fa3d9
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: 05bd3e113d
[formerly fc807288a7
[formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]
Former-commit-id: fc807288a7
Former-commit-id: b4bc2ca947
2013-05-31 09:29:44 -05:00
Richard Peter
a25207c4f5
Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
...
Former-commit-id: 0e4782aea5
[formerly 6487cd6578
[formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]
Former-commit-id: 6487cd6578
Former-commit-id: 6a19a0074f
2013-05-30 17:17:23 -05:00
Dustin Johnson
f3835a5670
Merge "Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS" into development
...
Former-commit-id: e4ecae9e7e
[formerly c01ea33d5b
[formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]
Former-commit-id: c01ea33d5b
Former-commit-id: 54045d6b9b
2013-05-30 17:11:19 -05:00
Dave Hladky
7393abfc91
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 83dae4fe01
[formerly 1608d407d1
[formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]
Former-commit-id: 1608d407d1
Former-commit-id: c292bf1b55
2013-05-30 17:04:16 -05:00
Roger Ferrel
cfcd38da58
Issue #1966 Changes to make manger stateless and updates for Case Creation.
...
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387
Former-commit-id: 3c875a6f44
[formerly c6cddc605d
[formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]
Former-commit-id: c6cddc605d
Former-commit-id: d6672697aa
2013-05-30 16:35:11 -05:00
Nate Jensen
03833d148d
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: e4578ca7ba
[formerly 4aa3657d1a
[formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]
Former-commit-id: 4aa3657d1a
Former-commit-id: 10dd7ea61f
2013-05-30 14:50:39 -05:00
Steve Harris
4e0ce194d9
Issue #1871 - Merge branch 'vlab' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
Former-commit-id: 26bf27c70d
[formerly 3745089239
[formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]
Former-commit-id: 3745089239
Former-commit-id: 3e66acde96
2013-05-30 14:33:24 -05:00
Ron Anderson
7d2d162be4
Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
...
Former-commit-id: 7f41d701be
[formerly dd10af4a8a
[formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]
Former-commit-id: dd10af4a8a
Former-commit-id: 79a8cd1b6f
2013-05-30 13:08:26 -05:00
Everett Kladstrup
7d7e276e2a
Issue #2052 Fix FeatureExplorer feature comparison
...
* fixes complaint when feature A includes features B and C
which both include feature D.
Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change
Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7
Former-commit-id: 4621271329
[formerly 0b2839fd43
[formerly 792255325dd584238c47f53d5cf1d642465b53d6]]
Former-commit-id: 0b2839fd43
Former-commit-id: 9541c93640
2013-05-30 13:02:49 -05:00
Dustin Johnson
b7d7d66727
Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
...
Former-commit-id: 9c9caf00d1
[formerly 7e6bdb7b70
[formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]
Former-commit-id: 7e6bdb7b70
Former-commit-id: 80309d6a4e
2013-05-30 11:32:09 -05:00
Dustin Johnson
0ac058008d
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: b99a8bc4f9
[formerly efc3c6a2f2
[formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]
Former-commit-id: efc3c6a2f2
Former-commit-id: 463bed7647
2013-05-30 09:49:09 -05:00
Brad Gonzales
778cf6542c
Issue #1965 Commit for purge and archive with tests.
...
A lot of this ended up being duplication of Roger's code. Roger's changes should go first,
and then this commit will be merged and refactored with his code in an amend.
Amend: better test coverage, fixes to old other pattern
integrated with Roger's changes.
added header comments, deleted FileArchiveElement.
removed search and filter code.
Change-Id: I4e48842a75b9da27062349fee01099e1ea13f59e
Former-commit-id: 321f153547
[formerly aa76f81b3c
[formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]
Former-commit-id: aa76f81b3c
Former-commit-id: 6243f1f789
2013-05-30 09:34:18 -05:00
Bryan Kowal
3c98d835bf
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: bd9251eba0
[formerly 7b24cd293a
[formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]
Former-commit-id: 7b24cd293a
Former-commit-id: 52a1addb29
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
05e7e0551f
Issue #1869 ensure all uses ofdataURI in PDO use getter.
...
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f
Former-commit-id: 191f93653d
[formerly 268ee5ce30
[formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]
Former-commit-id: 268ee5ce30
Former-commit-id: b3865f4efc
2013-05-29 17:50:50 -05:00
Nate Jensen
00fbfbe7e5
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: fc691cbb2f
[formerly f3258e77f7
[formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: f3258e77f7
Former-commit-id: 740237c317
2013-05-29 16:19:28 -05:00
Dustin Johnson
63ccc2c133
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: ecf3f2e300
[formerly d2d50e7d8b
[formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]
Former-commit-id: d2d50e7d8b
Former-commit-id: 21b8f03b1f
2013-05-29 15:54:06 -05:00
Nate Jensen
04d6f6654d
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 3f3e0a788d
[formerly 99b4a21414
[formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
2013-05-29 14:49:43 -05:00
Nate Jensen
6a6484cbb2
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 148b20f57c
[formerly caf414bab0
[formerly 19d32f4ffee269e244b77988f908a8e263374430]]
Former-commit-id: caf414bab0
Former-commit-id: 7059967ae9
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
ec9881b914
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: d5263b2b75
[formerly 4747f7d319
[formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]
Former-commit-id: 4747f7d319
Former-commit-id: e16dc02a54
2013-05-29 10:34:22 -05:00
Dustin Johnson
605f2d6136
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: ac292f1242
[formerly 66c941fc3f
[formerly 346f09f53275928fc43d86dd41d7edd519581caf]]
Former-commit-id: 66c941fc3f
Former-commit-id: 7ca6f18405
2013-05-29 09:27:30 -05:00
Nate Jensen
cf705759bd
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 36bc35b5c8
[formerly 82d6c03669
[formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 82d6c03669
Former-commit-id: 808ab352c5
2013-05-29 09:20:53 -05:00
Dustin Johnson
eef3b4c750
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: 31e01a9f9a
[formerly 0a9e7ed740
[formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]
Former-commit-id: 0a9e7ed740
Former-commit-id: c76fa3bc2a
2013-05-29 09:02:47 -05:00
Roger Ferrel
24f1c70168
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
...
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: 9263b54845
[formerly cbee731447
[formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]
Former-commit-id: cbee731447
Former-commit-id: 365af6b7ce
2013-05-28 13:21:08 -05:00
Max Schenkelberg
a91db9c1e3
Issue #1638 Added support for null search constraints for updates
...
Amend: Fixed comment, added SW history
Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515
Former-commit-id: 807e4501c8
[formerly 1bc4437154
[formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]
Former-commit-id: 1bc4437154
Former-commit-id: 21693d6913
2013-05-28 12:59:27 -05:00
Dustin Johnson
c694d523db
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
...
Former-commit-id: 197a5cef1b
[formerly 2b1f75f702
[formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]
Former-commit-id: 2b1f75f702
Former-commit-id: f4ad0218f2
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
c2ca1551f6
Issue #1869 Fix unique checking for things without dataURI and with subtables.
...
Former-commit-id: 7be9ad1f8b
[formerly 3b6156843e
[formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]
Former-commit-id: 3b6156843e
Former-commit-id: cdf8e7daaa
2013-05-24 16:40:21 -05:00
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
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
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
Matt Nash
1ecf5d26af
Issue #1871 fix for 64 bit ints from Python to Java
...
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae
Former-commit-id: 30c7ca8d36
[formerly bd64f70d1a
[formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]
Former-commit-id: bd64f70d1a
Former-commit-id: bbc7406812
2013-05-23 09:07:56 -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
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
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
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
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
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