Nate Jensen
d595d9e84b
Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
...
Former-commit-id: 5d3b2b98bb5d3b2b98bbb9696149adf20b8b3b66
2013-06-03 13:32:21 -05:00
Bryan Kowal
2050dec254
Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
...
Former-commit-id: c407dd8623c407dd86233d885c7a605f637cc57b
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
67d1818a64
Issue #1931 Fixed Repository Items REST Service
...
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: 1e413c68f61e413c68f6a226f225fd3b3ae2add0
2013-06-03 10:26:36 -05:00
Matt Nash
0d06f59694
Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
...
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1
Former-commit-id: 7895dfa2e47895dfa2e4cb59b82add5d492a4b10
2013-06-03 09:58:43 -05:00
Dustin Johnson
b004863550
Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
...
Former-commit-id: 3700d27fbf3700d27fbf2e420c0963da0335a5e5
2013-05-31 15:29:04 -05:00
Dave Hladky
1e55f4ade2
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 2f67b743182f67b74318fa8ea8ecca9d2ec44182
2013-05-31 15:27:45 -05:00
Richard Peter
71ad677568
Merge "Issue #1869 speed up upgrade script for dropping dataURI." into development
...
Former-commit-id: c11f08b9ecc11f08b9ec7f129cbe6507cf18028d
2013-05-31 14:57:16 -05:00
Ben Steffensmeier
8908dc03fd
Issue #1869 speed up upgrade script for dropping dataURI.
...
Former-commit-id: 0d34bff0040d34bff00478f56b32b02da0c851f0
2013-05-31 14:43:38 -05:00
Dustin Johnson
9cda6d2f35
Issue #2038 Set attribute xml on mock opendap adapter
...
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083
Former-commit-id: 88c8ad3a8188c8ad3a8176bdfc3a684d71652568
2013-05-31 13:54:41 -05:00
Greg Armendariz
561c91a33c
Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
...
Former-commit-id: d80ee4deded80ee4dedef040c697040a17b4873f
2013-05-31 13:29:31 -05:00
Greg Armendariz
2d1ad8d93e
Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
...
Former-commit-id: 1eeafcaaf81eeafcaaf85e799ba8bcceba329f0d
2013-05-31 13:27:59 -05:00
Dustin Johnson
46ec793d11
Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
...
Former-commit-id: 2687ebafd62687ebafd687605571b21214f5e3ea
2013-05-31 12:43:49 -05:00
Dustin Johnson
1027b218f2
Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
...
Former-commit-id: 3d8de9e9f33d8de9e9f31d06883d7a72d95aac0d
2013-05-31 12:32:23 -05:00
Dustin Johnson
f9ba7dc5ab
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: 4a8adeb80a4a8adeb80a55aeff3422075c53763d
2013-05-31 12:19:07 -05:00
Bryan Kowal
c6f4a5455f
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: a78c84dcd7a78c84dcd7203d886739f63c05e5cf
2013-05-31 11:47:09 -05:00
Richard Peter
7cfa594b44
Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
...
Former-commit-id: 8e063289058e063289056ec966e39edd5b0c4caf
2013-05-31 10:36:27 -05:00
Dustin Johnson
62131327ed
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: fc807288a7fc807288a705bd3e113d42d1d74b04
2013-05-31 09:29:44 -05:00
Bryan Kowal
6b5a398515
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: f52c3498b1f52c3498b1933c54a7d8e61f417b47
2013-05-30 22:45:09 -05:00
Richard Peter
6d07981ce3
Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
...
Former-commit-id: 6487cd65786487cd65780e4782aea5c81610b720
2013-05-30 17:17:23 -05:00
Dustin Johnson
89d71040c6
Merge "Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS" into development
...
Former-commit-id: c01ea33d5bc01ea33d5be4ecae9e7e58b11e075c
2013-05-30 17:11:19 -05:00
Dave Hladky
8c0c235087
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 1608d407d11608d407d183dae4fe0190e6d184e7
2013-05-30 17:04:16 -05:00
Roger Ferrel
3dc84dbe80
Issue #1966 Changes to make manger stateless and updates for Case Creation.
...
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387
Former-commit-id: c6cddc605dc6cddc605d3c875a6f44eaca117b9c
2013-05-30 16:35:11 -05:00
Nate Jensen
cdd438d3e2
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: 4aa3657d1a4aa3657d1ae4578ca7bac0bca7ec27
2013-05-30 14:50:39 -05:00
Roger Ferrel
f2b4dd8aa1
Issue #2054 Minor changes to 2 grib patterns in the pqact template.
...
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf
Former-commit-id: 85b9d9dea985b9d9dea92f2c553089593055e6c2
2013-05-30 14:34:54 -05:00
Steve Harris
9704fd6a82
Issue #1871 - Merge branch 'vlab' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
Former-commit-id: 3745089239374508923926bf27c70d1691fa413c
2013-05-30 14:33:24 -05:00
Ron Anderson
9e3809d6cd
Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
...
Former-commit-id: dd10af4a8add10af4a8a7f41d701bed2f617a49c
2013-05-30 13:08:26 -05:00
Everett Kladstrup
83adbb8545
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: 0b2839fd430b2839fd4346212713299ad045d141
2013-05-30 13:02:49 -05:00
Dustin Johnson
a82e3aa078
Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
...
Former-commit-id: 7e6bdb7b707e6bdb7b709c9caf00d10bdf7d614c
2013-05-30 11:32:09 -05:00
Dustin Johnson
3dbb682493
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: efc3c6a2f2efc3c6a2f2b99a8bc4f9b1d66a0450
2013-05-30 09:49:09 -05:00
Brad Gonzales
34707fe272
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: aa76f81b3caa76f81b3c321f153547bbc15413d4
2013-05-30 09:34:18 -05:00
Bryan Kowal
28bbbfefef
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: 7b24cd293a7b24cd293abd9251eba04eb7d951e4
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
bc19b816c4
Issue #1869 ensure all uses ofdataURI in PDO use getter.
...
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f
Former-commit-id: 268ee5ce30268ee5ce30191f93653d50c5c5edfa
2013-05-29 17:50:50 -05:00
Richard Peter
d546fcf734
Merge "Issue #1989 remove unused schemas" into development
...
Former-commit-id: d563ae4eb8d563ae4eb8800c7dd9a6c8c5be650c
2013-05-29 16:54:51 -05:00
Nate Jensen
d354b67dd3
Merge "Issue #1869 fix plot updates, broken by earlier commit." into development
...
Former-commit-id: 4f3ea80cd94f3ea80cd9532d3ee899f95037a9bf
2013-05-29 16:20:17 -05:00
Nate Jensen
3588ed1899
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: f3258e77f7f3258e77f7fc691cbb2f6214f529a7
2013-05-29 16:19:28 -05:00
Dustin Johnson
f2686f4475
Merge "Issue #2038 Fix deleting of multiple subscription types Update test Spring configurations" into development
...
Former-commit-id: b0348bc056b0348bc0562554ff960205d5a08497
2013-05-29 16:02:55 -05:00
Dustin Johnson
94c4247617
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: d2d50e7d8bd2d50e7d8becf3f2e300151df64a6e
2013-05-29 15:54:06 -05:00
Nate Jensen
a2417f0d9b
Issue #1989 fix for webpages
...
Change-Id: I998ddac47050620aa9ee07448a8e63d7d37215c7
Former-commit-id: 1a340671821a340671820d495f97598da746cde6
2013-05-29 15:21:10 -05:00
Ben Steffensmeier
47dba49e8d
Issue #1869 fix plot updates, broken by earlier commit.
...
Former-commit-id: d2e01ee1f2d2e01ee1f2cbc3b0a9a4d90ca1696e
2013-05-29 15:00:04 -05:00
Nate Jensen
4eb941dacb
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 99b4a2141499b4a214143f3e0a788da1f314948f
2013-05-29 14:49:43 -05:00
Nate Jensen
1fe16c9553
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: caf414bab0caf414bab0148b20f57c72ed3e21b3
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
c441b20ddb
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: 4747f7d3194747f7d319d5263b2b757cca4d8794
2013-05-29 10:34:22 -05:00
Dustin Johnson
bae8a2436d
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: 66c941fc3f66c941fc3fac292f1242ef43634c56
2013-05-29 09:27:30 -05:00
Richard Peter
3550d07a9c
Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
...
Former-commit-id: bc0f1c88fcbc0f1c88fc19272c9f284be6514b57
2013-05-29 09:26:10 -05:00
Nate Jensen
74081dd140
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 82d6c0366982d6c0366936bc35b5c8cb4b66d37a
2013-05-29 09:20:53 -05:00
Mike Duff
5e3fa8852b
Issue #2016 - fix TS Trace toggle
...
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: afbe294f4aafbe294f4a591968748466f4e6fe87
2013-05-29 09:15:46 -05:00
Dustin Johnson
1fab733472
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: 0a9e7ed7400a9e7ed74031e01a9f9a187a1e49ef
2013-05-29 09:02:47 -05:00
Nate Jensen
99a1938d36
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
...
Former-commit-id: 7c1e6e8b097c1e6e8b09256a67a9f92fe1960ebb
2013-05-28 15:43:31 -05:00
Nate Jensen
f1b34d9fdd
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
...
Former-commit-id: 053e37ee76053e37ee76e846e539fb5c60582df2
2013-05-28 15:43:23 -05:00
Max Schenkelberg
b3bae339be
Issue #1638 Fixed text box drawn to be correct size with padding around text
...
Amend: Fixed format string issues with topo resource and colorbar labels
Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114
Former-commit-id: 13ff44fdee13ff44fdee31755633369932114218
2013-05-28 15:00:59 -05:00
