Commit graph

1181 commits

Author SHA1 Message Date
Dustin Johnson
c4446d26f1 Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
Former-commit-id: 37b7e400ea [formerly 3198277096 [formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]
Former-commit-id: 3198277096
Former-commit-id: a98b19c824
2013-06-04 14:22:59 -05:00
Benjamin Phillippe
5b9eecc8b8 Issue #2022 Modifications to subscription last run time
and notificationservers

Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea

Former-commit-id: 1cec0fab74 [formerly f00d8ae721 [formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]
Former-commit-id: f00d8ae721
Former-commit-id: 0862f2b7d3
2013-06-04 14:19:09 -05:00
Richard Peter
c9c02248b3 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: 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]
Former-commit-id: 192e5b9be8
Former-commit-id: f13177a981
2013-06-04 14:06:53 -05:00
Dustin Johnson
57b3706e5d Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63

Former-commit-id: bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]
Former-commit-id: d47da65262
Former-commit-id: d81592b575
2013-06-03 14:54:53 -05:00
Benjamin Phillippe
5450a58ca6 Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

Former-commit-id: a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]
Former-commit-id: 1e413c68f6
Former-commit-id: 2c147fe159
2013-06-03 10:26:36 -05:00
Ron Anderson
9e6969eccb Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]
Former-commit-id: fb5d432669
Former-commit-id: d0897c31d8
2013-06-03 07:45:02 -05:00
Dave Hladky
87e81a8b1b Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b

Former-commit-id: fa8ea8ecca [formerly 2f67b74318 [formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]
Former-commit-id: 2f67b74318
Former-commit-id: 39f357570b
2013-05-31 15:27:45 -05:00
Richard Peter
168e447d81 Issue #2058: Update obsPurgeRules.xml and sfcobsPurgeRules.xml
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c

Former-commit-id: 5a8fe397b2 [formerly 948d1aabfe [formerly ea807c13a7cf0ff8a561feb46c99e649eb5254a0]]
Former-commit-id: 948d1aabfe
Former-commit-id: 7693aef3db
2013-05-31 14:43:43 -05:00
Richard Peter
1d378a49c5 Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: fdcf086681 [formerly c2e1b72f9b [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]
Former-commit-id: c2e1b72f9b
Former-commit-id: 91bfa4b37a
2013-05-31 13:01:52 -05:00
Dustin Johnson
35e1c84a01 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: 87605571b2 [formerly 2687ebafd6 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]
Former-commit-id: 2687ebafd6
Former-commit-id: ba48f66886
2013-05-31 12:43:49 -05:00
David Gillingham
483665612d Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: a11ef45913 [formerly 5b9094275d [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]
Former-commit-id: 5b9094275d
Former-commit-id: 3ec84b8f18
2013-05-31 12:25:19 -05:00
Dustin Johnson
174df7bdd6 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: 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]
Former-commit-id: 4a8adeb80a
Former-commit-id: 6234417095
2013-05-31 12:19:07 -05:00
Ron Anderson
7f15e7e7ab Merge "Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
Former-commit-id: c3f8ab24ea [formerly 7e1d2d273f [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]
Former-commit-id: 7e1d2d273f
Former-commit-id: 1b9e0c2047
2013-05-31 12:09:49 -05:00
David Gillingham
6fe3ffa07e Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path.
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b

Former-commit-id: cab1c849bf [formerly 3ccf091c44 [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]
Former-commit-id: 3ccf091c44
Former-commit-id: 88eed9bc17
2013-05-31 10:42:51 -05:00
Richard Peter
44977d565c Issue #2053: Add dx2f to capture
Former-commit-id: d4cf7a1312 [formerly d8d7c01705 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]
Former-commit-id: d8d7c01705
Former-commit-id: 345a9e4d65
2013-05-31 10:37:48 -05:00
Dustin Johnson
f6c89fa3d9 Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: 05bd3e113d [formerly fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]
Former-commit-id: fc807288a7
Former-commit-id: b4bc2ca947
2013-05-31 09:29:44 -05:00
Richard Peter
ba4d97a349 Issue #2056: Update FileLocker to handle release of ACQUIRING locks
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23

Former-commit-id: 163998df17 [formerly e63f2de395 [formerly 9097197872da18fded96e09d133132872d4dcc27]]
Former-commit-id: e63f2de395
Former-commit-id: c15635bccc
2013-05-30 17:53:17 -05:00
Richard Peter
a25207c4f5 Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
Former-commit-id: 0e4782aea5 [formerly 6487cd6578 [formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]
Former-commit-id: 6487cd6578
Former-commit-id: 6a19a0074f
2013-05-30 17:17:23 -05:00
Dustin Johnson
f3835a5670 Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]
Former-commit-id: c01ea33d5b
Former-commit-id: 54045d6b9b
2013-05-30 17:11:19 -05:00
Dave Hladky
7393abfc91 Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]
Former-commit-id: 1608d407d1
Former-commit-id: c292bf1b55
2013-05-30 17:04:16 -05:00
Roger Ferrel
cfcd38da58 Issue #1966 Changes to make manger stateless and updates for Case Creation.
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387

Former-commit-id: 3c875a6f44 [formerly c6cddc605d [formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]
Former-commit-id: c6cddc605d
Former-commit-id: d6672697aa
2013-05-30 16:35:11 -05:00
Nate Jensen
03833d148d Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
Former-commit-id: e4578ca7ba [formerly 4aa3657d1a [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]
Former-commit-id: 4aa3657d1a
Former-commit-id: 10dd7ea61f
2013-05-30 14:50:39 -05:00
Steve Harris
4e0ce194d9 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]
Former-commit-id: 3745089239
Former-commit-id: 3e66acde96
2013-05-30 14:33:24 -05:00
Ron Anderson
7d2d162be4 Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
Former-commit-id: 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]
Former-commit-id: dd10af4a8a
Former-commit-id: 79a8cd1b6f
2013-05-30 13:08:26 -05:00
Everett Kladstrup
7d7e276e2a 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: 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]
Former-commit-id: 0b2839fd43
Former-commit-id: 9541c93640
2013-05-30 13:02:49 -05:00
Dustin Johnson
b7d7d66727 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]
Former-commit-id: 7e6bdb7b70
Former-commit-id: 80309d6a4e
2013-05-30 11:32:09 -05:00
Ron Anderson
ff6fe9e225 Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: 08e09382db [formerly 6557515f64 [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]
Former-commit-id: 6557515f64
Former-commit-id: 165bc6c409
2013-05-30 11:01:07 -05:00
Dustin Johnson
0ac058008d Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]
Former-commit-id: efc3c6a2f2
Former-commit-id: 463bed7647
2013-05-30 09:49:09 -05:00
Brad Gonzales
778cf6542c 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: 321f153547 [formerly aa76f81b3c [formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]
Former-commit-id: aa76f81b3c
Former-commit-id: 6243f1f789
2013-05-30 09:34:18 -05:00
Bryan Kowal
3c98d835bf Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14

Former-commit-id: bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]
Former-commit-id: 7b24cd293a
Former-commit-id: 52a1addb29
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
05e7e0551f Issue #1869 ensure all uses ofdataURI in PDO use getter.
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]
Former-commit-id: 268ee5ce30
Former-commit-id: b3865f4efc
2013-05-29 17:50:50 -05:00
Nate Jensen
00fbfbe7e5 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: f3258e77f7
Former-commit-id: 740237c317
2013-05-29 16:19:28 -05:00
Dustin Johnson
63ccc2c133 Issue #2038 Fix deleting of multiple subscription types
Update test Spring configurations

Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e

Former-commit-id: ecf3f2e300 [formerly d2d50e7d8b [formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]
Former-commit-id: d2d50e7d8b
Former-commit-id: 21b8f03b1f
2013-05-29 15:54:06 -05:00
Nate Jensen
04d6f6654d Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
2013-05-29 14:49:43 -05:00
Nate Jensen
6a6484cbb2 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]
Former-commit-id: caf414bab0
Former-commit-id: 7059967ae9
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
ec9881b914 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]
Former-commit-id: 4747f7d319
Former-commit-id: e16dc02a54
2013-05-29 10:34:22 -05:00
Dustin Johnson
605f2d6136 Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]
Former-commit-id: 66c941fc3f
Former-commit-id: 7ca6f18405
2013-05-29 09:27:30 -05:00
Nate Jensen
cf705759bd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 82d6c03669
Former-commit-id: 808ab352c5
2013-05-29 09:20:53 -05:00
Dustin Johnson
eef3b4c750 Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]
Former-commit-id: 0a9e7ed740
Former-commit-id: c76fa3bc2a
2013-05-29 09:02:47 -05:00
Roger Ferrel
24f1c70168 Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]
Former-commit-id: cbee731447
Former-commit-id: 365af6b7ce
2013-05-28 13:21:08 -05:00
Max Schenkelberg
a91db9c1e3 Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]
Former-commit-id: 1bc4437154
Former-commit-id: 21693d6913
2013-05-28 12:59:27 -05:00
Dustin Johnson
c694d523db Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]
Former-commit-id: 2b1f75f702
Former-commit-id: f4ad0218f2
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
c2ca1551f6 Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]
Former-commit-id: 3b6156843e
Former-commit-id: cdf8e7daaa
2013-05-24 16:40:21 -05:00
Mike Duff
e3804d48ec Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]
Former-commit-id: 192ce891d0
Former-commit-id: 80b1f95f0c
2013-05-24 09:20:55 -05:00
Richard Peter
7aec695890 Merge "Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1
Former-commit-id: 732ae3c832 [formerly 979cc8c181 [formerly 09ec82babbc567bea671b606f3b45e8923c6e831]]
Former-commit-id: 979cc8c181
Former-commit-id: 344765c61d
2013-05-23 18:10:58 -05:00
Ron Anderson
f9bedd3aec Merge "Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
Former-commit-id: 57c452b085 [formerly c0fffc630d [formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]
Former-commit-id: c0fffc630d
Former-commit-id: 1eb1cffa15
2013-05-23 12:12:39 -05:00
Richard Peter
cbfe9772c5 Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c

Former-commit-id: 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]
Former-commit-id: b599745012
Former-commit-id: d5c0b86b7a
2013-05-23 11:50:34 -05:00
Nate Jensen
e8ebe1a123 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
2013-05-23 11:20:40 -05:00
Nate Jensen
d7f5eea402 Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]
Former-commit-id: b8f3307f50
Former-commit-id: 876d741ab8
2013-05-23 10:43:15 -05:00
Richard Peter
25ace04a31 Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]
Former-commit-id: 57933400b9
Former-commit-id: edd70dfe47
2013-05-23 10:10:51 -05:00