Commit graph

3224 commits

Author SHA1 Message Date
Dustin Johnson
d1552d578f Issue #2038 Change datadelivery retrieval to be plugin contributable
Amend: Fix class name resolution, no arguments to metadata adapter constructors

Change-Id: I2c08563499a34996502d22f0f9685602b8897139

Former-commit-id: 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]
Former-commit-id: 55aeff3422
Former-commit-id: fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d]
Former-commit-id: 7ec3c6c09a
2013-05-31 12:19:07 -05:00
Ron Anderson
fcd98f4e14 Merge "Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
Former-commit-id: 7f15e7e7ab [formerly 1b9e0c2047] [formerly 7e1d2d273f] [formerly c3f8ab24ea [formerly 7e1d2d273f [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]]
Former-commit-id: c3f8ab24ea
Former-commit-id: 2bade025b66ce81cd9f5c1d5ede35f3f5a87b5ec [formerly b6d6349f09]
Former-commit-id: 35f018c206
2013-05-31 12:09:49 -05:00
Bryan Kowal
2f4e04a818 Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7
- Amend: update 32-bit rpm build script

Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6

Former-commit-id: a2752092eb [formerly ba097c8a48] [formerly a78c84dcd7] [formerly 203d886739 [formerly a78c84dcd7 [formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]
Former-commit-id: 203d886739
Former-commit-id: 41783f7e227512d37dd7ab56c04b1bec2805ea4f [formerly f63c05e5cf]
Former-commit-id: e6da4debed
2013-05-31 11:47:09 -05:00
Greg Armendariz
4ce40beb30 Merge "Issue #2053: Add dx2f to capture" into omaha_13.4.1
Former-commit-id: 7f82e30d73 [formerly 34e1b80460] [formerly 63fcb26312] [formerly 5052a7f3f5 [formerly 63fcb26312 [formerly ca827b6fac3130f4ca0403bba860182215f8a6f2]]]
Former-commit-id: 5052a7f3f5
Former-commit-id: 636c49fa489c2be25ef8ad888b2c29b3cc90c2a5 [formerly 9e57f1869e]
Former-commit-id: ae082f94c9
2013-05-31 11:44:12 -05:00
Richard Peter
8c4e1b2d66 Merge "Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp. Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626" into omaha_13.4.1
Former-commit-id: 8dbc5fbf26 [formerly 3ae3f6a0cb] [formerly 5da3e64528] [formerly 1fc1c77189 [formerly 5da3e64528 [formerly d971f21d651d351fa05ee96a50f5183c2a95df87]]]
Former-commit-id: 1fc1c77189
Former-commit-id: f909df7b8b04aa96c56d5d07add6fbee29d82f1b [formerly 2dc6232ba0]
Former-commit-id: f77ef2196d
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
b748dd3393 Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626

Former-commit-id: a5611b16d9 [formerly 36cd455621] [formerly da73b0fd4e] [formerly 7ae82832d1 [formerly da73b0fd4e [formerly fba34b77a870a2fc1d6b4301dc3a4d61ce424f67]]]
Former-commit-id: 7ae82832d1
Former-commit-id: 3baf5472d719747b03982686857a8604a64ebb27 [formerly d720c0fa3f]
Former-commit-id: 66cc26f78b
2013-05-31 11:39:50 -05:00
David Gillingham
e4626b7534 Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path.
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b

Former-commit-id: 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly cab1c849bf [formerly 3ccf091c44 [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]
Former-commit-id: cab1c849bf
Former-commit-id: c70bfb52dbc0daf601b003261f6af93be9c8e983 [formerly df9c5492c8]
Former-commit-id: 912212b953
2013-05-31 10:42:51 -05:00
Richard Peter
e23a5ddc08 Issue #2053: Add dx2f to capture
Former-commit-id: 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly d4cf7a1312 [formerly d8d7c01705 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]]
Former-commit-id: d4cf7a1312
Former-commit-id: 7976f75a4ecd8105bf1fea42677f574d7cd1b78e [formerly 337efabc5a]
Former-commit-id: 4f7125d343
2013-05-31 10:37:48 -05:00
Richard Peter
ef5e42fd6d Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
Former-commit-id: dffd58a7ce [formerly a9e1fa602e] [formerly 8e06328905] [formerly 6ec966e39e [formerly 8e06328905 [formerly 9b0bed97ebab78c585efe2ffec3e25d896817e6e]]]
Former-commit-id: 6ec966e39e
Former-commit-id: fd1fb4b26da9a8acbc61d829b897fd491990760d [formerly dd5b0c4caf]
Former-commit-id: 08fea26653
2013-05-31 10:36:27 -05:00
Dustin Johnson
8df55423f5 Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly 05bd3e113d [formerly fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]
Former-commit-id: 05bd3e113d
Former-commit-id: e9924f52a848d24038a0a3fb3705c0ff67f9a02e [formerly 42d1d74b04]
Former-commit-id: 3f4b010b84
2013-05-31 09:29:44 -05:00
Bryan Kowal
1c75b665b4 Issue #2011 - re-adding native libraries that were previously removed.
- Even though the awips2-python and the awips2-java already provide the libraries, these
  libraries are shared by both EDEX and CAVE. But, hydro is 32-bit and CAVE is 64-bit;
  so, hydro on the CAVE workstations is not able to use the 64-bit versions of the libraries
  provided by the awips2-python and awips2-java installed on the CAVE workstation.


Former-commit-id: b8ef3ae959 [formerly 5ac8004618] [formerly f52c3498b1] [formerly 933c54a7d8 [formerly f52c3498b1 [formerly 1d8dfea6c421e98fa629d0bccb9cf9a71ca000a5]]]
Former-commit-id: 933c54a7d8
Former-commit-id: 1aff99903bc85362a86da76c37c1f20bde91c55e [formerly e61f417b47]
Former-commit-id: 43a498f1a0
2013-05-30 22:45:09 -05:00
Richard Peter
03eab26980 Issue #2056: Update FileLocker to handle release of ACQUIRING locks
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23

Former-commit-id: ba4d97a349 [formerly c15635bccc] [formerly e63f2de395] [formerly 163998df17 [formerly e63f2de395 [formerly 9097197872da18fded96e09d133132872d4dcc27]]]
Former-commit-id: 163998df17
Former-commit-id: 56aa526ca54199e714cc0a88b0154a267a00a414 [formerly a10651b3b9]
Former-commit-id: 49cdce7b03
2013-05-30 17:53:17 -05:00
Richard Peter
dcee8de5bf Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
Former-commit-id: a25207c4f5 [formerly 6a19a0074f] [formerly 6487cd6578] [formerly 0e4782aea5 [formerly 6487cd6578 [formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]]
Former-commit-id: 0e4782aea5
Former-commit-id: 94f8dd7cc2d9448c67b8b2be7d600c1f56ec5379 [formerly c81610b720]
Former-commit-id: 9675eb9b1e
2013-05-30 17:17:23 -05:00
Dustin Johnson
5d995a726f Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: f3835a5670 [formerly 54045d6b9b] [formerly c01ea33d5b] [formerly e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: f7a467f666496a4ca4ff1bd58f5061cc1b7eb62c [formerly 58b11e075c]
Former-commit-id: 353630fcca
2013-05-30 17:11:19 -05:00
Dave Hladky
e28331d3bb Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 7393abfc91 [formerly c292bf1b55] [formerly 1608d407d1] [formerly 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]
Former-commit-id: 83dae4fe01
Former-commit-id: 724bfb742a41ede685551f3df79514daaee58c8b [formerly 90e6d184e7]
Former-commit-id: 64596d3468
2013-05-30 17:04:16 -05:00
Roger Ferrel
9ef53f18b9 Issue #1966 Changes to make manger stateless and updates for Case Creation.
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387

Former-commit-id: cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly 3c875a6f44 [formerly c6cddc605d [formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]]
Former-commit-id: 3c875a6f44
Former-commit-id: bf07997d68cd2a97eb874705475caf9100eded09 [formerly eaca117b9c]
Former-commit-id: 36b8cbcd5d
2013-05-30 16:35:11 -05:00
Nate Jensen
30ec58305f Merge "Issue #2055 Remove modelName from sounding pointName. Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b" into omaha_13.4.1
Former-commit-id: c3e9110e32 [formerly 7a73bd79d6] [formerly 1ea89c8f0f] [formerly 35a2a44ccd [formerly 1ea89c8f0f [formerly b5657bb2156ade929296f5d748616afd246d8321]]]
Former-commit-id: 35a2a44ccd
Former-commit-id: 10bf06df2f137cce0d469dd182de21c0a623dd02 [formerly 21d261d8be]
Former-commit-id: 7e05836290
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
c634d7e694 Issue #2055 Remove modelName from sounding pointName.
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b

Former-commit-id: 65c7bd3c89 [formerly 965705049b] [formerly 2ee4b85d74] [formerly 51f6906c88 [formerly 2ee4b85d74 [formerly 15a4af789dcad3507cb6778ceea5f00df8425502]]]
Former-commit-id: 51f6906c88
Former-commit-id: 952278d9cbb4bd6c733e6c8bb6d2cf637e6cd114 [formerly f7353cc092]
Former-commit-id: e9b92d330d
2013-05-30 16:05:53 -05:00
Nate Jensen
09215e6dbb Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
Former-commit-id: 03833d148d [formerly 10dd7ea61f] [formerly 4aa3657d1a] [formerly e4578ca7ba [formerly 4aa3657d1a [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]]
Former-commit-id: e4578ca7ba
Former-commit-id: 86618d2ea904ba85327447d5180c4eef0264924d [formerly c0bca7ec27]
Former-commit-id: 698d793e9c
2013-05-30 14:50:39 -05:00
Roger Ferrel
7353c052ed Issue #2054 Minor changes to 2 grib patterns in the pqact template.
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf

Former-commit-id: 3bd85138cf [formerly 3c4b351c75] [formerly 85b9d9dea9] [formerly 2f2c553089 [formerly 85b9d9dea9 [formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]]
Former-commit-id: 2f2c553089
Former-commit-id: d3eddf23547cafc9eba0b328fea23856199aef10 [formerly 593055e6c2]
Former-commit-id: 13543ac79e
2013-05-30 14:34:54 -05:00
Steve Harris
e83fa33a36 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]
Former-commit-id: 26bf27c70d
Former-commit-id: 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]
Former-commit-id: 629e76e0ff
2013-05-30 14:33:24 -05:00
Ron Anderson
d3a25be20d Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
Former-commit-id: 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]
Former-commit-id: 7f41d701be
Former-commit-id: 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c]
Former-commit-id: 5858e8fc19
2013-05-30 13:08:26 -05:00
Everett Kladstrup
f78c5c3640 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: 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]
Former-commit-id: 4621271329
Former-commit-id: 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141]
Former-commit-id: 282ec3b45f
2013-05-30 13:02:49 -05:00
Dustin Johnson
bf277cb980 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]]
Former-commit-id: 9c9caf00d1
Former-commit-id: 14f966873ac8e545bcc3b5a381d244edc0c40df1 [formerly 0bdf7d614c]
Former-commit-id: 48c37c972a
2013-05-30 11:32:09 -05:00
Ron Anderson
f9eeac331e Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: ff6fe9e225 [formerly 165bc6c409] [formerly 6557515f64] [formerly 08e09382db [formerly 6557515f64 [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]
Former-commit-id: 08e09382db
Former-commit-id: 844223fb2342ed488da4564f04128cde03cba0ca [formerly c3363d43fa]
Former-commit-id: 3f9cb35feb
2013-05-30 11:01:07 -05:00
Dustin Johnson
ac8c2784ae Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]
Former-commit-id: 74d985af51
2013-05-30 09:49:09 -05:00
Brad Gonzales
c8811ff347 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: 778cf6542c [formerly 6243f1f789] [formerly aa76f81b3c] [formerly 321f153547 [formerly aa76f81b3c [formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]]
Former-commit-id: 321f153547
Former-commit-id: 34d580ade00224baada454c96f672dc4ee914ab2 [formerly bbc15413d4]
Former-commit-id: cb69ca7e93
2013-05-30 09:34:18 -05:00
Steve Harris
7af97e645a Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 80896a4e31 [formerly 07bc6c83e9] [formerly 9d4577079d] [formerly 0a276d4954 [formerly 9d4577079d [formerly f50ef3c44d1386dd4ec800fd65db7b0f2b4fe03f]]]
Former-commit-id: 0a276d4954
Former-commit-id: 3214e33affd1877bbc79da62569334af050c73c9 [formerly f4d1b7c86c]
Former-commit-id: f72ba834dc
2013-05-30 07:26:30 -05:00
Bryan Kowal
cad451315d Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14

Former-commit-id: 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]]
Former-commit-id: bd9251eba0
Former-commit-id: 12f6e2d4de44a38803b3d5a550206ae1507ca67f [formerly 4eb7d951e4]
Former-commit-id: 5ee9c9f6a1
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
c6150879d5 Issue #1869 ensure all uses ofdataURI in PDO use getter.
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]]
Former-commit-id: 191f93653d
Former-commit-id: e05811b6ef35d30d860c10a4de489276bfcbbd43 [formerly 50c5c5edfa]
Former-commit-id: 9c415e2f19
2013-05-29 17:50:50 -05:00
Richard Peter
29a1c468f3 Merge "Issue #1989 remove unused schemas" into development
Former-commit-id: a88b17b125 [formerly 47b95286ad] [formerly d563ae4eb8] [formerly 800c7dd9a6 [formerly d563ae4eb8 [formerly d024f084f303bf6020ef7208cad249ac83f4d748]]]
Former-commit-id: 800c7dd9a6
Former-commit-id: 39176b198c944580b580ade837ef1dd8fbe25836 [formerly c8c5be650c]
Former-commit-id: 4788532b86
2013-05-29 16:54:51 -05:00
Nate Jensen
70eca967a3 Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
Former-commit-id: 07009bf650 [formerly df5945a8e2] [formerly 4f3ea80cd9] [formerly 532d3ee899 [formerly 4f3ea80cd9 [formerly 534a1d6d9cb2366d875f5361c2a30fce54b7f786]]]
Former-commit-id: 532d3ee899
Former-commit-id: c5cdb4c1995968d035037728d9402432a84f1606 [formerly f95037a9bf]
Former-commit-id: 545fe43c1e
2013-05-29 16:20:17 -05:00
Nate Jensen
fde771fa01 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]
Former-commit-id: ab10e0072d
2013-05-29 16:19:28 -05:00
Dustin Johnson
dc87184caf Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
Former-commit-id: de43cbb63d [formerly 8ae3e74339] [formerly b0348bc056] [formerly 2554ff9602 [formerly b0348bc056 [formerly 5716e1dbbbbe67cdde980eab6b60a70e22283ee9]]]
Former-commit-id: 2554ff9602
Former-commit-id: f5be6d72f3c14e4ac4a2a46ab2fcccc186c6ab49 [formerly 05d5a08497]
Former-commit-id: 4741aca6b1
2013-05-29 16:02:55 -05:00
Dustin Johnson
efd95f253e Issue #2038 Fix deleting of multiple subscription types
Update test Spring configurations

Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e

Former-commit-id: 63ccc2c133 [formerly 21b8f03b1f] [formerly d2d50e7d8b] [formerly ecf3f2e300 [formerly d2d50e7d8b [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]]
Former-commit-id: ecf3f2e300
Former-commit-id: 1540347e93b929ac41c7a779cb0a5461b2ed43ed [formerly 151df64a6e]
Former-commit-id: d467832855
2013-05-29 15:54:06 -05:00
Steve Harris
70ecafa237 13.4.1-13 baseline
Former-commit-id: 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf]
Former-commit-id: 418f8aef56
2013-05-29 16:30:09 -04:00
Nate Jensen
c641738561 Issue #1989 fix for webpages
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7

Former-commit-id: fb9ca3cbc5 [formerly c0e93d192c] [formerly 1a34067182] [formerly 0d495f9759 [formerly 1a34067182 [formerly 7880f21755384540d3bca4ac15b04932455b8fd8]]]
Former-commit-id: 0d495f9759
Former-commit-id: 0657d80aa35f0603c65e07b37e2a945da508ec20 [formerly 8da746cde6]
Former-commit-id: 839e9fc76d
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
4555ef990c Issue #1869 fix plot updates, broken by earlier commit.
Former-commit-id: a3b2efc2b4 [formerly b32a5b1c00] [formerly d2e01ee1f2] [formerly cbc3b0a9a4 [formerly d2e01ee1f2 [formerly a9240b60e4643b43880d2be76580dc85999eb897]]]
Former-commit-id: cbc3b0a9a4
Former-commit-id: 060cda1b75778126734603e80699b9f5cae37ac8 [formerly d90ca1696e]
Former-commit-id: 6b7958c834
2013-05-29 15:00:04 -05:00
Nate Jensen
3a41ae85b4 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
2013-05-29 14:49:43 -05:00
Nate Jensen
043cc9f661 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3]
Former-commit-id: 47d2bf99b9
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
a05a910ef9 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly e7f17cb73caba0c3830169a9b341f90b58134c89 [formerly 4747f7d319]] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]
Former-commit-id: d5263b2b75
Former-commit-id: c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794]
Former-commit-id: c6af8b4d7c
2013-05-29 10:34:22 -05:00
Dustin Johnson
6567c1b6ef Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]
Former-commit-id: b6c87f42b1
2013-05-29 09:27:30 -05:00
Richard Peter
6d11397746 Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
Former-commit-id: 16c3723df8 [formerly 6dd22b6dfa] [formerly bc0f1c88fc] [formerly 19272c9f28 [formerly bc0f1c88fc [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]]
Former-commit-id: 19272c9f28
Former-commit-id: f547c20d9919ea9e58a5d840b157b5c4ea811426 [formerly 4be6514b57]
Former-commit-id: d26eac7bdf
2013-05-29 09:26:10 -05:00
Nate Jensen
768a7dad60 Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]
Former-commit-id: 452858b86f
2013-05-29 09:20:53 -05:00
Mike Duff
d292cfcca0 Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87]
Former-commit-id: d9fd9d297b
2013-05-29 09:15:46 -05:00
Dustin Johnson
fb15a3e115 Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]
Former-commit-id: fff0172786
2013-05-29 09:02:47 -05:00
Nate Jensen
8c756705c5 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 729de173162ed2d04e927cd7b463d674c8aac59e [formerly 2fe1960ebb]
Former-commit-id: ac838f62dd
2013-05-28 15:43:31 -05:00
Nate Jensen
74bce32a88 Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]
Former-commit-id: e846e539fb
Former-commit-id: 00638cbac9800172a1c3e7bb571d3fdb66dc2446 [formerly 5c60582df2]
Former-commit-id: 607e980d45
2013-05-28 15:43:23 -05:00
Max Schenkelberg
b2a9cba9c7 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: 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 3175563336 [formerly 13ff44fdee [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e [formerly 9932114218]
Former-commit-id: 4e8d25b317
2013-05-28 15:00:59 -05:00
Nate Jensen
e94a5b5494 Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47]
Former-commit-id: f7817d7c41
2013-05-28 14:30:26 -05:00