Commit graph

100 commits

Author SHA1 Message Date
Benjamin Phillippe
093b5eda6f Issue #1678 Added support for stored query publishing and invocation on the registry
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: b84235a80a [formerly b84235a80a [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]]
Former-commit-id: b5db1f38c3
Former-commit-id: 1a492a564b
2013-11-07 18:36:46 -06:00
Benjamin Phillippe
a87445ba09 Issue #1679 Minor changes to support custom registry query plugins
Change-Id: I8ae98c80c243b710179e605a0ad1db302e86921b

Former-commit-id: 08706e9a94 [formerly 08706e9a94 [formerly 85e2b4a7717e24983b417a930402a8095d0c6021]]
Former-commit-id: 6a3fc6c059
Former-commit-id: 7f37efd83a
2013-11-05 10:50:47 -06:00
Richard Peter
25ffcdf751 Merge "Issue #1538 Moved data delivery specific web services out of registry plugins -- Added registry federation admin page -- Made registry service clients non-static" into development
Former-commit-id: bed067dc4e [formerly bed067dc4e [formerly 44665bcb3b4745532ce0febf26a6b5a000e1a0bc]]
Former-commit-id: 3d293fce88
Former-commit-id: c70e6f127b
2013-11-05 10:09:42 -06:00
Nate Jensen
96cd52250a Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9

Former-commit-id: 2413c854c0 [formerly 2413c854c0 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]
Former-commit-id: 5efd1b7218
Former-commit-id: f4cdcb2fae
2013-11-01 12:09:43 -05:00
Benjamin Phillippe
73c53ed846 Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
            -- Made registry service clients non-static

Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad

Former-commit-id: a7e53870fb [formerly a7e53870fb [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]
Former-commit-id: d8de923f8b
Former-commit-id: 221d197c01
2013-11-01 09:20:00 -05:00
Richard Peter
e4b3ff9029 Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: f75b431a40 [formerly f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]
Former-commit-id: 89b992c01c
Former-commit-id: c56806b9b7
2013-10-29 12:17:14 -05:00
Bryan Kowal
2615ad7324 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: a6d7822698 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]
Former-commit-id: cda8d04831
Former-commit-id: cc0f6832c9
2013-10-28 14:50:28 -05:00
Benjamin Phillippe
d938f48197 Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: be09ba9fcf [formerly be09ba9fcf [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]]
Former-commit-id: 0905d6ffdd
Former-commit-id: 041ce07803
2013-10-24 11:51:11 -05:00
Richard Peter
7c9a2c614c Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: 5fc3956337 [formerly 5fc3956337 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]]
Former-commit-id: 1750224476
Former-commit-id: 383a774fad
2013-10-23 16:53:22 -05:00
Richard Peter
58cb0638dc Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 7ec76c0634 [formerly 7ec76c0634 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]
Former-commit-id: 6b4c675600
Former-commit-id: 109474aec7
2013-10-23 16:41:57 -05:00
Benjamin Phillippe
5538c94240 Issue #1682 Fixed registry query that prevented deletions of subscriptions
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

Former-commit-id: 22c8ed7add [formerly 22c8ed7add [formerly b3ef0276414f5009f79e55e3b08c58daeeb56e26]]
Former-commit-id: 3a3fb00f78
Former-commit-id: c07e7fac10
2013-10-23 13:03:25 -05:00
Benjamin Phillippe
37098e59f7 Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer
Change-Id: I2d22199f9e1e35b3425e294ce3884ebb9d2cc99f

Former-commit-id: cd55f3e328 [formerly cd55f3e328 [formerly 18737abc6781a353b831d9c012cc293f60731f89]]
Former-commit-id: 68eeb03630
Former-commit-id: 84d5c28331
2013-10-23 11:05:38 -05:00
Benjamin Phillippe
bbd690038f Issue #1538 Reworked registry database connection strategy
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: b192fd81c4 [formerly b192fd81c4 [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]
Former-commit-id: ef0d0e2393
Former-commit-id: 5aa04a9a43
2013-10-23 10:48:40 -05:00
Benjamin Phillippe
e3796d0149 Issue #1682 Fixed replication/query errors and added synchronous notification delivery
Change-Id: Ia6a07c3abf6c48ef18d354dc2866ed981e6f1478

Former-commit-id: 64b0a4d065 [formerly 64b0a4d065 [formerly 2f6dc771e86cf290bb72743f1855f02c616e57d5]]
Former-commit-id: d94f22fda8
Former-commit-id: 9153069a87
2013-10-20 16:02:10 -05:00
Benjamin Phillippe
63e7a68c79 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: a4e5cd5fd7 [formerly a4e5cd5fd7 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]]
Former-commit-id: ed23a786d6
Former-commit-id: a51d2fe3b9
2013-10-18 09:20:40 -05:00
Dave Hladky
8a1f070927 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: 6076f46549 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]
Former-commit-id: 477fbd3d59
Former-commit-id: 639019eff1
2013-10-16 09:06:00 -05:00
Benjamin Phillippe
b25530ea61 Issue #2385 Fixed subscription backup web page
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf

Former-commit-id: 2759456eb4 [formerly 2759456eb4 [formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: 323d9f40da
2013-10-07 09:52:47 -05:00
Benjamin Phillippe
6e249902d4 Issue #2191 Fixing Registry Federation
Change-Id: Ibf3dec6af45424bc8678a37f00b070d3032bb7de

Former-commit-id: f76c747a01 [formerly f76c747a01 [formerly 985d2d02c2191eadcba59af4b16ad3d7e15de6d6]]
Former-commit-id: ac44137242
Former-commit-id: cc1c27ea93
2013-09-30 10:16:03 -05:00
Benjamin Phillippe
eb665c2d99 Issue #2385 Add capability to backup/restore data delivery subscriptions
Change-Id: I281dcf3259f3db50feabef40574bdb4487c95c7e

Former-commit-id: 344dd71813 [formerly 344dd71813 [formerly 7eb5c27fcbcd4fb52e9776e5ed2e6f16248922e1]]
Former-commit-id: 1d2b59c0a2
Former-commit-id: 9c4e183f91
2013-09-23 11:20:20 -05:00
Benjamin Phillippe
e001eb2e65 Issue #1705 Added support for registry object references
Change-Id: If489dcf41f02257ceb31bab1f5a917c3e6884252

Former-commit-id: 6fd5f4a8a8 [formerly 6fd5f4a8a8 [formerly a1b3a525cafd0759dfed9a387f74649bb4a3a765]]
Former-commit-id: df32d5e2e3
Former-commit-id: 79631f88f8
2013-09-18 10:58:54 -05:00
Benjamin Phillippe
563ddbff2a Issue #1695 Minor fix to update objects in LifecycleManager
Change-Id: I56fbc283f560d38aa5392845060050ee7264e2da

Former-commit-id: 6356110226 [formerly 6356110226 [formerly de0c63581e75c16445d8fd87aca5be594f7732aa]]
Former-commit-id: fdd6e67a48
Former-commit-id: 4a5d7da67e
2013-09-17 10:52:45 -05:00
Benjamin Phillippe
5da28b8850 Issue #2354 Fixed replication of deleted objects
Change-Id: Ibe9d3ca094d90fdef7ecf2a317f362f2d2ba90a9

Former-commit-id: 469710c1bb [formerly 469710c1bb [formerly 8a7d76cb892102a2d7f972bca128e9186f442fd7]]
Former-commit-id: 7296b3071f
Former-commit-id: e77dc1d29a
2013-09-12 13:30:31 -05:00
Benjamin Phillippe
071304130e Issue #1538 Registry Replication cleanup and fixes
Change-Id: I03c4cd01926f648b580712de890a8d914bc3881a

Former-commit-id: 087d2b72b1 [formerly 087d2b72b1 [formerly 6fb985176f89600f096f86f3094ebdd49d63f442]]
Former-commit-id: 6dd84eebf2
Former-commit-id: 0686b22c0a
2013-09-05 16:20:46 -05:00
Dave Hladky
6cef334d9a Issue #2098 Updates for WFS/DPA improvements
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf

Former-commit-id: 0a45c77520 [formerly 0a45c77520 [formerly dc668631168388501efb8753ecb4cff8b9025456]]
Former-commit-id: ac4aeeec45
Former-commit-id: 36005754b5
2013-08-30 12:57:31 -05:00
Benjamin Phillippe
4634cadd3d Issue #1538 Federated registry fixes/modifications
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146

Former-commit-id: a96764e900 [formerly a96764e900 [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]]
Former-commit-id: b10ecfa19c
Former-commit-id: 283326197a
2013-08-28 11:41:06 -05:00
Benjamin Phillippe
b79a414f7d Issue #1693 Fixing dependencies
Change-Id: Id62a593dfa9b3d6c09e998689f199d980dda0ed9

Former-commit-id: 0d8adcade1 [formerly 0d8adcade1 [formerly 73c647449e071c9290c7b7fa57e99490960be536]]
Former-commit-id: 2f0949aa0a
Former-commit-id: 1561652425
2013-08-21 16:28:49 -05:00
Benjamin Phillippe
f2889110a7 Issue #1692 Implemented/Verified Registry LifecycleManager
- Verified submitObjects protocol
            - Added unimplemented features of removeObjects protocol
            - Implemented updateObjects protocol
            - Refactored registry error reporting
            - Fixed JUnit tests
            - Corrected @XmlRootElement tag on registry objects
            - Added capability to modify registry objects using XPath

Change-Id: Id8eea47c3c4a1e39fe88cb17530e9e6cdacd7ce2

Former-commit-id: 2403f75262 [formerly 2403f75262 [formerly 94810246b449c64457c48684df72baf6e9e8b03d]]
Former-commit-id: 1390bd8a65
Former-commit-id: d9dffafa6f
2013-08-19 13:16:13 -05:00
Benjamin Phillippe
35ee48c73b Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: 59a9aeabf0 [formerly 59a9aeabf0 [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]
Former-commit-id: 3c7ad386ed
Former-commit-id: dc2e0f6a7b
2013-08-08 09:56:35 -05:00
Benjamin Phillippe
ce5cb744d8 Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56

Former-commit-id: 73fd5ac852 [formerly 73fd5ac852 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]
Former-commit-id: 5bd0d92363
Former-commit-id: 33f601b72e
2013-08-06 11:13:01 -05:00
Richard Peter
7659b6b6e4 Merge "Issue #2191 Registry federation synchronization and garbage collection" into development
Former-commit-id: e692cc245b [formerly e692cc245b [formerly 4e3f429e5aebec59e5c15c8bea062cc62e599cc6]]
Former-commit-id: 137bb556ee
Former-commit-id: 549ffd000c
2013-08-02 14:44:16 -05:00
Dave Hladky
a6bff7d97f Issue #2236 Merged Mike's Code
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6

Former-commit-id: e21cc84d16 [formerly e21cc84d16 [formerly 7cc09247bc4166f9586867fba097b4c40577464d]]
Former-commit-id: db7c81a1df
Former-commit-id: fe9e969142
2013-07-31 16:16:47 -05:00
Benjamin Phillippe
85107159fb Issue #2191 Registry federation synchronization and garbage collection
Change-Id: Ie17468d90c5c1a2f1b708d6e69edd2d026e17633

Former-commit-id: 62d822c06b [formerly 62d822c06b [formerly b8930f3c76f6285627aa54307f08fd28c627a4b2]]
Former-commit-id: 3396e5a620
Former-commit-id: a190cfe26c
2013-07-30 09:37:41 -05:00
Richard Peter
85fc9c773b Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 15d1a6eab0 [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: c6386e306f
Former-commit-id: 12993d9539
2013-07-22 09:40:18 -05:00
Richard Peter
3a573f4256 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 7e08c04383 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]
Former-commit-id: cc7189fcb7
Former-commit-id: ea2b372343
2013-07-18 21:46:25 -05:00
Benjamin Phillippe
edcacb3dc7 Issue #2191 Fixed spring error
Change-Id: Ia010d718640d1dd24f2e635eaae07dae6fa29a72

Former-commit-id: 9f60b0b2f6 [formerly 9f60b0b2f6 [formerly 43bb45deb9075eea60ee82a66173bc7ee89d4f0a]]
Former-commit-id: 831418e2c0
Former-commit-id: 7fb8740fae
2013-07-18 12:50:10 -05:00
Max Schenkelberg
a47f187f4f Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 63421a4819 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 50825200a1
Former-commit-id: 1610826d2e
2013-07-15 14:26:15 -05:00
Dustin Johnson
f482d3f09a Issue #2195 Remove Spring name= use in constructor args
Change-Id: I00745ce0cc04ed9c7d0497063668ad127357d17d

Former-commit-id: 4cea4279e7 [formerly 4cea4279e7 [formerly 2ce8e4ebf5f67998c25cdb33ab44e169e73471b2]]
Former-commit-id: 95b61618fe
Former-commit-id: 1d11983e38
2013-07-15 13:20:44 -05:00
Benjamin Phillippe
1946a678a7 Issue #2191: Registry Garbage Collection
Change-Id: I15094a928b4f8793daab751b85a20b19b6352438

Former-commit-id: 3aebfb2956 [formerly 3aebfb2956 [formerly 6afda27e19d0ea38c547afc9a28c55525706f9f1]]
Former-commit-id: 34764a4a09
Former-commit-id: 1653b3f10c
2013-07-12 11:33:21 -05:00
Steve Harris
c183e08922 13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Dustin Johnson
c2ed1495ad Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: fac7d3a9d9 [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]
Former-commit-id: 69c09e530f
Former-commit-id: f67d02a394
2013-06-25 08:33:55 -05:00
Richard Peter
8f49eea08f Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: d262c02612 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]
Former-commit-id: b007d4a302
Former-commit-id: af1099b3fb
2013-06-24 18:51:56 -05:00
Dustin Johnson
cd12316060 Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: 9bc7c854ab [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]
Former-commit-id: 7ee918a548
Former-commit-id: 50cb2e26a2
2013-06-18 12:34:25 -05:00
Steve Harris
332a74c4de 13.5.1-2 baseline
Former-commit-id: adb779323d [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
2013-06-17 15:01:22 -04:00
Dustin Johnson
9220f1a199 Issue #2086 Move data delivery phase 3 code into AWIPS_baseline
Change-Id: I60bf6ac9d886d27c70543a0b7df24d626639fc3e

Former-commit-id: da69d3e630 [formerly da69d3e630 [formerly c213b3b5552a2b11c69965bc6edcfb8acf7fa0a8]]
Former-commit-id: 1c7d99f53f
Former-commit-id: fef2708ff5
2013-06-10 18:47:17 -05:00
Steve Harris
146c5e8940 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00
Bryan Kowal
d143d33045 Issue #1927 - webapps will now self-identify themselves
Former-commit-id: 9bd2741e22 [formerly 9bd2741e22 [formerly 67787a77b4211ff74d34be7e33d26fa439cc9492]]
Former-commit-id: 5056e2a0fa
Former-commit-id: baffa90082
2013-06-07 13:47:20 -05:00
Dustin Johnson
bebc4fdbe5 Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
Former-commit-id: 3198277096 [formerly 3198277096 [formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]
Former-commit-id: 37b7e400ea
Former-commit-id: b4a51bc24f
2013-06-04 14:22:59 -05:00
Benjamin Phillippe
585189abb1 Issue #2022 Modifications to subscription last run time
and notificationservers

Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea

Former-commit-id: f00d8ae721 [formerly f00d8ae721 [formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]
Former-commit-id: 1cec0fab74
Former-commit-id: 6e8314475e
2013-06-04 14:19:09 -05:00
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: 192e5b9be8 [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]
Former-commit-id: 9e3baaa87a
Former-commit-id: ae09db35ad
2013-06-04 14:06:53 -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: d47da65262 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]
Former-commit-id: bc830e67f0
Former-commit-id: 0b710bc166
2013-06-03 14:54:53 -05:00