Richard Peter
9e3baaa87a
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: ed63eaede59b2b8d388d6fa03394f5e8d91c51dd
2013-06-04 14:06:53 -05:00
Dustin Johnson
bc830e67f0
Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
...
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63
Former-commit-id: 121d9a02acfe528c524788a062c2d2034f80afe5
2013-06-03 14:54:53 -05:00
Benjamin Phillippe
a226f225fd
Issue #1931 Fixed Repository Items REST Service
...
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97
Former-commit-id: b2764126282aab128cc1465905c11686894ab1f7
2013-06-03 10:26:36 -05:00
Ron Anderson
0ae8346cfb
Merge "Issue #1759 : Add a more detailed comment in code for previous change." into omaha_13.4.1
...
Former-commit-id: b1c936f0dfb28dc543d7a83b6d0a0233866b98de
2013-06-03 07:45:02 -05:00
Dave Hladky
fa8ea8ecca
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 982daef280be6f3efe87a066fa5919be9cfeb9ec
2013-05-31 15:27:45 -05:00
Richard Peter
5a8fe397b2
Issue #2058 : Update obsPurgeRules.xml and sfcobsPurgeRules.xml
...
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c
Former-commit-id: ea807c13a7cf0ff8a561feb46c99e649eb5254a0
2013-05-31 14:43:43 -05:00
Richard Peter
fdcf086681
Issue #2053 : Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
...
Former-commit-id: 26c7862ba586d3b109bf0c6799b1ec8b12d360fe
2013-05-31 13:01:52 -05:00
Dustin Johnson
87605571b2
Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
...
Former-commit-id: 606b358ba6bfebf410151217f1a7ad92839025b0
2013-05-31 12:43:49 -05:00
David Gillingham
a11ef45913
Issue #1759 : Add a more detailed comment in code for previous change.
...
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e
Former-commit-id: 76fd66783565677c99006dd7c2b7628acd61c2a3
2013-05-31 12:25:19 -05:00
Dustin Johnson
55aeff3422
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: fc6effe4993694944d5331038d24310dec44a5d8
2013-05-31 12:19:07 -05:00
Ron Anderson
c3f8ab24ea
Merge "Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
...
Former-commit-id: 08de853f51cf46cb8b8a7b9f26b355ec59c164ab
2013-05-31 12:09:49 -05:00
David Gillingham
cab1c849bf
Issue #1759 : Prevent site-specific paths from getting stuck in IscScript's include path.
...
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b
Former-commit-id: 6ebf8b354145cac21458617b9bb4cdcbedeff7e7
2013-05-31 10:42:51 -05:00
Richard Peter
d4cf7a1312
Issue #2053 : Add dx2f to capture
...
Former-commit-id: 6bcb1c44f311370d54747785cd4fe650ca846d67
2013-05-31 10:37:48 -05:00
Dustin Johnson
05bd3e113d
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: e308ea7b1bc786832d4414369f86cc2d02f71ae2
2013-05-31 09:29:44 -05:00
Richard Peter
163998df17
Issue #2056 : Update FileLocker to handle release of ACQUIRING locks
...
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23
Former-commit-id: 9097197872da18fded96e09d133132872d4dcc27
2013-05-30 17:53:17 -05:00
Richard Peter
0e4782aea5
Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
...
Former-commit-id: a8f4dced2e1a5ed2851291627d2349b818da239d
2013-05-30 17:17:23 -05:00
Dustin Johnson
e4ecae9e7e
Merge "Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS" into development
...
Former-commit-id: f91e04da588da1714fd791ade2ecbfa826c9cdca
2013-05-30 17:11:19 -05:00
Dave Hladky
83dae4fe01
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 636bed36a4f7adc5db8b476d618ff4d67c806671
2013-05-30 17:04:16 -05:00
Roger Ferrel
3c875a6f44
Issue #1966 Changes to make manger stateless and updates for Case Creation.
...
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387
Former-commit-id: 3f43fdc896ff616915a8aa5ef986d3a82e52aa51
2013-05-30 16:35:11 -05:00
Nate Jensen
e4578ca7ba
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: 3d6d6acb67bdd0a3d1e41a66873441686ed2c895
2013-05-30 14:50:39 -05:00
Steve Harris
26bf27c70d
Issue #1871 - Merge branch 'vlab' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
Former-commit-id: 836c0d6a7873dd77dd58226fe389736652fb51a9
2013-05-30 14:33:24 -05:00
Ron Anderson
7f41d701be
Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
...
Former-commit-id: 6677e2f2af09b114066c64b465e7245d0566ee8a
2013-05-30 13:08:26 -05:00
Everett Kladstrup
4621271329
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: 792255325dd584238c47f53d5cf1d642465b53d6
2013-05-30 13:02:49 -05:00
Dustin Johnson
9c9caf00d1
Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
...
Former-commit-id: b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8
2013-05-30 11:32:09 -05:00
Ron Anderson
08e09382db
Issue #2028 Fixed date line issue in MakeHazardDialog
...
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287
Former-commit-id: 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f
2013-05-30 11:01:07 -05:00
Dustin Johnson
b99a8bc4f9
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: 2c5b357da096c9c1e2cd76560d143b8009aaba0f
2013-05-30 09:49:09 -05:00
Brad Gonzales
321f153547
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: 991622c763767a1e291be8c9f3c10da2b5fd7e32
2013-05-30 09:34:18 -05:00
Bryan Kowal
bd9251eba0
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: 19a96c99d10b540058e4d9c0d1729852dd18f1e9
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
191f93653d
Issue #1869 ensure all uses ofdataURI in PDO use getter.
...
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f
Former-commit-id: bcb8cea56a2efb9bf953c7acb474bb8046ef7570
2013-05-29 17:50:50 -05:00
Nate Jensen
fc691cbb2f
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: b0ad25ccd9e20b6bf994a3a46ce38298c363adff
2013-05-29 16:19:28 -05:00
Dustin Johnson
ecf3f2e300
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: a862a4d1b9b34b3f93e54480b9fc482a234db918
2013-05-29 15:54:06 -05:00
Nate Jensen
3f3e0a788d
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: b7b619e1a3a85ac8c5f22a36317e22e15ad557a2
2013-05-29 14:49:43 -05:00
Nate Jensen
148b20f57c
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 19d32f4ffee269e244b77988f908a8e263374430
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
d5263b2b75
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: eac19de99604769ad8d9bb4f53c6ffce95903d9a
2013-05-29 10:34:22 -05:00
Dustin Johnson
ac292f1242
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: 346f09f53275928fc43d86dd41d7edd519581caf
2013-05-29 09:27:30 -05:00
Nate Jensen
36bc35b5c8
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 281edabb772b68e80bf6a9456f3a8e19576ed7da
2013-05-29 09:20:53 -05:00
Dustin Johnson
31e01a9f9a
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: b1414f6aebda59cb6d83d1f0d0154fa4cd850953
2013-05-29 09:02:47 -05:00
Roger Ferrel
9263b54845
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
...
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: d8a510b87d026d57eb282583c4cf2f786749dc95
2013-05-28 13:21:08 -05:00
Max Schenkelberg
807e4501c8
Issue #1638 Added support for null search constraints for updates
...
Amend: Fixed comment, added SW history
Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515
Former-commit-id: 9fb8f08aa2068b9249b09ccba555907c40541217
2013-05-28 12:59:27 -05:00
Dustin Johnson
197a5cef1b
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
...
Former-commit-id: 67d23eb0edb44363cebb6e30fa71873b788582b9
2013-05-28 06:43:35 -05:00
Ben Steffensmeier
7be9ad1f8b
Issue #1869 Fix unique checking for things without dataURI and with subtables.
...
Former-commit-id: 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef
2013-05-24 16:40:21 -05:00
Mike Duff
b6b01c3e81
Issue #2020 - Implement Shared Subscriptions Cave-side.
...
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: 1e00c7f935cf22ac5064060069164af6044f2150
2013-05-24 09:20:55 -05:00
Richard Peter
732ae3c832
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: 09ec82babbc567bea671b606f3b45e8923c6e831
2013-05-23 18:10:58 -05:00
Ron Anderson
57c452b085
Merge "Issue #2025 : Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
...
Former-commit-id: 339fa8409866f8464eebaf982cdbfc3ae37a8b6b
2013-05-23 12:12:39 -05:00
Richard Peter
7349808131
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: a48084f6cd99a440fcaab025c0178cf1fa17c9bb
2013-05-23 11:50:34 -05:00
Nate Jensen
1fd2f8965f
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: a9330ce9247b05a0044778aeea46e0e986f05f2d
2013-05-23 11:20:40 -05:00
Nate Jensen
3b058175fe
Merge "Issue #1989 use camel's built-in DirectVm component" into development
...
Former-commit-id: f608d0ec297d85ba3e72c23905375f086fef2477
2013-05-23 10:43:15 -05:00
Richard Peter
9ca63e7d26
Merge "Issue #1989 fix clustered routes suspending/starting" into development
...
Former-commit-id: 6b013a490dd450de349fbe40f0fd5b8ca7a86efa
2013-05-23 10:10:51 -05:00
Nate Jensen
d7b8e04bb7
Issue #1989 use camel's built-in DirectVm component
...
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 90397159ef98097da0754a846d1f67d4839a300d
2013-05-23 10:06:28 -05:00
Greg Armendariz
a4457f8c83
Merge "Issue #1927 - patch ant includegen task" into development
...
Former-commit-id: 16a342bd89e1d087603dfa4d03f45d22524e074a
2013-05-23 09:10:11 -05:00
