Richard Peter
c0bafd75dd
Merge "Issue #2043 switch capeFunc to java. Change-Id: I35db8657838d1e11180248ebfb5011181ea09659" into development
...
Former-commit-id: 4abe0f2e5903b2db312e82341a9fc13be654e02882341a9fc13be654e028a765656f1d9ef5384cd3
2013-06-04 14:57:10 -05:00
Greg Armendariz
052b511704
Merge "Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file." into development
...
Former-commit-id: 01190002843c5c1b65e3f1fbb33f31dbdb343fadf1fbb33f31dbdb343fadaf4fd585a2aa94d1e875
2013-06-04 14:35:39 -05:00
Greg Armendariz
12eab962bf
Merge "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." into development
...
Former-commit-id: 7f56d8658650db54dfebeeff0a13e1ffa5962f52eeff0a13e1ffa5962f52a7d5daf5f9fb5f888ce1
2013-06-04 14:35:27 -05:00
Dustin Johnson
052d397cac
Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
...
Former-commit-id: c4446d26f1a98b19c824319827709637b7e400ea319827709637b7e400eab4a51bc24f533fb7139a
2013-06-04 14:22:59 -05:00
Benjamin Phillippe
8d03dd6c75
Issue #2022 Modifications to subscription last run time
...
and notificationservers
Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea
Former-commit-id: 5b9eecc8b80862f2b7d3f00d8ae7211cec0fab74f00d8ae7211cec0fab746e8314475e49ec0363c3
2013-06-04 14:19:09 -05:00
Richard Peter
a8780f26b5
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: c9c02248b3f13177a981192e5b9be89e3baaa87a192e5b9be89e3baaa87aae09db35ad9c3fe01efa
2013-06-04 14:06:53 -05:00
Bryan Kowal
398dfd5add
Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file.
...
Change-Id: Ie625a515e8dc30cacc002bb6d8e77365c1347a13
Former-commit-id: 0d2958f693bc1ef2c5fe71b04e314733a5b6d42d71b04e314733a5b6d42d9b896380bededddc5811
2013-06-04 12:52:27 -05:00
Nate Jensen
e4158f9ece
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: f4d0188254537b731f6e329d9d1c6a5d1ecb3a5d329d9d1c6a5d1ecb3a5d2d1405b9c4412c21f516
2013-06-04 11:43:22 -05:00
Ben Steffensmeier
01e46140cb
Issue #2043 switch capeFunc to java.
...
Change-Id: I35db8657838d1e11180248ebfb5011181ea09659
Former-commit-id: 2f636b5309f283171cb4098d209d5c492b435626098d209d5c492b4356266f9ea3f1953fd810e0bf
2013-06-04 10:16:53 -05:00
Bryan Kowal
4df4ccae59
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: 2f5cbb67575244c9563fabd8ae931cdc5a800b83abd8ae931cdc5a800b835e4a1576f096ae06c3a1
2013-06-04 10:05:23 -05:00
Bryan Kowal
e49087b23f
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: eb656f731c7a1c08bb1346c9ba7c7b67cd73c65546c9ba7c7b67cd73c655f8e2a2f4f286b88922da
2013-06-04 09:36:09 -05:00
Bryan Kowal
8633568ad4
Issue #2021 - native hydro code will now compile successfully
...
Change-Id: Ie58409a87690beb08808c4d53f6907cbe06cdd07
Former-commit-id: b222d55e5a9ea421356acea990cbe3032e26c7bacea990cbe3032e26c7ba91a494bde0f900d7c589
2013-06-04 09:22:00 -05:00
Nate Jensen
c8e8c734ee
Merge "Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable." into development
...
Former-commit-id: 1553b4d4d72de1cec4813151ba277ca7367c1e1a3151ba277ca7367c1e1a877e78717bc9056f278b
2013-06-04 09:13:56 -05:00
Max Schenkelberg
084f8cbc05
Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
...
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75
Former-commit-id: 0df84a1b9ab28f451d173379b100cb7f76bd3d983379b100cb7f76bd3d9886d8f1b294e4d27d5d99
2013-06-03 17:19:18 -05:00
Dustin Johnson
efce5e19d5
Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
...
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63
Former-commit-id: 57b3706e5dd81592b575d47da65262bc830e67f0d47da65262bc830e67f00b710bc166cd1db53a35
2013-06-03 14:54:53 -05:00
Nate Jensen
327f549f33
Merge "Issue #1996 remove tear offs from GFE by adding a field to enable by perspective" into development
...
Former-commit-id: 682ac3f2bef55fa69ea25d3b2b98bbb9696149ad5d3b2b98bbb9696149adf20b8b3b66718ea75857
2013-06-03 13:32:21 -05:00
Bryan Kowal
be8aab95e9
Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities
...
Former-commit-id: 6719473eaee673c5c553c407dd86233d885c7a60c407dd86233d885c7a605f637cc57b5a4726bdc2
2013-06-03 11:05:21 -05:00
Benjamin Phillippe
396102ea5d
Issue #1931 Fixed Repository Items REST Service
...
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: 5450a58ca62c147fe1591e413c68f6a226f225fd1e413c68f6a226f225fd3b3ae2add097a9a6279b
2013-06-03 10:26:36 -05:00
Matt Nash
efdb42ab54
Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
...
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1
Former-commit-id: aa13a1ed3a7d61737d797895dfa2e4cb59b82add7895dfa2e4cb59b82add5d492a4b10c61b9d95e5
2013-06-03 09:58:43 -05:00
Ron Anderson
9464771e25
Merge "Issue #1759 : Add a more detailed comment in code for previous change." into omaha_13.4.1
...
Former-commit-id: 9e6969eccbd0897c31d8fb5d4326690ae8346cfbfb5d4326690ae8346cfbf65ce6e3e6e6d7b83df5
2013-06-03 07:45:02 -05:00
Dustin Johnson
fe1a709d42
Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development
...
Former-commit-id: 5d4ecc632872bb21698c3700d27fbf2e420c09633700d27fbf2e420c0963da0335a5e55b23635521
2013-05-31 15:29:04 -05:00
Dave Hladky
beeaaab97b
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 87e81a8b1b39f357570b2f67b74318fa8ea8ecca2f67b74318fa8ea8ecca9d2ec441820317090ffd
2013-05-31 15:27:45 -05:00
Richard Peter
0ab13763ab
Merge "Issue #1869 speed up upgrade script for dropping dataURI." into development
...
Former-commit-id: e3d35f3d0647cdad3880c11f08b9ec7f129cbe65c11f08b9ec7f129cbe6507cf18028dcce0de878a
2013-05-31 14:57:16 -05:00
Richard Peter
a9290fdd7e
Issue #2058 : Update obsPurgeRules.xml and sfcobsPurgeRules.xml
...
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c
Former-commit-id: 168e447d817693aef3db948d1aabfe5a8fe397b2948d1aabfe5a8fe397b28d856602e3ba36d7c9af
2013-05-31 14:43:43 -05:00
Ben Steffensmeier
5a4c7791f5
Issue #1869 speed up upgrade script for dropping dataURI.
...
Former-commit-id: 3ae99d49a6d7a8dc0baf0d34bff00478f56b32b00d34bff00478f56b32b02da0c851f0640d8e9b6d
2013-05-31 14:43:38 -05:00
Dustin Johnson
8888f9e1fb
Issue #2038 Set attribute xml on mock opendap adapter
...
Change-Id: I2e2e68907b475848c7b5b556c9d33a7f07877083
Former-commit-id: f95e1f461821b972430488c8ad3a8176bdfc3a6888c8ad3a8176bdfc3a684d716525684d7c894976
2013-05-31 13:54:41 -05:00
Greg Armendariz
da8783da2b
Merge "Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7" into development
...
Former-commit-id: d1eff126b0e333debc2ad80ee4dedef040c69704d80ee4dedef040c697040a17b4873fcf6938e321
2013-05-31 13:29:31 -05:00
Greg Armendariz
6b2a53f67d
Merge "Issue #2011 - re-adding native libraries that were previously removed." into development
...
Former-commit-id: 6fe0ff53c5088407c1c21eeafcaaf85e799ba8bc1eeafcaaf85e799ba8bcceba329f0d1304f0519d
2013-05-31 13:27:59 -05:00
Richard Peter
6d496ca4e8
Issue #2053 : Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
...
Former-commit-id: 1d378a49c591bfa4b37ac2e1b72f9bfdcf086681c2e1b72f9bfdcf08668114ef93bf5a2d3b8706c1
2013-05-31 13:01:52 -05:00
Dustin Johnson
26517c1a95
Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
...
Former-commit-id: 35e1c84a01ba48f668862687ebafd687605571b22687ebafd687605571b21214f5e3ea0d77acbff2
2013-05-31 12:43:49 -05:00
Dustin Johnson
5931027de7
Merge "Issue #2038 Fix ability to get shared subscriptions by id" into development
...
Former-commit-id: 7e68af05310bfcf4e9df3d8de9e9f31d06883d7a3d8de9e9f31d06883d7a72d95aac0dd61d518bdc
2013-05-31 12:32:23 -05:00
David Gillingham
eb61d6b8e3
Issue #1759 : Add a more detailed comment in code for previous change.
...
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e
Former-commit-id: 483665612d3ec84b8f185b9094275da11ef459135b9094275da11ef45913593a5fcbedb77e978008
2013-05-31 12:25:19 -05:00
Dustin Johnson
d1552d578f
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: 174df7bdd662344170954a8adeb80a55aeff34224a8adeb80a55aeff3422075c53763d7ec3c6c09a
2013-05-31 12:19:07 -05:00
Ron Anderson
fcd98f4e14
Merge "Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
...
Former-commit-id: 7f15e7e7ab1b9e0c20477e1d2d273fc3f8ab24ea7e1d2d273fc3f8ab24eab6d6349f0935f018c206
2013-05-31 12:09:49 -05:00
Bryan Kowal
2f4e04a818
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: a2752092ebba097c8a48a78c84dcd7203d886739a78c84dcd7203d886739f63c05e5cfe6da4debed
2013-05-31 11:47:09 -05:00
Greg Armendariz
4ce40beb30
Merge "Issue #2053 : Add dx2f to capture" into omaha_13.4.1
...
Former-commit-id: 7f82e30d7334e1b8046063fcb263125052a7f3f563fcb263125052a7f3f59e57f1869eae082f94c9
2013-05-31 11:44:12 -05:00
Richard Peter
8c4e1b2d66
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: 8dbc5fbf263ae3f6a0cb5da3e645281fc1c771895da3e645281fc1c771892dc6232ba0f77ef2196d
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
b748dd3393
Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
...
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626
Former-commit-id: a5611b16d936cd455621da73b0fd4e7ae82832d1da73b0fd4e7ae82832d1d720c0fa3f66cc26f78b
2013-05-31 11:39:50 -05:00
David Gillingham
e4626b7534
Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path.
...
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b
Former-commit-id: 6fe3ffa07e88eed9bc173ccf091c44cab1c849bf3ccf091c44cab1c849bfdf9c5492c8912212b953
2013-05-31 10:42:51 -05:00
Richard Peter
e23a5ddc08
Issue #2053 : Add dx2f to capture
...
Former-commit-id: 44977d565c345a9e4d65d8d7c01705d4cf7a1312d8d7c01705d4cf7a1312337efabc5a4f7125d343
2013-05-31 10:37:48 -05:00
Richard Peter
ef5e42fd6d
Merge "Issue #2054 Minor changes to 2 grib patterns in the pqact template." into development
...
Former-commit-id: dffd58a7cea9e1fa602e8e063289056ec966e39e8e063289056ec966e39edd5b0c4caf08fea26653
2013-05-31 10:36:27 -05:00
Dustin Johnson
8df55423f5
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: f6c89fa3d9b4bc2ca947fc807288a705bd3e113dfc807288a705bd3e113d42d1d74b043f4b010b84
2013-05-31 09:29:44 -05:00
Bryan Kowal
1c75b665b4
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: b8ef3ae9595ac8004618f52c3498b1933c54a7d8f52c3498b1933c54a7d8e61f417b4743a498f1a0
2013-05-30 22:45:09 -05:00
Richard Peter
03eab26980
Issue #2056 : Update FileLocker to handle release of ACQUIRING locks
...
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23
Former-commit-id: ba4d97a349c15635bccce63f2de395163998df17e63f2de395163998df17a10651b3b949cdce7b03
2013-05-30 17:53:17 -05:00
Richard Peter
dcee8de5bf
Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
...
Former-commit-id: a25207c4f56a19a0074f6487cd65780e4782aea56487cd65780e4782aea5c81610b7209675eb9b1e
2013-05-30 17:17:23 -05:00
Dustin Johnson
5d995a726f
Merge "Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS" into development
...
Former-commit-id: f3835a567054045d6b9bc01ea33d5be4ecae9e7ec01ea33d5be4ecae9e7e58b11e075c353630fcca
2013-05-30 17:11:19 -05:00
Dave Hladky
e28331d3bb
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 7393abfc91c292bf1b551608d407d183dae4fe011608d407d183dae4fe0190e6d184e764596d3468
2013-05-30 17:04:16 -05:00
Roger Ferrel
9ef53f18b9
Issue #1966 Changes to make manger stateless and updates for Case Creation.
...
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387
Former-commit-id: cfcd38da58d6672697aac6cddc605d3c875a6f44c6cddc605d3c875a6f44eaca117b9c36b8cbcd5d
2013-05-30 16:35:11 -05:00
Nate Jensen
30ec58305f
Merge "Issue #2055 Remove modelName from sounding pointName. Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b" into omaha_13.4.1
...
Former-commit-id: c3e9110e327a73bd79d61ea89c8f0f35a2a44ccd1ea89c8f0f35a2a44ccd21d261d8be7e05836290
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
c634d7e694
Issue #2055 Remove modelName from sounding pointName.
...
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b
Former-commit-id: 65c7bd3c89965705049b2ee4b85d7451f6906c882ee4b85d7451f6906c88f7353cc092e9b92d330d
2013-05-30 16:05:53 -05:00
