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: d81592b575d47da65262d81592b575d47da65262bc830e67f0bc830e67f0cd1db53a350b710bc166bdccf71c8b
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: f55fa69ea25d3b2b98bbf55fa69ea25d3b2b98bbb9696149adb9696149ad718ea75857f20b8b3b66d595d9e84b
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: e673c5c553c407dd8623e673c5c553c407dd86233d885c7a603d885c7a605a4726bdc25f637cc57b2050dec254
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
f482c88c7b
Issue #1931 Fixed Repository Items REST Service
...
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: 2c147fe1591e413c68f62c147fe1591e413c68f6a226f225fda226f225fd97a9a6279b3b3ae2add067d1818a64
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: 7d61737d797895dfa2e47d61737d797895dfa2e4cb59b82addcb59b82addc61b9d95e55d492a4b100d06f59694
2013-06-03 09:58:43 -05:00
Dustin Johnson
c8ea8fa5d7
Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
...
Former-commit-id: 72bb21698c3700d27fbf72bb21698c3700d27fbf2e420c09632e420c09635b23635521da0335a5e5b004863550
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: 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
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
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
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
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
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
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
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
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
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
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
Nate Jensen
121dd032bf
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 7059967ae9caf414bab07059967ae9caf414bab0148b20f57c148b20f57c47d2bf99b972ed3e21b31fe16c9553
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
a75821e0a6
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: e16dc02a544747f7d319e16dc02a544747f7d319d5263b2b75d5263b2b75c6af8b4d7c7cca4d8794c441b20ddb
2013-05-29 10:34:22 -05:00
Dustin Johnson
233d827c9c
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: 7ca6f1840566c941fc3f7ca6f1840566c941fc3fac292f1242ac292f1242b6c87f42b1ef43634c56bae8a2436d
2013-05-29 09:27:30 -05:00
Richard Peter
6ceeb324e1
Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
...
Former-commit-id: 6dd22b6dfabc0f1c88fc6dd22b6dfabc0f1c88fc19272c9f2819272c9f28d26eac7bdf4be6514b573550d07a9c
2013-05-29 09:26:10 -05:00
Nate Jensen
f9d85ac8a9
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 808ab352c582d6c03669808ab352c582d6c0366936bc35b5c836bc35b5c8452858b86fcb4b66d37a74081dd140
2013-05-29 09:20:53 -05:00
Mike Duff
4d43e81158
Issue #2016 - fix TS Trace toggle
...
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: 51de726e49afbe294f4a51de726e49afbe294f4a59196874845919687484d9fd9d297b66f4e6fe875e3fa8852b
2013-05-29 09:15:46 -05:00
Dustin Johnson
4ac1c2cbdb
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: c76fa3bc2a0a9e7ed740c76fa3bc2a0a9e7ed74031e01a9f9a31e01a9f9afff0172786187a1e49ef1fab733472
2013-05-29 09:02:47 -05:00
Nate Jensen
4ac4250fe3
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
...
Former-commit-id: ba5e69c7ff7c1e6e8b09ba5e69c7ff7c1e6e8b09256a67a9f9256a67a9f9ac838f62dd2fe1960ebb99a1938d36
2013-05-28 15:43:31 -05:00
Nate Jensen
95ddeeb10a
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
...
Former-commit-id: cba08666e6053e37ee76cba08666e6053e37ee76e846e539fbe846e539fb607e980d455c60582df2f1b34d9fdd
2013-05-28 15:43:23 -05:00
