Dave Hladky
d2c1950237
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 39f357570b2f67b7431839f357570b2f67b74318fa8ea8eccafa8ea8ecca0317090ffd9d2ec441821e55f4ade2
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: 47cdad3880c11f08b9ec47cdad3880c11f08b9ec7f129cbe657f129cbe65cce0de878a07cf18028d71ad677568
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: 7693aef3db948d1aabfe7693aef3db948d1aabfe5a8fe397b25a8fe397b2ba36d7c9af8d856602e31846685f3f
2013-05-31 14:43:43 -05:00
Ben Steffensmeier
cdf3fbfbc0
Issue #1869 speed up upgrade script for dropping dataURI.
...
Former-commit-id: d7a8dc0baf0d34bff004d7a8dc0baf0d34bff00478f56b32b078f56b32b0640d8e9b6d2da0c851f08908dc03fd
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: 21b972430488c8ad3a8121b972430488c8ad3a8176bdfc3a6876bdfc3a684d7c8949764d716525689cda6d2f35
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: e333debc2ad80ee4dedee333debc2ad80ee4dedef040c69704f040c69704cf6938e3210a17b4873f561c91a33c
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: 088407c1c21eeafcaaf8088407c1c21eeafcaaf85e799ba8bc5e799ba8bc1304f0519dceba329f0d2d1ad8d93e
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: 91bfa4b37ac2e1b72f9b91bfa4b37ac2e1b72f9bfdcf086681fdcf0866812d3b8706c114ef93bf5a522dfa3733
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: ba48f668862687ebafd6ba48f668862687ebafd687605571b287605571b20d77acbff21214f5e3ea46ec793d11
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: 0bfcf4e9df3d8de9e9f30bfcf4e9df3d8de9e9f31d06883d7a1d06883d7ad61d518bdc72d95aac0d1027b218f2
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: 3ec84b8f185b9094275d3ec84b8f185b9094275da11ef45913a11ef45913b77e978008593a5fcbeddb859cfe86
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: 62344170954a8adeb80a62344170954a8adeb80a55aeff342255aeff34227ec3c6c09a075c53763df9ba7dc5ab
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: 1b9e0c20477e1d2d273f1b9e0c20477e1d2d273fc3f8ab24eac3f8ab24ea35f018c206b6d6349f095b94dbc699
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: ba097c8a48a78c84dcd7ba097c8a48a78c84dcd7203d886739203d886739e6da4debedf63c05e5cfc6f4a5455f
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: 34e1b8046063fcb2631234e1b8046063fcb263125052a7f3f55052a7f3f5ae082f94c99e57f1869ed67ec97699
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: 3ae3f6a0cb5da3e645283ae3f6a0cb5da3e645281fc1c771891fc1c77189f77ef2196d2dc6232ba07b6b40e31d
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: 36cd455621da73b0fd4e36cd455621da73b0fd4e7ae82832d17ae82832d166cc26f78bd720c0fa3f7cb83e5c64
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: 88eed9bc173ccf091c4488eed9bc173ccf091c44cab1c849bfcab1c849bf912212b953df9c5492c806bfd0413c
2013-05-31 10:42:51 -05:00
Richard Peter
896593c691
Issue #2053 : Add dx2f to capture
...
Former-commit-id: 345a9e4d65d8d7c01705345a9e4d65d8d7c01705d4cf7a1312d4cf7a13124f7125d343337efabc5a43b0fa7d11
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: a9e1fa602e8e06328905a9e1fa602e8e063289056ec966e39e6ec966e39e08fea26653dd5b0c4caf7cfa594b44
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: b4bc2ca947fc807288a7b4bc2ca947fc807288a705bd3e113d05bd3e113d3f4b010b8442d1d74b0462131327ed
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: 5ac8004618f52c3498b15ac8004618f52c3498b1933c54a7d8933c54a7d843a498f1a0e61f417b476b5a398515
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: c15635bccce63f2de395c15635bccce63f2de395163998df17163998df1749cdce7b03a10651b3b9b1e80dd072
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: 6a19a0074f6487cd65786a19a0074f6487cd65780e4782aea50e4782aea59675eb9b1ec81610b7206d07981ce3
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: 54045d6b9bc01ea33d5b54045d6b9bc01ea33d5be4ecae9e7ee4ecae9e7e353630fcca58b11e075c89d71040c6
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: c292bf1b551608d407d1c292bf1b551608d407d183dae4fe0183dae4fe0164596d346890e6d184e78c0c235087
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: d6672697aac6cddc605dd6672697aac6cddc605d3c875a6f443c875a6f4436b8cbcd5deaca117b9c3dc84dbe80
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: 7a73bd79d61ea89c8f0f7a73bd79d61ea89c8f0f35a2a44ccd35a2a44ccd7e0583629021d261d8bedaf8bdc47a
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
78a840b4aa
Issue #2055 Remove modelName from sounding pointName.
...
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b
Former-commit-id: 965705049b2ee4b85d74965705049b2ee4b85d7451f6906c8851f6906c88e9b92d330df7353cc0929159f57ff5
2013-05-30 16:05:53 -05:00
Nate Jensen
f6d958a18b
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: 10dd7ea61f4aa3657d1a10dd7ea61f4aa3657d1ae4578ca7bae4578ca7ba698d793e9cc0bca7ec27cdd438d3e2
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: 3c4b351c7585b9d9dea93c4b351c7585b9d9dea92f2c5530892f2c55308913543ac79e593055e6c2f2b4dd8aa1
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: 3e66acde9637450892393e66acde96374508923926bf27c70d26bf27c70d629e76e0ff1691fa413c9704fd6a82
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: 79a8cd1b6fdd10af4a8a79a8cd1b6fdd10af4a8a7f41d701be7f41d701be5858e8fc19d2f617a49c9e3809d6cd
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: 9541c936400b2839fd439541c936400b2839fd4346212713294621271329282ec3b45f9ad045d14183adbb8545
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: 80309d6a4e7e6bdb7b7080309d6a4e7e6bdb7b709c9caf00d19c9caf00d148c37c972a0bdf7d614ca82e3aa078
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: 165bc6c4096557515f64165bc6c4096557515f6408e09382db08e09382db3f9cb35febc3363d43fab04716dd2b
2013-05-30 11:01:07 -05:00
Dustin Johnson
03cbf9a455
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: 463bed7647efc3c6a2f2463bed7647efc3c6a2f2b99a8bc4f9b99a8bc4f974d985af51b1d66a04503dbb682493
2013-05-30 09:49:09 -05:00
Brad Gonzales
5a66a33017
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: 6243f1f789aa76f81b3c6243f1f789aa76f81b3c321f153547321f153547cb69ca7e93bbc15413d434707fe272
2013-05-30 09:34:18 -05:00
Steve Harris
86a4b2913f
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 07bc6c83e99d4577079d07bc6c83e99d4577079d0a276d49540a276d4954f72ba834dcf4d1b7c86c9bf53663ae
2013-05-30 07:26:30 -05:00
Bryan Kowal
d6ce03a31d
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: 52a1addb297b24cd293a52a1addb297b24cd293abd9251eba0bd9251eba05ee9c9f6a14eb7d951e428bbbfefef
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
f73b0b551e
Issue #1869 ensure all uses ofdataURI in PDO use getter.
...
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f
Former-commit-id: b3865f4efc268ee5ce30b3865f4efc268ee5ce30191f93653d191f93653d9c415e2f1950c5c5edfabc19b816c4
2013-05-29 17:50:50 -05:00
Richard Peter
7d8ebdbfde
Merge "Issue #1989 remove unused schemas" into development
...
Former-commit-id: 47b95286add563ae4eb847b95286add563ae4eb8800c7dd9a6800c7dd9a64788532b86c8c5be650cd546fcf734
2013-05-29 16:54:51 -05:00
Nate Jensen
15894e477c
Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
...
Former-commit-id: df5945a8e24f3ea80cd9df5945a8e24f3ea80cd9532d3ee899532d3ee899545fe43c1ef95037a9bfd354b67dd3
2013-05-29 16:20:17 -05:00
Nate Jensen
528ab65a66
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 740237c317f3258e77f7740237c317f3258e77f7fc691cbb2ffc691cbb2fab10e0072d6214f529a73588ed1899
2013-05-29 16:19:28 -05:00
Dustin Johnson
5ad7ca03a7
Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
...
Former-commit-id: 8ae3e74339b0348bc0568ae3e74339b0348bc0562554ff96022554ff96024741aca6b105d5a08497f2686f4475
2013-05-29 16:02:55 -05:00
Dustin Johnson
1047ef53b3
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: 21b8f03b1fd2d50e7d8b21b8f03b1fd2d50e7d8becf3f2e300ecf3f2e300d467832855151df64a6e94c4247617
2013-05-29 15:54:06 -05:00
Steve Harris
176f4d392f
13.4.1-13 baseline
...
Former-commit-id: e3b8086bd087b9712009e3b8086bd087b9712009de476791fbde476791fb418f8aef56b58cf237bfc9155c1631
2013-05-29 16:30:09 -04:00
Nate Jensen
2d5e05ceea
Issue #1989 fix for webpages
...
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7
Former-commit-id: c0e93d192c1a34067182c0e93d192c1a340671820d495f97590d495f9759839e9fc76d8da746cde6a2417f0d9b
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
75b800be90
Issue #1869 fix plot updates, broken by earlier commit.
...
Former-commit-id: b32a5b1c00d2e01ee1f2b32a5b1c00d2e01ee1f2cbc3b0a9a4cbc3b0a9a46b7958c834d90ca1696e47dba49e8d
2013-05-29 15:00:04 -05:00
Nate Jensen
e4bbe70d57
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 927da5cffb99b4a21414927da5cffb99b4a214143f3e0a788d3f3e0a788db025262dc1a1f314948f4eb941dacb
2013-05-29 14:49:43 -05:00
