Commit graph

2822 commits

Author SHA1 Message Date
Nate Jensen
740237c317 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: fc691cbb2f [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]
Former-commit-id: f3258e77f7
2013-05-29 16:19:28 -05:00
Dustin Johnson
8ae3e74339 Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
Former-commit-id: 2554ff9602 [formerly 5716e1dbbbbe67cdde980eab6b60a70e22283ee9]
Former-commit-id: b0348bc056
2013-05-29 16:02:55 -05:00
Dustin Johnson
21b8f03b1f Issue #2038 Fix deleting of multiple subscription types
Update test Spring configurations

Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e

Former-commit-id: ecf3f2e300 [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]
Former-commit-id: d2d50e7d8b
2013-05-29 15:54:06 -05:00
Nate Jensen
c0e93d192c Issue #1989 fix for webpages
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7

Former-commit-id: 0d495f9759 [formerly 7880f21755384540d3bca4ac15b04932455b8fd8]
Former-commit-id: 1a34067182
2013-05-29 15:21:10 -05:00
Nate Jensen
927da5cffb Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]
Former-commit-id: 99b4a21414
2013-05-29 14:49:43 -05:00
Nate Jensen
7059967ae9 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 148b20f57c [formerly 19d32f4ffee269e244b77988f908a8e263374430]
Former-commit-id: caf414bab0
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
e16dc02a54 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: d5263b2b75 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]
Former-commit-id: 4747f7d319
2013-05-29 10:34:22 -05:00
Dustin Johnson
7ca6f18405 Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: ac292f1242 [formerly 346f09f53275928fc43d86dd41d7edd519581caf]
Former-commit-id: 66c941fc3f
2013-05-29 09:27:30 -05:00
Richard Peter
6dd22b6dfa Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
Former-commit-id: 19272c9f28 [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]
Former-commit-id: bc0f1c88fc
2013-05-29 09:26:10 -05:00
Nate Jensen
808ab352c5 Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 36bc35b5c8 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]
Former-commit-id: 82d6c03669
2013-05-29 09:20:53 -05:00
Mike Duff
51de726e49 Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 5919687484 [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]
Former-commit-id: afbe294f4a
2013-05-29 09:15:46 -05:00
Dustin Johnson
c76fa3bc2a Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: 31e01a9f9a [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]
Former-commit-id: 0a9e7ed740
2013-05-29 09:02:47 -05:00
Nate Jensen
ba5e69c7ff Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: 256a67a9f9 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]
Former-commit-id: 7c1e6e8b09
2013-05-28 15:43:31 -05:00
Nate Jensen
cba08666e6 Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: e846e539fb [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]
Former-commit-id: 053e37ee76
2013-05-28 15:43:23 -05:00
Max Schenkelberg
a88ca5e983 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 aa8c0a8573188f241575ac212a876eb3b630da9a]
Former-commit-id: 13ff44fdee
2013-05-28 15:00:59 -05:00
Nate Jensen
bd8431b986 Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: 3f85aeb00a [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]
Former-commit-id: ed7b0fc8c5
2013-05-28 14:30:26 -05:00
Roger Ferrel
365af6b7ce Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 9263b54845 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]
Former-commit-id: cbee731447
2013-05-28 13:21:08 -05:00
Max Schenkelberg
21693d6913 Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: 807e4501c8 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]
Former-commit-id: 1bc4437154
2013-05-28 12:59:27 -05:00
Nate Jensen
84444b6ba9 Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: 68eba61c28 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]
Former-commit-id: f77f350eb3
2013-05-28 09:21:57 -05:00
Dustin Johnson
f4ad0218f2 Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: 197a5cef1b [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]
Former-commit-id: 2b1f75f702
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
cdf8e7daaa Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: 7be9ad1f8b [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]
Former-commit-id: 3b6156843e
2013-05-24 16:40:21 -05:00
Mike Duff
80b1f95f0c Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: b6b01c3e81 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]
Former-commit-id: 192ce891d0
2013-05-24 09:20:55 -05:00
Nate Jensen
631567ced9 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 7d233ff590 [formerly ef313253ec669167b9e1deb2562170c117123937]
Former-commit-id: 7d1fc954f6
2013-05-24 09:13:10 -05:00
Bryan Kowal
b3d40951ba 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 3ef8fa1ce4634801435cc94b2372b736576aefd4]
Former-commit-id: 8145305580
2013-05-23 23:52:35 -05:00
Lee Venable
4ecb65e4a2 Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: c3328077c8 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]
Former-commit-id: ae020d3960
2013-05-23 17:16:31 -05:00
Roger Ferrel
75a2fc4723 Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

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

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

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

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

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

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

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

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

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

Former-commit-id: 598a7a221e [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]
Former-commit-id: 4bc98160ab
2013-05-21 16:29:01 -05:00
Richard Peter
62c8176486 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]
Former-commit-id: c9c1570960
2013-05-21 13:07:51 -05:00
Greg Armendariz
fce1512b37 Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
Former-commit-id: eecbf2718a [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]
Former-commit-id: 20a9ad95e5
2013-05-21 12:24:19 -05:00
Richard Peter
3d84e1dd53 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 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]
Former-commit-id: 8aa4b0025c
2013-05-21 12:11:21 -05:00
Bryan Kowal
e9abe7185b Issue #1952 - remove duplicate filesystem hierarchy
Former-commit-id: 7027f97e2a [formerly 51d97b526a708d896c2935baeab27a0ae627960a]
Former-commit-id: 4b8868ca54
2013-05-21 11:09:57 -05:00
Nate Jensen
8438eb1b4a Merge "Issue #2001 fix message handling" into development
Former-commit-id: 4d519da3a9 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]
Former-commit-id: 737b265c34
2013-05-21 11:00:32 -05:00