Steve Harris
78f0921f63
Merge branch 'omaha_13.4.1' into development
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java
Former-commit-id: a150d8b90b64cf1aedb1571757b2a62327205cb7571757b2a62327205cb7035d74b3488b78f538d3
2013-06-06 15:46:23 -05:00
Steve Harris
a74c3b01ce
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: c5f2c1abf1b0c0e2e7cf1e4c538e5856e04554e91e4c538e5856e04554e972a559120f1d4e65d435
2013-06-06 15:43:34 -05:00
Bryan Kowal
11ce8abc78
Issue #1927 - build.properties standardization.
...
Former-commit-id: e6e6def97d5d5b26a5430268fa48b0a0e08f5bf70268fa48b0a0e08f5bf76fff973f2d4e1d503b5e
2013-06-06 14:35:17 -05:00
Steve Harris
f7316ae4bd
13.4.1-14 baseline
...
Former-commit-id: ffcce90f3fbe236eb722c749e122eb18b90226a2c749e122eb18b90226a2dee685e3c7cebc1ddb63
2013-06-06 15:15:27 -04:00
Ben Steffensmeier
460410a87f
Issue #2041 fix python job coordinator shutdown.
...
Former-commit-id: e27f1d20d6955468866e4bf7b44234ab0bb800cb4bf7b44234ab0bb800cb8111840673b8cef5b733
2013-06-06 13:13:02 -05:00
Max Schenkelberg
0f72f90fa2
Issue #1638 Moved python localization project out of common.base feature to keep it minimal.
...
Amend: Added to wrong edex feature
Change-Id: Ic1f3bf92a4559ba04eb6a05c39d5773393235330
Former-commit-id: 04256b75486afefe027b0bfeed7240424ea84d6e0bfeed7240424ea84d6ee80b104e151872fd5b67
2013-06-05 17:13:43 -05:00
David Gillingham
8ade43a3dc
Issue #2063 : Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
...
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16
Former-commit-id: 5e53c3f0bd51b317ac529acf385f21bad6a1fa409acf385f21bad6a1fa40070365714a5fe4739fc4
2013-06-05 16:26:04 -05:00
Dustin Johnson
37f5475d46
Merge "Issue #2064 - Add ability to subscribe to observational point data (MADIS)" into development
...
Former-commit-id: 7836105cff6d589a3c7937791e95a1022346b4b337791e95a1022346b4b33554d852454722edba19
2013-06-05 13:24:54 -05:00
Mike Duff
d9c8fa4f5c
Issue #2064 - Add ability to subscribe to observational point data (MADIS)
...
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa
Former-commit-id: e6f871230677611d7e9c321209adb812e5155edc321209adb812e5155edc5e7ec9269641f817e755
2013-06-05 12:06:58 -05:00
Richard Peter
65b21b5776
Merge "Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to." into development
...
Former-commit-id: a5de9a0b8fadfc74132927442499e6e8c77bb25127442499e6e8c77bb25142777a98a833b799fb50
2013-06-05 11:48:09 -05:00
Nate Jensen
c5ed0f981a
Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
...
Former-commit-id: fb7e8c607038b028b665725adab2444bfba7d6c6725adab2444bfba7d6c607b185430864ccc2c283
2013-06-05 08:42:23 -05:00
Bryan Kowal
6c368db5e0
Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
...
Former-commit-id: b7b51697b83427534c294b5c6533632abb257d354b5c6533632abb257d3598150aa493b3b85069ea
2013-06-04 18:25:58 -05:00
Ben Steffensmeier
05874a2376
Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
...
Former-commit-id: 2370b4305ca01c4eb02b2dc2e990cb19af45e5252dc2e990cb19af45e525d773bbf625016ed7211f
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
4a98cb43a4
Issue #2041 Improve exception handling for concurrent python.
...
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47
Former-commit-id: d9599eb3ae5d5cd5e5f48ce74c44dfef10b56e2b8ce74c44dfef10b56e2b0f70964bc9f78e0f18bf
2013-06-04 17:03:05 -05:00
Richard Peter
cbfbab7fb9
Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
...
Former-commit-id: 96c82320062281df8c5be513fdbc3e220e817e15e513fdbc3e220e817e156b75cad25fb5cccf449d
2013-06-04 15:08:09 -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
Roger Ferrel
8820399134
Issue #1965 Initial archive retention dialog work.
...
updated archive creation, purge, and test cases after Roger's last checkin.
added edex plugin for feature.
added an abstract base archive dialog.
Change-Id: I7c9ca3df40a7591815a1aae4fabf660217d44574
Former-commit-id: ef974b52f0dcc56ad5d3b952eee030f53d6bf4ffb952eee030f53d6bf4ff9aff5f232165d17722a9
2013-06-04 13:08:05 -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
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
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
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
a9290fdd7e
Issue #2058 : Update obsPurgeRules.xml and sfcobsPurgeRules.xml
...
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c
Former-commit-id: 168e447d817693aef3db948d1aabfe5a8fe397b2948d1aabfe5a8fe397b28d856602e3ba36d7c9af
2013-05-31 14:43:43 -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
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
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
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
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
09215e6dbb
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: 03833d148d10dd7ea61f4aa3657d1ae4578ca7ba4aa3657d1ae4578ca7bac0bca7ec27698d793e9c
2013-05-30 14:50:39 -05:00
Steve Harris
e83fa33a36
Issue #1871 - Merge branch 'vlab' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
Former-commit-id: 4e0ce194d93e66acde96374508923926bf27c70d374508923926bf27c70d1691fa413c629e76e0ff
2013-05-30 14:33:24 -05:00
Ron Anderson
d3a25be20d
Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
...
Former-commit-id: 7d2d162be479a8cd1b6fdd10af4a8a7f41d701bedd10af4a8a7f41d701bed2f617a49c5858e8fc19
2013-05-30 13:08:26 -05:00
Everett Kladstrup
f78c5c3640
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: 7d7e276e2a9541c936400b2839fd4346212713290b2839fd4346212713299ad045d141282ec3b45f
2013-05-30 13:02:49 -05:00
Dustin Johnson
bf277cb980
Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
...
Former-commit-id: b7d7d6672780309d6a4e7e6bdb7b709c9caf00d17e6bdb7b709c9caf00d10bdf7d614c48c37c972a
2013-05-30 11:32:09 -05:00
Ron Anderson
f9eeac331e
Issue #2028 Fixed date line issue in MakeHazardDialog
...
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287
Former-commit-id: ff6fe9e225165bc6c4096557515f6408e09382db6557515f6408e09382dbc3363d43fa3f9cb35feb
2013-05-30 11:01:07 -05:00
Dustin Johnson
ac8c2784ae
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: 0ac058008d463bed7647efc3c6a2f2b99a8bc4f9efc3c6a2f2b99a8bc4f9b1d66a045074d985af51
2013-05-30 09:49:09 -05:00
Brad Gonzales
c8811ff347
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: 778cf6542c6243f1f789aa76f81b3c321f153547aa76f81b3c321f153547bbc15413d4cb69ca7e93
2013-05-30 09:34:18 -05:00
Bryan Kowal
cad451315d
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: 3c98d835bf52a1addb297b24cd293abd9251eba07b24cd293abd9251eba04eb7d951e45ee9c9f6a1
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
c6150879d5
Issue #1869 ensure all uses ofdataURI in PDO use getter.
...
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f
Former-commit-id: 05e7e0551fb3865f4efc268ee5ce30191f93653d268ee5ce30191f93653d50c5c5edfa9c415e2f19
2013-05-29 17:50:50 -05:00
Nate Jensen
fde771fa01
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: 00fbfbe7e5740237c317f3258e77f7fc691cbb2ff3258e77f7fc691cbb2f6214f529a7ab10e0072d
2013-05-29 16:19:28 -05:00
Dustin Johnson
efd95f253e
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: 63ccc2c13321b8f03b1fd2d50e7d8becf3f2e300d2d50e7d8becf3f2e300151df64a6ed467832855
2013-05-29 15:54:06 -05:00
Steve Harris
70ecafa237
13.4.1-13 baseline
...
Former-commit-id: 9a7ef48967e3b8086bd087b9712009de476791fb87b9712009de476791fbb58cf237bf418f8aef56
2013-05-29 16:30:09 -04:00
