Commit graph

3198 commits

Author SHA1 Message Date
Ben Steffensmeier
e4c8bd3233 Issue #2043 switch capeFunc to java.
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659

Former-commit-id: 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 2f636b5309 [formerly f283171cb4] [formerly 098d209d5c] [formerly 492b435626 [formerly 098d209d5c [formerly 5eaac7266a0f8d3b083703076a255c41d8bd1039]]]]
Former-commit-id: 492b435626
Former-commit-id: 01e46140cb [formerly 3fd810e0bf] [formerly 7651785a1e4de8202e12adb600233a932a8ec2e8 [formerly 6f9ea3f195]]
Former-commit-id: 932ba59540ac0b812791a35672cd6bc9d4485ccf [formerly 1354e0ceb0]
Former-commit-id: 6c6c593e91
2013-06-04 10:16:53 -05:00
Bryan Kowal
6f896001fe Issue #2021 - add a .project file so files.native can be imported as an Eclipse project. Remove duplicate hydro
filesystem in rary.ohd.filesystem - it used to be merged into the tar file.

Change-Id: Id3bdfd69d7bb51581dca8e8c0c64c833ec32f5cc

Former-commit-id: 2f5cbb6757 [formerly 5244c9563f] [formerly abd8ae931c] [formerly 2f5cbb6757 [formerly 5244c9563f] [formerly abd8ae931c] [formerly dc5a800b83 [formerly abd8ae931c [formerly 5080f2839a6f94c6152aeff231241935b570a3c3]]]]
Former-commit-id: dc5a800b83
Former-commit-id: 4df4ccae59 [formerly 96ae06c3a1] [formerly e4c7d77222a7a9b3cef69f5a27ecfe2376ffc717 [formerly 5e4a1576f0]]
Former-commit-id: 6b6eb70247efb5c60e9cd665cd5ce46b0f3f2dfb [formerly b09cce06f7]
Former-commit-id: a8f54dd2ba
2013-06-04 10:05:23 -05:00
Bryan Kowal
83a1fd41d0 Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56

Former-commit-id: eb656f731c [formerly 7a1c08bb13] [formerly 46c9ba7c7b] [formerly eb656f731c [formerly 7a1c08bb13] [formerly 46c9ba7c7b] [formerly 67cd73c655 [formerly 46c9ba7c7b [formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]]]
Former-commit-id: 67cd73c655
Former-commit-id: e49087b23f [formerly 86b88922da] [formerly 9df212446234478c6e77b29334b635f74a7591eb [formerly f8e2a2f4f2]]
Former-commit-id: a0a2edff60b79b0391b1c4924012a7097c13aeee [formerly 36aa500077]
Former-commit-id: 95a5349f85
2013-06-04 09:36:09 -05:00
Bryan Kowal
7fffda1117 Issue #2021 - native hydro code will now compile successfully
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07

Former-commit-id: b222d55e5a [formerly 9ea421356a] [formerly cea990cbe3] [formerly b222d55e5a [formerly 9ea421356a] [formerly cea990cbe3] [formerly 032e26c7ba [formerly cea990cbe3 [formerly 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f]]]]
Former-commit-id: 032e26c7ba
Former-commit-id: 8633568ad4 [formerly f900d7c589] [formerly daf5a8ad8ba627b913cc4ebdc58cd4162ec55b62 [formerly 91a494bde0]]
Former-commit-id: 401d255106cf9fe14b27dd3de96b29916e909192 [formerly 10e5f4e413]
Former-commit-id: 7e30f452b0
2013-06-04 09:22:00 -05:00
Nate Jensen
5ce3f5ea79 Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
Former-commit-id: 1553b4d4d7 [formerly 2de1cec481] [formerly 3151ba277c] [formerly 1553b4d4d7 [formerly 2de1cec481] [formerly 3151ba277c] [formerly a7367c1e1a [formerly 3151ba277c [formerly b442e15efa533e64a2707878e15c52531cd79d5b]]]]
Former-commit-id: a7367c1e1a
Former-commit-id: c8e8c734ee [formerly c9056f278b] [formerly f8e32753a528ec9253f2ccf3b5eb7a14b0d1ec54 [formerly 877e78717b]]
Former-commit-id: aa6c00caa6197e2e5a96f86ac01768fd5ac5686c [formerly 199d9cd20c]
Former-commit-id: 725882e8fd
2013-06-04 09:13:56 -05:00
Max Schenkelberg
ae1104d980 Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75

Former-commit-id: 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 0df84a1b9a [formerly b28f451d17] [formerly 3379b100cb] [formerly 7f76bd3d98 [formerly 3379b100cb [formerly 483247738be16ae76bc2f9891f557960e7ade60e]]]]
Former-commit-id: 7f76bd3d98
Former-commit-id: 084f8cbc05 [formerly e4d27d5d99] [formerly 7f3bd173b51d3949c4a9f8672975f6254b9635b7 [formerly 86d8f1b294]]
Former-commit-id: 9265dbfea39fcf5bc4f77cd090d2dbb8d5f3f939 [formerly a6d84e24b7]
Former-commit-id: 3f67097105
2013-06-03 17:19:18 -05:00
Dustin Johnson
7fdf91ca93 Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63

Former-commit-id: 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]]
Former-commit-id: bc830e67f0
Former-commit-id: efce5e19d5 [formerly cd1db53a35] [formerly ec9fba7ab73ee52c73b56514e1ac66a6a8b5586e [formerly 0b710bc166]]
Former-commit-id: fdc4ef6ee7911f95a849feb6d4d64feef2c9adcb [formerly bdccf71c8b]
Former-commit-id: 13e51bc99c
2013-06-03 14:54:53 -05:00
Nate Jensen
4740fffe4b Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
Former-commit-id: 682ac3f2be [formerly f55fa69ea2] [formerly 5d3b2b98bb] [formerly 682ac3f2be [formerly f55fa69ea2] [formerly 5d3b2b98bb] [formerly b9696149ad [formerly 5d3b2b98bb [formerly c97ca6775122d26f308558eb4e449fb56949b6ba]]]]
Former-commit-id: b9696149ad
Former-commit-id: 327f549f33 [formerly 718ea75857] [formerly 96bbef960bbaa3a9dcb3d3d02763c426f2216ddb [formerly f20b8b3b66]]
Former-commit-id: 1568b3634384e16481f2c927f76b8bb3b0f249c4 [formerly d595d9e84b]
Former-commit-id: dd8729effc
2013-06-03 13:32:21 -05:00
Bryan Kowal
466c50ebc4 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
Former-commit-id: 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 3d885c7a60 [formerly c407dd8623 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]]
Former-commit-id: 3d885c7a60
Former-commit-id: be8aab95e9 [formerly 5a4726bdc2] [formerly 282496ad9a90b4fff81f18018574383b257c142f [formerly 5f637cc57b]]
Former-commit-id: c13d5340a722273a6de1ef2e18e1ecdb0cadba46 [formerly 2050dec254]
Former-commit-id: 7edecdb7dd
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
f9f44c0d18 Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

Former-commit-id: 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]]]
Former-commit-id: a226f225fd
Former-commit-id: 396102ea5d [formerly 97a9a6279b] [formerly 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0]]
Former-commit-id: 6437394e0207ea10e1ae9b421cc9526b14344c70 [formerly 67d1818a64]
Former-commit-id: f482c88c7b
2013-06-03 10:26:36 -05:00
Matt Nash
854a63f7d0 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7895dfa2e4 [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]]
Former-commit-id: cb59b82add
Former-commit-id: efdb42ab54 [formerly c61b9d95e5] [formerly e32c05019af2175b9cb52b0d115b6de5640bce6f [formerly 5d492a4b10]]
Former-commit-id: 054ceaf89a593647c65a3915436f2882db3ed630 [formerly 0d06f59694]
Former-commit-id: 2b85258c26
2013-06-03 09:58:43 -05:00
Ron Anderson
a3e33d4211 Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: 9464771e25 [formerly e6d7b83df5] [formerly 4227600ec53435b3c39496f85e74622ae01b7d76 [formerly f65ce6e3e6]]
Former-commit-id: d45303b850db86b2c970e98ae8be0dd15f308265 [formerly d01a608015]
Former-commit-id: b0f7ac7f1a
2013-06-03 07:45:02 -05:00
Dustin Johnson
20f8e4603b Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
Former-commit-id: 5d4ecc6328 [formerly 72bb21698c] [formerly 3700d27fbf] [formerly 5d4ecc6328 [formerly 72bb21698c] [formerly 3700d27fbf] [formerly 2e420c0963 [formerly 3700d27fbf [formerly 18a9b41a8be832ab1e8da28c32f3b8457704915b]]]]
Former-commit-id: 2e420c0963
Former-commit-id: fe1a709d42 [formerly 5b23635521] [formerly 61046a1c3fa845ece0e8ae8c8320d66cfbcb9b43 [formerly da0335a5e5]]
Former-commit-id: 1608e3e5e84a9f38223153565393b1196e0bbfc7 [formerly b004863550]
Former-commit-id: c8ea8fa5d7
2013-05-31 15:29:04 -05:00
Dave Hladky
01c0565b57 Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b

Former-commit-id: 87e81a8b1b [formerly 39f357570b] [formerly 2f67b74318] [formerly 87e81a8b1b [formerly 39f357570b] [formerly 2f67b74318] [formerly fa8ea8ecca [formerly 2f67b74318 [formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]]]
Former-commit-id: fa8ea8ecca
Former-commit-id: beeaaab97b [formerly 0317090ffd] [formerly d931c9ba679b7ae50fda63241a3da00faf83a9e9 [formerly 9d2ec44182]]
Former-commit-id: 68379ae55b79c37e4c2fca229ff79a44ed58c694 [formerly 1e55f4ade2]
Former-commit-id: d2c1950237
2013-05-31 15:27:45 -05:00
Richard Peter
dce8fe5e96 Merge "Issue #1869 speed up upgrade script for dropping dataURI." into development
Former-commit-id: e3d35f3d06 [formerly 47cdad3880] [formerly c11f08b9ec] [formerly e3d35f3d06 [formerly 47cdad3880] [formerly c11f08b9ec] [formerly 7f129cbe65 [formerly c11f08b9ec [formerly 90b17526aa5b34d159315d9ea98e3022e015e025]]]]
Former-commit-id: 7f129cbe65
Former-commit-id: 0ab13763ab [formerly cce0de878a] [formerly e363a8d201347a607caddbb7d10a04ae39d7608e [formerly 07cf18028d]]
Former-commit-id: f64dd3c855b5afb6e977058f6c794e0de255e3ab [formerly 71ad677568]
Former-commit-id: a75d0506ad
2013-05-31 14:57:16 -05:00
Richard Peter
3cedef94c2 Issue #2058: Update obsPurgeRules.xml and sfcobsPurgeRules.xml
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c

Former-commit-id: 168e447d81 [formerly 7693aef3db] [formerly 948d1aabfe] [formerly 168e447d81 [formerly 7693aef3db] [formerly 948d1aabfe] [formerly 5a8fe397b2 [formerly 948d1aabfe [formerly ea807c13a7cf0ff8a561feb46c99e649eb5254a0]]]]
Former-commit-id: 5a8fe397b2
Former-commit-id: a9290fdd7e [formerly ba36d7c9af] [formerly cdaf4f74592990a0a1b5829de6954b5ceedcb8de [formerly 8d856602e3]]
Former-commit-id: 821443e944d341e6f2a66d9764204dffd3d0120e [formerly 1846685f3f]
Former-commit-id: 4ec5ca19ea
2013-05-31 14:43:43 -05:00
Ben Steffensmeier
5780885509 Issue #1869 speed up upgrade script for dropping dataURI.
Former-commit-id: 3ae99d49a6 [formerly d7a8dc0baf] [formerly 0d34bff004] [formerly 3ae99d49a6 [formerly d7a8dc0baf] [formerly 0d34bff004] [formerly 78f56b32b0 [formerly 0d34bff004 [formerly 075e1cda11aeeef027a106c50d535fd7cb8adf2e]]]]
Former-commit-id: 78f56b32b0
Former-commit-id: 5a4c7791f5 [formerly 640d8e9b6d] [formerly 9cb22087494e004d8402f46057af176301464acb [formerly 2da0c851f0]]
Former-commit-id: c74ed244747940ddced92cd4a2cec2e1eff578e8 [formerly 8908dc03fd]
Former-commit-id: cdf3fbfbc0
2013-05-31 14:43:38 -05:00
Dustin Johnson
061a7d9db4 Issue #2038 Set attribute xml on mock opendap adapter
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083

Former-commit-id: f95e1f4618 [formerly 21b9724304] [formerly 88c8ad3a81] [formerly f95e1f4618 [formerly 21b9724304] [formerly 88c8ad3a81] [formerly 76bdfc3a68 [formerly 88c8ad3a81 [formerly 5bdb3c359d80edfcc0029fb7264809c49f682579]]]]
Former-commit-id: 76bdfc3a68
Former-commit-id: 8888f9e1fb [formerly 4d7c894976] [formerly ad2cd861c2dcd656926d45517cf596108f6a17a9 [formerly 4d71652568]]
Former-commit-id: 994417457be548dbe9f1ec0b9c979f1ef423931e [formerly 9cda6d2f35]
Former-commit-id: 81e74ccbc9
2013-05-31 13:54:41 -05:00
Greg Armendariz
74b2d0e631 Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
Former-commit-id: d1eff126b0 [formerly e333debc2a] [formerly d80ee4dede] [formerly d1eff126b0 [formerly e333debc2a] [formerly d80ee4dede] [formerly f040c69704 [formerly d80ee4dede [formerly e20d4f7898f931deb45db5437625addbb37055c8]]]]
Former-commit-id: f040c69704
Former-commit-id: da8783da2b [formerly cf6938e321] [formerly fb813b88966ebc127a3186f83a308a0a4a446f06 [formerly 0a17b4873f]]
Former-commit-id: 5219c3958575675a9bf654b817ae10ebbb3a23e2 [formerly 561c91a33c]
Former-commit-id: 17d59426bf
2013-05-31 13:29:31 -05:00
Greg Armendariz
bc1043cc1f Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
Former-commit-id: 6fe0ff53c5 [formerly 088407c1c2] [formerly 1eeafcaaf8] [formerly 6fe0ff53c5 [formerly 088407c1c2] [formerly 1eeafcaaf8] [formerly 5e799ba8bc [formerly 1eeafcaaf8 [formerly 47c28707fef620afd9b38d934c6310f7380c44e8]]]]
Former-commit-id: 5e799ba8bc
Former-commit-id: 6b2a53f67d [formerly 1304f0519d] [formerly 546876c1291af7b55af8c27f2fb5478f36eb652c [formerly ceba329f0d]]
Former-commit-id: b4d1d0941197651802fa3a102a895a95cd1afa4b [formerly 2d1ad8d93e]
Former-commit-id: fb5f51c3f2
2013-05-31 13:27:59 -05:00
Richard Peter
83657ef75b Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly fdcf086681 [formerly c2e1b72f9b [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]]]
Former-commit-id: fdcf086681
Former-commit-id: 6d496ca4e8 [formerly 2d3b8706c1] [formerly c97eefc613a06632b1a8aa03a7e670f42dd28610 [formerly 14ef93bf5a]]
Former-commit-id: 82e463238c956ed9be350f85a9486ead68a63d68 [formerly 522dfa3733]
Former-commit-id: 1ac79385f7
2013-05-31 13:01:52 -05:00
Dustin Johnson
347845bc52 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 87605571b2 [formerly 2687ebafd6 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]]
Former-commit-id: 87605571b2
Former-commit-id: 26517c1a95 [formerly 0d77acbff2] [formerly 1373c0b90f4a7aaa2a16437bb66461f4bae2c498 [formerly 1214f5e3ea]]
Former-commit-id: ada7c8e7993ab7276cb65bc026f9c40651ed9c08 [formerly 46ec793d11]
Former-commit-id: 7d59d10204
2013-05-31 12:43:49 -05:00
Dustin Johnson
ecde125343 Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
Former-commit-id: 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 1d06883d7a [formerly 3d8de9e9f3 [formerly 493d8a02f516023a5c0c3620da75e5466c44ede2]]]]
Former-commit-id: 1d06883d7a
Former-commit-id: 5931027de7 [formerly d61d518bdc] [formerly 52ab987a84e9614c5e4516479c934f07c0f6a2b0 [formerly 72d95aac0d]]
Former-commit-id: 5c99ceaa394302743d45f5d6a685c955a489a6d0 [formerly 1027b218f2]
Former-commit-id: d2295a24fe
2013-05-31 12:32:23 -05:00
David Gillingham
8eafbcd92f Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly a11ef45913 [formerly 5b9094275d [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]]
Former-commit-id: a11ef45913
Former-commit-id: eb61d6b8e3 [formerly b77e978008] [formerly 1384cb8b21573990393d2c5eb79b38dc399186fa [formerly 593a5fcbed]]
Former-commit-id: fc9477544adacdd081d02a3a802e8329734ab052 [formerly db859cfe86]
Former-commit-id: c3cdfa4293
2013-05-31 12:25:19 -05:00
Dustin Johnson
8ae74786c1 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 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]]
Former-commit-id: 55aeff3422
Former-commit-id: d1552d578f [formerly 7ec3c6c09a] [formerly fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d]]
Former-commit-id: 8852d0761a2b6648b34348793d38aa751867d797 [formerly f9ba7dc5ab]
Former-commit-id: d62a0b863a
2013-05-31 12:19:07 -05:00
Ron Anderson
3ff2e5d9c6 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 7f15e7e7ab [formerly 1b9e0c2047] [formerly 7e1d2d273f] [formerly c3f8ab24ea [formerly 7e1d2d273f [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]]]
Former-commit-id: c3f8ab24ea
Former-commit-id: fcd98f4e14 [formerly 35f018c206] [formerly 2bade025b66ce81cd9f5c1d5ede35f3f5a87b5ec [formerly b6d6349f09]]
Former-commit-id: 308fbdd189e5a5ebdad0985bb965b5fa39f9b98b [formerly 5b94dbc699]
Former-commit-id: e9fbd70d11
2013-05-31 12:09:49 -05:00
Bryan Kowal
4ed6b1b4a8 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 a2752092eb [formerly ba097c8a48] [formerly a78c84dcd7] [formerly 203d886739 [formerly a78c84dcd7 [formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]]
Former-commit-id: 203d886739
Former-commit-id: 2f4e04a818 [formerly e6da4debed] [formerly 41783f7e227512d37dd7ab56c04b1bec2805ea4f [formerly f63c05e5cf]]
Former-commit-id: 01fd4a99ce6002c4b9895e20ce6d445193adaa51 [formerly c6f4a5455f]
Former-commit-id: 3c1968bb5d
2013-05-31 11:47:09 -05:00
Greg Armendariz
f75e134299 Merge "Issue #2053: Add dx2f to capture" into omaha_13.4.1
Former-commit-id: 7f82e30d73 [formerly 34e1b80460] [formerly 63fcb26312] [formerly 7f82e30d73 [formerly 34e1b80460] [formerly 63fcb26312] [formerly 5052a7f3f5 [formerly 63fcb26312 [formerly ca827b6fac3130f4ca0403bba860182215f8a6f2]]]]
Former-commit-id: 5052a7f3f5
Former-commit-id: 4ce40beb30 [formerly ae082f94c9] [formerly 636c49fa489c2be25ef8ad888b2c29b3cc90c2a5 [formerly 9e57f1869e]]
Former-commit-id: 926e913f3f334bd03687a67abdbc4280f338a182 [formerly d67ec97699]
Former-commit-id: 2d5ce9a11e
2013-05-31 11:44:12 -05:00
Richard Peter
9b57e1fe35 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 8dbc5fbf26 [formerly 3ae3f6a0cb] [formerly 5da3e64528] [formerly 1fc1c77189 [formerly 5da3e64528 [formerly d971f21d651d351fa05ee96a50f5183c2a95df87]]]]
Former-commit-id: 1fc1c77189
Former-commit-id: 8c4e1b2d66 [formerly f77ef2196d] [formerly f909df7b8b04aa96c56d5d07add6fbee29d82f1b [formerly 2dc6232ba0]]
Former-commit-id: 061051cbadf876a6e98749de6b57ccfaafa996c9 [formerly 7b6b40e31d]
Former-commit-id: 095c5459ad
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
8f22a93919 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 a5611b16d9 [formerly 36cd455621] [formerly da73b0fd4e] [formerly 7ae82832d1 [formerly da73b0fd4e [formerly fba34b77a870a2fc1d6b4301dc3a4d61ce424f67]]]]
Former-commit-id: 7ae82832d1
Former-commit-id: b748dd3393 [formerly 66cc26f78b] [formerly 3baf5472d719747b03982686857a8604a64ebb27 [formerly d720c0fa3f]]
Former-commit-id: c23cfb4a400a52446540a1e9b754d210a9edab16 [formerly 7cb83e5c64]
Former-commit-id: 82bd402966
2013-05-31 11:39:50 -05:00
David Gillingham
9f86529f94 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 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly cab1c849bf [formerly 3ccf091c44 [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]]
Former-commit-id: cab1c849bf
Former-commit-id: e4626b7534 [formerly 912212b953] [formerly c70bfb52dbc0daf601b003261f6af93be9c8e983 [formerly df9c5492c8]]
Former-commit-id: 3ec56baf9412693f3e3e2e387ae597846f5dfbbb [formerly 06bfd0413c]
Former-commit-id: ca548953d2
2013-05-31 10:42:51 -05:00
Richard Peter
a291f47841 Issue #2053: Add dx2f to capture
Former-commit-id: 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly d4cf7a1312 [formerly d8d7c01705 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]]]
Former-commit-id: d4cf7a1312
Former-commit-id: e23a5ddc08 [formerly 4f7125d343] [formerly 7976f75a4ecd8105bf1fea42677f574d7cd1b78e [formerly 337efabc5a]]
Former-commit-id: e92cf1d0019c1b279749e27a8b2c153e951083cc [formerly 43b0fa7d11]
Former-commit-id: 896593c691
2013-05-31 10:37:48 -05:00
Richard Peter
b13c28ea9e Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
Former-commit-id: dffd58a7ce [formerly a9e1fa602e] [formerly 8e06328905] [formerly dffd58a7ce [formerly a9e1fa602e] [formerly 8e06328905] [formerly 6ec966e39e [formerly 8e06328905 [formerly 9b0bed97ebab78c585efe2ffec3e25d896817e6e]]]]
Former-commit-id: 6ec966e39e
Former-commit-id: ef5e42fd6d [formerly 08fea26653] [formerly fd1fb4b26da9a8acbc61d829b897fd491990760d [formerly dd5b0c4caf]]
Former-commit-id: a08984f9423a8bbfa37dfb5b9cd3dee08ebf2c78 [formerly 7cfa594b44]
Former-commit-id: 48f501d72a
2013-05-31 10:36:27 -05:00
Dustin Johnson
27f47006a3 Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly 05bd3e113d [formerly fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]]
Former-commit-id: 05bd3e113d
Former-commit-id: 8df55423f5 [formerly 3f4b010b84] [formerly e9924f52a848d24038a0a3fb3705c0ff67f9a02e [formerly 42d1d74b04]]
Former-commit-id: d226711a5e279ef4eee9fd981a46da15d8fdd405 [formerly 62131327ed]
Former-commit-id: b122700fed
2013-05-31 09:29:44 -05:00
Bryan Kowal
637d9ea675 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 b8ef3ae959 [formerly 5ac8004618] [formerly f52c3498b1] [formerly 933c54a7d8 [formerly f52c3498b1 [formerly 1d8dfea6c421e98fa629d0bccb9cf9a71ca000a5]]]]
Former-commit-id: 933c54a7d8
Former-commit-id: 1c75b665b4 [formerly 43a498f1a0] [formerly 1aff99903bc85362a86da76c37c1f20bde91c55e [formerly e61f417b47]]
Former-commit-id: 995249cdebd71509b93246c2e29cba41f1b1ed95 [formerly 6b5a398515]
Former-commit-id: 0d7bba37ff
2013-05-30 22:45:09 -05:00
Richard Peter
183aeefcd3 Issue #2056: Update FileLocker to handle release of ACQUIRING locks
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23

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

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

Former-commit-id: cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly 3c875a6f44 [formerly c6cddc605d [formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]]]
Former-commit-id: 3c875a6f44
Former-commit-id: 9ef53f18b9 [formerly 36b8cbcd5d] [formerly bf07997d68cd2a97eb874705475caf9100eded09 [formerly eaca117b9c]]
Former-commit-id: 050e3efc0fa52bd630915bd8ae54d58f55ec3c52 [formerly 3dc84dbe80]
Former-commit-id: f6c557904d
2013-05-30 16:35:11 -05:00
Nate Jensen
3d394ce417 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 c3e9110e32 [formerly 7a73bd79d6] [formerly 1ea89c8f0f] [formerly 35a2a44ccd [formerly 1ea89c8f0f [formerly b5657bb2156ade929296f5d748616afd246d8321]]]]
Former-commit-id: 35a2a44ccd
Former-commit-id: 30ec58305f [formerly 7e05836290] [formerly 10bf06df2f137cce0d469dd182de21c0a623dd02 [formerly 21d261d8be]]
Former-commit-id: 9232c1a492d950627c9a8ce197ef7579fcd0fc3a [formerly daf8bdc47a]
Former-commit-id: 0f1cab2357
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
4412092330 Issue #2055 Remove modelName from sounding pointName.
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b

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

Former-commit-id: 3bd85138cf [formerly 3c4b351c75] [formerly 85b9d9dea9] [formerly 3bd85138cf [formerly 3c4b351c75] [formerly 85b9d9dea9] [formerly 2f2c553089 [formerly 85b9d9dea9 [formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]]]
Former-commit-id: 2f2c553089
Former-commit-id: 7353c052ed [formerly 13543ac79e] [formerly d3eddf23547cafc9eba0b328fea23856199aef10 [formerly 593055e6c2]]
Former-commit-id: 88704fa3ce68cd5636cafb9ed871898d548e3451 [formerly f2b4dd8aa1]
Former-commit-id: 65c96bcaf4
2013-05-30 14:34:54 -05:00
Steve Harris
617bfcfc26 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 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]]
Former-commit-id: 26bf27c70d
Former-commit-id: e83fa33a36 [formerly 629e76e0ff] [formerly 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]]
Former-commit-id: 3f4447bcb9d22cc2cdec3a061500d9497c6a3d38 [formerly 9704fd6a82]
Former-commit-id: 4d8d9354e7
2013-05-30 14:33:24 -05:00
Ron Anderson
90b02d376c 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 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]]
Former-commit-id: 7f41d701be
Former-commit-id: d3a25be20d [formerly 5858e8fc19] [formerly 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c]]
Former-commit-id: 49ac9580799a6f8e8e6f9ed09976978c1289bb2c [formerly 9e3809d6cd]
Former-commit-id: 9579b62577
2013-05-30 13:08:26 -05:00
Everett Kladstrup
fb8b21d92d 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 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]]
Former-commit-id: 4621271329
Former-commit-id: f78c5c3640 [formerly 282ec3b45f] [formerly 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141]]
Former-commit-id: 489e03a0b245e5971ba19c2513ffe3674df9905d [formerly 83adbb8545]
Former-commit-id: 033b8bae36
2013-05-30 13:02:49 -05:00
Dustin Johnson
fe81c4ee08 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]]]
Former-commit-id: 9c9caf00d1
Former-commit-id: bf277cb980 [formerly 48c37c972a] [formerly 14f966873ac8e545bcc3b5a381d244edc0c40df1 [formerly 0bdf7d614c]]
Former-commit-id: fca2cc5ff4cf78409f8465237e7f299f93b4a6db [formerly a82e3aa078]
Former-commit-id: b59dbc5553
2013-05-30 11:32:09 -05:00
Ron Anderson
8ee12d17a7 Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

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

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: ac8c2784ae [formerly 74d985af51] [formerly 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]]
Former-commit-id: d6fa7618e1d515d026b04f58e34f197cb54bf5be [formerly 3dbb682493]
Former-commit-id: 03cbf9a455
2013-05-30 09:49:09 -05:00