Richard Peter
13f64a7da8
Merge branch 'omaha_13.4.1' (13.4.1-13) into development
...
Conflicts:
cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java
Former-commit-id: 192e5b9be8192e5b9be89e3baaa87aae09db35ad
2013-06-04 14:06:53 -05:00
Nate Jensen
5c2f0ab151
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: 329d9d1c6a329d9d1c6a5d1ecb3a5d2d1405b9c4
2013-06-04 11:43:22 -05:00
Bryan Kowal
36aa500077
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: 46c9ba7c7b46c9ba7c7b67cd73c655f8e2a2f4f2
2013-06-04 09:36:09 -05:00
Bryan Kowal
10e5f4e413
Issue #2021 - native hydro code will now compile successfully
...
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07
Former-commit-id: cea990cbe3cea990cbe3032e26c7ba91a494bde0
2013-06-04 09:22:00 -05:00
Nate Jensen
199d9cd20c
Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
...
Former-commit-id: 3151ba277c3151ba277ca7367c1e1a877e78717b
2013-06-04 09:13:56 -05:00
Max Schenkelberg
a6d84e24b7
Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
...
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75
Former-commit-id: 3379b100cb3379b100cb7f76bd3d9886d8f1b294
2013-06-03 17:19:18 -05:00
Dustin Johnson
bdccf71c8b
Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
...
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63
Former-commit-id: d47da65262d47da65262bc830e67f00b710bc166
2013-06-03 14:54:53 -05:00
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
Ron Anderson
d01a608015
Merge "Issue #1759 : Add a more detailed comment in code for previous change." into omaha_13.4.1
...
Former-commit-id: fb5d432669fb5d4326690ae8346cfbf65ce6e3e6
2013-06-03 07:45:02 -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
Richard Peter
1846685f3f
Issue #2058 : Update obsPurgeRules.xml and sfcobsPurgeRules.xml
...
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c
Former-commit-id: 948d1aabfe948d1aabfe5a8fe397b28d856602e3
2013-05-31 14:43:43 -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
Richard Peter
522dfa3733
Issue #2053 : Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
...
Former-commit-id: c2e1b72f9bc2e1b72f9bfdcf08668114ef93bf5a
2013-05-31 13:01:52 -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
David Gillingham
db859cfe86
Issue #1759 : Add a more detailed comment in code for previous change.
...
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e
Former-commit-id: 5b9094275d5b9094275da11ef45913593a5fcbed
2013-05-31 12:25:19 -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
Ron Anderson
5b94dbc699
Merge "Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
...
Former-commit-id: 7e1d2d273f7e1d2d273fc3f8ab24eab6d6349f09
2013-05-31 12:09:49 -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
Greg Armendariz
d67ec97699
Merge "Issue #2053 : Add dx2f to capture" into omaha_13.4.1
...
Former-commit-id: 63fcb2631263fcb263125052a7f3f59e57f1869e
2013-05-31 11:44:12 -05:00
Richard Peter
7b6b40e31d
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: 5da3e645285da3e645281fc1c771892dc6232ba0
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
7cb83e5c64
Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
...
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626
Former-commit-id: da73b0fd4eda73b0fd4e7ae82832d1d720c0fa3f
2013-05-31 11:39:50 -05:00
David Gillingham
06bfd0413c
Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path.
...
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b
Former-commit-id: 3ccf091c443ccf091c44cab1c849bfdf9c5492c8
2013-05-31 10:42:51 -05:00
Richard Peter
43b0fa7d11
Issue #2053 : Add dx2f to capture
...
Former-commit-id: d8d7c01705d8d7c01705d4cf7a1312337efabc5a
2013-05-31 10:37:48 -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
b1e80dd072
Issue #2056 : Update FileLocker to handle release of ACQUIRING locks
...
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23
Former-commit-id: e63f2de395e63f2de395163998df17a10651b3b9
2013-05-30 17:53:17 -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
daf8bdc47a
Merge "Issue #2055 Remove modelName from sounding pointName. Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b" into omaha_13.4.1
...
Former-commit-id: 1ea89c8f0f1ea89c8f0f35a2a44ccd21d261d8be
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
9159f57ff5
Issue #2055 Remove modelName from sounding pointName.
...
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b
Former-commit-id: 2ee4b85d742ee4b85d7451f6906c88f7353cc092
2013-05-30 16:05:53 -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
Ron Anderson
b04716dd2b
Issue #2028 Fixed date line issue in MakeHazardDialog
...
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287
Former-commit-id: 6557515f646557515f6408e09382dbc3363d43fa
2013-05-30 11:01:07 -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
