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
Richard Peter
16c3723df8
Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
...
Former-commit-id: 19272c9f28
[formerly bc0f1c88fc
[formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]
Former-commit-id: bc0f1c88fc
Former-commit-id: 6dd22b6dfa
2013-05-29 09:26:10 -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
Mike Duff
0babd4d9b4
Issue #2016 - fix TS Trace toggle
...
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: 5919687484
[formerly afbe294f4a
[formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]
Former-commit-id: afbe294f4a
Former-commit-id: 51de726e49
2013-05-29 09:15:46 -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
Nate Jensen
d7391928f9
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
...
Former-commit-id: 256a67a9f9
[formerly 7c1e6e8b09
[formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]
Former-commit-id: 7c1e6e8b09
Former-commit-id: ba5e69c7ff
2013-05-28 15:43:31 -05:00
Nate Jensen
5748201316
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
...
Former-commit-id: e846e539fb
[formerly 053e37ee76
[formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]
Former-commit-id: 053e37ee76
Former-commit-id: cba08666e6
2013-05-28 15:43:23 -05:00
Max Schenkelberg
98bdd5f786
Issue #1638 Fixed text box drawn to be correct size with padding around text
...
Amend: Fixed format string issues with topo resource and colorbar labels
Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114
Former-commit-id: 3175563336
[formerly 13ff44fdee
[formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]
Former-commit-id: 13ff44fdee
Former-commit-id: a88ca5e983
2013-05-28 15:00:59 -05:00
Nate Jensen
d479912981
Issue #1967 fix annoying warnings, remove unused preferences page
...
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0
Former-commit-id: 3f85aeb00a
[formerly ed7b0fc8c5
[formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]
Former-commit-id: ed7b0fc8c5
Former-commit-id: bd8431b986
2013-05-28 14:30:26 -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
Nate Jensen
e3caafe7ad
Issue #2037 made imageMap concurrent to fix memory leak
...
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f
Former-commit-id: 68eba61c28
[formerly f77f350eb3
[formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]
Former-commit-id: f77f350eb3
Former-commit-id: 84444b6ba9
2013-05-28 09:21:57 -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
29b3e508e2
Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
...
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53
Former-commit-id: 7d233ff590
[formerly 7d1fc954f6
[formerly ef313253ec669167b9e1deb2562170c117123937]]
Former-commit-id: 7d1fc954f6
Former-commit-id: 631567ced9
2013-05-24 09:13:10 -05:00
Bryan Kowal
45c9e4d203
Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline
...
Amend: do not run the clean task after building any wa features
Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a
Former-commit-id: a2148650b4
[formerly 8145305580
[formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]
Former-commit-id: 8145305580
Former-commit-id: b3d40951ba
2013-05-23 23:52:35 -05:00
Lee Venable
082df6ccd5
Issue #1964 - inital GUI creation
...
Change-Id: I47d58880066fa2ef284e8911390163624b873381
Former-commit-id: c3328077c8
[formerly ae020d3960
[formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]
Former-commit-id: ae020d3960
Former-commit-id: 4ecb65e4a2
2013-05-23 17:16:31 -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