Commit graph

3145 commits

Author SHA1 Message Date
Bryan Kowal
8633568ad4 Issue #2021 - native hydro code will now compile successfully
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07

Former-commit-id: b222d55e5a [formerly 9ea421356a] [formerly 9382fcca9ab9ccdefea7f10b68a8b52e7f591f31 [formerly cea990cbe3]] [formerly 032e26c7ba [formerly cea990cbe3 [formerly 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f]]]
Former-commit-id: 032e26c7ba
Former-commit-id: daf5a8ad8ba627b913cc4ebdc58cd4162ec55b62 [formerly 91a494bde0]
Former-commit-id: f900d7c589
2013-06-04 09:22:00 -05:00
Nate Jensen
c8e8c734ee 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 a7367c1e1a [formerly 3151ba277c [formerly b442e15efa533e64a2707878e15c52531cd79d5b]]]
Former-commit-id: a7367c1e1a
Former-commit-id: f8e32753a528ec9253f2ccf3b5eb7a14b0d1ec54 [formerly 877e78717b]
Former-commit-id: c9056f278b
2013-06-04 09:13:56 -05:00
Max Schenkelberg
084f8cbc05 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 7f76bd3d98 [formerly 3379b100cb [formerly 483247738be16ae76bc2f9891f557960e7ade60e]]]
Former-commit-id: 7f76bd3d98
Former-commit-id: 7f3bd173b51d3949c4a9f8672975f6254b9635b7 [formerly 86d8f1b294]
Former-commit-id: e4d27d5d99
2013-06-03 17:19:18 -05:00
Dustin Johnson
efce5e19d5 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 bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]
Former-commit-id: bc830e67f0
Former-commit-id: ec9fba7ab73ee52c73b56514e1ac66a6a8b5586e [formerly 0b710bc166]
Former-commit-id: cd1db53a35
2013-06-03 14:54:53 -05:00
Nate Jensen
327f549f33 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 b9696149ad [formerly 5d3b2b98bb [formerly c97ca6775122d26f308558eb4e449fb56949b6ba]]]
Former-commit-id: b9696149ad
Former-commit-id: 96bbef960bbaa3a9dcb3d3d02763c426f2216ddb [formerly f20b8b3b66]
Former-commit-id: 718ea75857
2013-06-03 13:32:21 -05:00
Bryan Kowal
be8aab95e9 Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
Former-commit-id: 6719473eae [formerly e673c5c553] [formerly c407dd8623] [formerly 3d885c7a60 [formerly c407dd8623 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]
Former-commit-id: 3d885c7a60
Former-commit-id: 282496ad9a90b4fff81f18018574383b257c142f [formerly 5f637cc57b]
Former-commit-id: 5a4726bdc2
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
396102ea5d Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

Former-commit-id: 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]]
Former-commit-id: a226f225fd
Former-commit-id: 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0]
Former-commit-id: 97a9a6279b
2013-06-03 10:26:36 -05:00
Matt Nash
efdb42ab54 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 cb59b82add [formerly 7895dfa2e4 [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]
Former-commit-id: cb59b82add
Former-commit-id: e32c05019af2175b9cb52b0d115b6de5640bce6f [formerly 5d492a4b10]
Former-commit-id: c61b9d95e5
2013-06-03 09:58:43 -05:00
Ron Anderson
9464771e25 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 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: 4227600ec53435b3c39496f85e74622ae01b7d76 [formerly f65ce6e3e6]
Former-commit-id: e6d7b83df5
2013-06-03 07:45:02 -05:00
Dustin Johnson
fe1a709d42 Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
Former-commit-id: 5d4ecc6328 [formerly 72bb21698c] [formerly 3700d27fbf] [formerly 2e420c0963 [formerly 3700d27fbf [formerly 18a9b41a8be832ab1e8da28c32f3b8457704915b]]]
Former-commit-id: 2e420c0963
Former-commit-id: 61046a1c3fa845ece0e8ae8c8320d66cfbcb9b43 [formerly da0335a5e5]
Former-commit-id: 5b23635521
2013-05-31 15:29:04 -05:00
Dave Hladky
beeaaab97b Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b

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

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

Former-commit-id: f95e1f4618 [formerly 21b9724304] [formerly 88c8ad3a81] [formerly 76bdfc3a68 [formerly 88c8ad3a81 [formerly 5bdb3c359d80edfcc0029fb7264809c49f682579]]]
Former-commit-id: 76bdfc3a68
Former-commit-id: ad2cd861c2dcd656926d45517cf596108f6a17a9 [formerly 4d71652568]
Former-commit-id: 4d7c894976
2013-05-31 13:54:41 -05:00
Greg Armendariz
da8783da2b 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 f040c69704 [formerly d80ee4dede [formerly e20d4f7898f931deb45db5437625addbb37055c8]]]
Former-commit-id: f040c69704
Former-commit-id: fb813b88966ebc127a3186f83a308a0a4a446f06 [formerly 0a17b4873f]
Former-commit-id: cf6938e321
2013-05-31 13:29:31 -05:00
Greg Armendariz
6b2a53f67d Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
Former-commit-id: 6fe0ff53c5 [formerly 088407c1c2] [formerly 1eeafcaaf8] [formerly 5e799ba8bc [formerly 1eeafcaaf8 [formerly 47c28707fef620afd9b38d934c6310f7380c44e8]]]
Former-commit-id: 5e799ba8bc
Former-commit-id: 546876c1291af7b55af8c27f2fb5478f36eb652c [formerly ceba329f0d]
Former-commit-id: 1304f0519d
2013-05-31 13:27:59 -05:00
Richard Peter
6d496ca4e8 Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly fdcf086681 [formerly c2e1b72f9b [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]]
Former-commit-id: fdcf086681
Former-commit-id: c97eefc613a06632b1a8aa03a7e670f42dd28610 [formerly 14ef93bf5a]
Former-commit-id: 2d3b8706c1
2013-05-31 13:01:52 -05:00
Dustin Johnson
26517c1a95 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 87605571b2 [formerly 2687ebafd6 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]
Former-commit-id: 87605571b2
Former-commit-id: 1373c0b90f4a7aaa2a16437bb66461f4bae2c498 [formerly 1214f5e3ea]
Former-commit-id: 0d77acbff2
2013-05-31 12:43:49 -05:00
Dustin Johnson
5931027de7 Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
Former-commit-id: 7e68af0531 [formerly 0bfcf4e9df] [formerly 3d8de9e9f3] [formerly 1d06883d7a [formerly 3d8de9e9f3 [formerly 493d8a02f516023a5c0c3620da75e5466c44ede2]]]
Former-commit-id: 1d06883d7a
Former-commit-id: 52ab987a84e9614c5e4516479c934f07c0f6a2b0 [formerly 72d95aac0d]
Former-commit-id: d61d518bdc
2013-05-31 12:32:23 -05:00
David Gillingham
eb61d6b8e3 Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly a11ef45913 [formerly 5b9094275d [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]
Former-commit-id: a11ef45913
Former-commit-id: 1384cb8b21573990393d2c5eb79b38dc399186fa [formerly 593a5fcbed]
Former-commit-id: b77e978008
2013-05-31 12:25:19 -05:00
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