Commit graph

2999 commits

Author SHA1 Message Date
Nate Jensen
b32e732341 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF

Former-commit-id: 537b731f6e [formerly 329d9d1c6a] [formerly 537b731f6e [formerly 329d9d1c6a] [formerly 5d1ecb3a5d [formerly 6742f7dbcac39261d8bee4e055bb9e4eda66520d]]]
Former-commit-id: 5d1ecb3a5d
Former-commit-id: 412c21f516 [formerly 2d1405b9c4]
Former-commit-id: 5c2f0ab151
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
6c6c593e91 Issue #2043 switch capeFunc to java.
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659

Former-commit-id: f283171cb4 [formerly 098d209d5c] [formerly f283171cb4 [formerly 098d209d5c] [formerly 492b435626 [formerly 5eaac7266a0f8d3b083703076a255c41d8bd1039]]]
Former-commit-id: 492b435626
Former-commit-id: 3fd810e0bf [formerly 6f9ea3f195]
Former-commit-id: 1354e0ceb0
2013-06-04 10:16:53 -05:00
Bryan Kowal
a8f54dd2ba 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: 5244c9563f [formerly abd8ae931c] [formerly 5244c9563f [formerly abd8ae931c] [formerly dc5a800b83 [formerly 5080f2839a6f94c6152aeff231241935b570a3c3]]]
Former-commit-id: dc5a800b83
Former-commit-id: 96ae06c3a1 [formerly 5e4a1576f0]
Former-commit-id: b09cce06f7
2013-06-04 10:05:23 -05:00
Bryan Kowal
95a5349f85 Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56

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

Former-commit-id: 9ea421356a [formerly cea990cbe3] [formerly 9ea421356a [formerly cea990cbe3] [formerly 032e26c7ba [formerly 152392137ad1a77c7bf0d8ec5a165ba5a20f0d9f]]]
Former-commit-id: 032e26c7ba
Former-commit-id: f900d7c589 [formerly 91a494bde0]
Former-commit-id: 10e5f4e413
2013-06-04 09:22:00 -05:00
Nate Jensen
725882e8fd Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
Former-commit-id: 2de1cec481 [formerly 3151ba277c] [formerly 2de1cec481 [formerly 3151ba277c] [formerly a7367c1e1a [formerly b442e15efa533e64a2707878e15c52531cd79d5b]]]
Former-commit-id: a7367c1e1a
Former-commit-id: c9056f278b [formerly 877e78717b]
Former-commit-id: 199d9cd20c
2013-06-04 09:13:56 -05:00
Max Schenkelberg
3f67097105 Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75

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

Former-commit-id: d81592b575 [formerly d47da65262] [formerly d81592b575 [formerly d47da65262] [formerly bc830e67f0 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]
Former-commit-id: bc830e67f0
Former-commit-id: cd1db53a35 [formerly 0b710bc166]
Former-commit-id: bdccf71c8b
2013-06-03 14:54:53 -05:00
Nate Jensen
dd8729effc Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
Former-commit-id: f55fa69ea2 [formerly 5d3b2b98bb] [formerly f55fa69ea2 [formerly 5d3b2b98bb] [formerly b9696149ad [formerly c97ca6775122d26f308558eb4e449fb56949b6ba]]]
Former-commit-id: b9696149ad
Former-commit-id: 718ea75857 [formerly f20b8b3b66]
Former-commit-id: d595d9e84b
2013-06-03 13:32:21 -05:00
Bryan Kowal
7edecdb7dd Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
Former-commit-id: e673c5c553 [formerly c407dd8623] [formerly e673c5c553 [formerly c407dd8623] [formerly 3d885c7a60 [formerly 360e0f61f8580cfca1e8dd307e920e9e0150016d]]]
Former-commit-id: 3d885c7a60
Former-commit-id: 5a4726bdc2 [formerly 5f637cc57b]
Former-commit-id: 2050dec254
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
f482c88c7b Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

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

Former-commit-id: 7d61737d79 [formerly 7895dfa2e4] [formerly 7d61737d79 [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]
Former-commit-id: cb59b82add
Former-commit-id: c61b9d95e5 [formerly 5d492a4b10]
Former-commit-id: 0d06f59694
2013-06-03 09:58:43 -05:00
Ron Anderson
b0f7ac7f1a Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: d0897c31d8 [formerly fb5d432669] [formerly d0897c31d8 [formerly fb5d432669] [formerly 0ae8346cfb [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: e6d7b83df5 [formerly f65ce6e3e6]
Former-commit-id: d01a608015
2013-06-03 07:45:02 -05:00
Dustin Johnson
c8ea8fa5d7 Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
Former-commit-id: 72bb21698c [formerly 3700d27fbf] [formerly 72bb21698c [formerly 3700d27fbf] [formerly 2e420c0963 [formerly 18a9b41a8be832ab1e8da28c32f3b8457704915b]]]
Former-commit-id: 2e420c0963
Former-commit-id: 5b23635521 [formerly da0335a5e5]
Former-commit-id: b004863550
2013-05-31 15:29:04 -05:00
Dave Hladky
d2c1950237 Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b

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

Former-commit-id: 7693aef3db [formerly 948d1aabfe] [formerly 7693aef3db [formerly 948d1aabfe] [formerly 5a8fe397b2 [formerly ea807c13a7cf0ff8a561feb46c99e649eb5254a0]]]
Former-commit-id: 5a8fe397b2
Former-commit-id: ba36d7c9af [formerly 8d856602e3]
Former-commit-id: 1846685f3f
2013-05-31 14:43:43 -05:00
Ben Steffensmeier
cdf3fbfbc0 Issue #1869 speed up upgrade script for dropping dataURI.
Former-commit-id: d7a8dc0baf [formerly 0d34bff004] [formerly d7a8dc0baf [formerly 0d34bff004] [formerly 78f56b32b0 [formerly 075e1cda11aeeef027a106c50d535fd7cb8adf2e]]]
Former-commit-id: 78f56b32b0
Former-commit-id: 640d8e9b6d [formerly 2da0c851f0]
Former-commit-id: 8908dc03fd
2013-05-31 14:43:38 -05:00
Dustin Johnson
81e74ccbc9 Issue #2038 Set attribute xml on mock opendap adapter
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083

Former-commit-id: 21b9724304 [formerly 88c8ad3a81] [formerly 21b9724304 [formerly 88c8ad3a81] [formerly 76bdfc3a68 [formerly 5bdb3c359d80edfcc0029fb7264809c49f682579]]]
Former-commit-id: 76bdfc3a68
Former-commit-id: 4d7c894976 [formerly 4d71652568]
Former-commit-id: 9cda6d2f35
2013-05-31 13:54:41 -05:00
Greg Armendariz
17d59426bf Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
Former-commit-id: e333debc2a [formerly d80ee4dede] [formerly e333debc2a [formerly d80ee4dede] [formerly f040c69704 [formerly e20d4f7898f931deb45db5437625addbb37055c8]]]
Former-commit-id: f040c69704
Former-commit-id: cf6938e321 [formerly 0a17b4873f]
Former-commit-id: 561c91a33c
2013-05-31 13:29:31 -05:00
Greg Armendariz
fb5f51c3f2 Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
Former-commit-id: 088407c1c2 [formerly 1eeafcaaf8] [formerly 088407c1c2 [formerly 1eeafcaaf8] [formerly 5e799ba8bc [formerly 47c28707fef620afd9b38d934c6310f7380c44e8]]]
Former-commit-id: 5e799ba8bc
Former-commit-id: 1304f0519d [formerly ceba329f0d]
Former-commit-id: 2d1ad8d93e
2013-05-31 13:27:59 -05:00
Richard Peter
1ac79385f7 Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: 91bfa4b37a [formerly c2e1b72f9b] [formerly 91bfa4b37a [formerly c2e1b72f9b] [formerly fdcf086681 [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]]
Former-commit-id: fdcf086681
Former-commit-id: 2d3b8706c1 [formerly 14ef93bf5a]
Former-commit-id: 522dfa3733
2013-05-31 13:01:52 -05:00
Dustin Johnson
7d59d10204 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: ba48f66886 [formerly 2687ebafd6] [formerly ba48f66886 [formerly 2687ebafd6] [formerly 87605571b2 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]
Former-commit-id: 87605571b2
Former-commit-id: 0d77acbff2 [formerly 1214f5e3ea]
Former-commit-id: 46ec793d11
2013-05-31 12:43:49 -05:00
Dustin Johnson
d2295a24fe Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
Former-commit-id: 0bfcf4e9df [formerly 3d8de9e9f3] [formerly 0bfcf4e9df [formerly 3d8de9e9f3] [formerly 1d06883d7a [formerly 493d8a02f516023a5c0c3620da75e5466c44ede2]]]
Former-commit-id: 1d06883d7a
Former-commit-id: d61d518bdc [formerly 72d95aac0d]
Former-commit-id: 1027b218f2
2013-05-31 12:32:23 -05:00
David Gillingham
c3cdfa4293 Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 3ec84b8f18 [formerly 5b9094275d] [formerly 3ec84b8f18 [formerly 5b9094275d] [formerly a11ef45913 [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]
Former-commit-id: a11ef45913
Former-commit-id: b77e978008 [formerly 593a5fcbed]
Former-commit-id: db859cfe86
2013-05-31 12:25:19 -05:00
Dustin Johnson
d62a0b863a 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: 6234417095 [formerly 4a8adeb80a] [formerly 6234417095 [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]
Former-commit-id: 55aeff3422
Former-commit-id: 7ec3c6c09a [formerly 075c53763d]
Former-commit-id: f9ba7dc5ab
2013-05-31 12:19:07 -05:00
Ron Anderson
e9fbd70d11 Merge "Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
Former-commit-id: 1b9e0c2047 [formerly 7e1d2d273f] [formerly 1b9e0c2047 [formerly 7e1d2d273f] [formerly c3f8ab24ea [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]]
Former-commit-id: c3f8ab24ea
Former-commit-id: 35f018c206 [formerly b6d6349f09]
Former-commit-id: 5b94dbc699
2013-05-31 12:09:49 -05:00
Bryan Kowal
3c1968bb5d 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: ba097c8a48 [formerly a78c84dcd7] [formerly ba097c8a48 [formerly a78c84dcd7] [formerly 203d886739 [formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]
Former-commit-id: 203d886739
Former-commit-id: e6da4debed [formerly f63c05e5cf]
Former-commit-id: c6f4a5455f
2013-05-31 11:47:09 -05:00
Greg Armendariz
2d5ce9a11e Merge "Issue #2053: Add dx2f to capture" into omaha_13.4.1
Former-commit-id: 34e1b80460 [formerly 63fcb26312] [formerly 34e1b80460 [formerly 63fcb26312] [formerly 5052a7f3f5 [formerly ca827b6fac3130f4ca0403bba860182215f8a6f2]]]
Former-commit-id: 5052a7f3f5
Former-commit-id: ae082f94c9 [formerly 9e57f1869e]
Former-commit-id: d67ec97699
2013-05-31 11:44:12 -05:00
Richard Peter
095c5459ad 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: 3ae3f6a0cb [formerly 5da3e64528] [formerly 3ae3f6a0cb [formerly 5da3e64528] [formerly 1fc1c77189 [formerly d971f21d651d351fa05ee96a50f5183c2a95df87]]]
Former-commit-id: 1fc1c77189
Former-commit-id: f77ef2196d [formerly 2dc6232ba0]
Former-commit-id: 7b6b40e31d
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
82bd402966 Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626

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

Former-commit-id: 88eed9bc17 [formerly 3ccf091c44] [formerly 88eed9bc17 [formerly 3ccf091c44] [formerly cab1c849bf [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]
Former-commit-id: cab1c849bf
Former-commit-id: 912212b953 [formerly df9c5492c8]
Former-commit-id: 06bfd0413c
2013-05-31 10:42:51 -05:00
Richard Peter
896593c691 Issue #2053: Add dx2f to capture
Former-commit-id: 345a9e4d65 [formerly d8d7c01705] [formerly 345a9e4d65 [formerly d8d7c01705] [formerly d4cf7a1312 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]]
Former-commit-id: d4cf7a1312
Former-commit-id: 4f7125d343 [formerly 337efabc5a]
Former-commit-id: 43b0fa7d11
2013-05-31 10:37:48 -05:00
Richard Peter
48f501d72a Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
Former-commit-id: a9e1fa602e [formerly 8e06328905] [formerly a9e1fa602e [formerly 8e06328905] [formerly 6ec966e39e [formerly 9b0bed97ebab78c585efe2ffec3e25d896817e6e]]]
Former-commit-id: 6ec966e39e
Former-commit-id: 08fea26653 [formerly dd5b0c4caf]
Former-commit-id: 7cfa594b44
2013-05-31 10:36:27 -05:00
Dustin Johnson
b122700fed Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: b4bc2ca947 [formerly fc807288a7] [formerly b4bc2ca947 [formerly fc807288a7] [formerly 05bd3e113d [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]
Former-commit-id: 05bd3e113d
Former-commit-id: 3f4b010b84 [formerly 42d1d74b04]
Former-commit-id: 62131327ed
2013-05-31 09:29:44 -05:00
Bryan Kowal
0d7bba37ff 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: 5ac8004618 [formerly f52c3498b1] [formerly 5ac8004618 [formerly f52c3498b1] [formerly 933c54a7d8 [formerly 1d8dfea6c421e98fa629d0bccb9cf9a71ca000a5]]]
Former-commit-id: 933c54a7d8
Former-commit-id: 43a498f1a0 [formerly e61f417b47]
Former-commit-id: 6b5a398515
2013-05-30 22:45:09 -05:00
Richard Peter
02cdefa3de Issue #2056: Update FileLocker to handle release of ACQUIRING locks
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23

Former-commit-id: c15635bccc [formerly e63f2de395] [formerly c15635bccc [formerly e63f2de395] [formerly 163998df17 [formerly 9097197872da18fded96e09d133132872d4dcc27]]]
Former-commit-id: 163998df17
Former-commit-id: 49cdce7b03 [formerly a10651b3b9]
Former-commit-id: b1e80dd072
2013-05-30 17:53:17 -05:00
Richard Peter
7ccdaf58ad Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
Former-commit-id: 6a19a0074f [formerly 6487cd6578] [formerly 6a19a0074f [formerly 6487cd6578] [formerly 0e4782aea5 [formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]]
Former-commit-id: 0e4782aea5
Former-commit-id: 9675eb9b1e [formerly c81610b720]
Former-commit-id: 6d07981ce3
2013-05-30 17:17:23 -05:00
Dustin Johnson
f8d7eaa98b Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: 54045d6b9b [formerly c01ea33d5b] [formerly 54045d6b9b [formerly c01ea33d5b] [formerly e4ecae9e7e [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: 353630fcca [formerly 58b11e075c]
Former-commit-id: 89d71040c6
2013-05-30 17:11:19 -05:00
Dave Hladky
1b07bcea0c Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

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

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

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

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

Former-commit-id: 3e66acde96 [formerly 3745089239] [formerly 3e66acde96 [formerly 3745089239] [formerly 26bf27c70d [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]
Former-commit-id: 26bf27c70d
Former-commit-id: 629e76e0ff [formerly 1691fa413c]
Former-commit-id: 9704fd6a82
2013-05-30 14:33:24 -05:00
Ron Anderson
9579b62577 Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
Former-commit-id: 79a8cd1b6f [formerly dd10af4a8a] [formerly 79a8cd1b6f [formerly dd10af4a8a] [formerly 7f41d701be [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]
Former-commit-id: 7f41d701be
Former-commit-id: 5858e8fc19 [formerly d2f617a49c]
Former-commit-id: 9e3809d6cd
2013-05-30 13:08:26 -05:00
Everett Kladstrup
033b8bae36 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: 9541c93640 [formerly 0b2839fd43] [formerly 9541c93640 [formerly 0b2839fd43] [formerly 4621271329 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]
Former-commit-id: 4621271329
Former-commit-id: 282ec3b45f [formerly 9ad045d141]
Former-commit-id: 83adbb8545
2013-05-30 13:02:49 -05:00
Dustin Johnson
b59dbc5553 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: 80309d6a4e [formerly 7e6bdb7b70] [formerly 80309d6a4e [formerly 7e6bdb7b70] [formerly 9c9caf00d1 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]]
Former-commit-id: 9c9caf00d1
Former-commit-id: 48c37c972a [formerly 0bdf7d614c]
Former-commit-id: a82e3aa078
2013-05-30 11:32:09 -05:00
Ron Anderson
40b8d1ed3c Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: 165bc6c409 [formerly 6557515f64] [formerly 165bc6c409 [formerly 6557515f64] [formerly 08e09382db [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]
Former-commit-id: 08e09382db
Former-commit-id: 3f9cb35feb [formerly c3363d43fa]
Former-commit-id: b04716dd2b
2013-05-30 11:01:07 -05:00