Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1

Former-commit-id: ef378fe862 [formerly dc6e307895] [formerly 8f0bd2bb84] [formerly 8f0bd2bb84 [formerly 67d5cb52ae]] [formerly 822f1a20b0 [formerly 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly afd5131062926a78942db59f35a5c2e719a542da]]]]
Former-commit-id: 822f1a20b0
Former-commit-id: c220e07d428f412cf9b156aa2aca962a673c7ec4 [formerly 0cf3789fe064185f8bdfb1456506f24980b4e4f4] [formerly 975f93d6cf [formerly 0a8312b09d]]
Former-commit-id: 975f93d6cf
Former-commit-id: 5d22759e9d
This commit is contained in:
Nate Jensen 2014-08-28 14:32:57 -05:00 committed by Gerrit Code Review
commit 3ab40ede64
2 changed files with 7 additions and 1 deletions

View file

@ -299,6 +299,11 @@
<bean class="com.raytheon.uf.common.geospatial.LogRedirector" factory-method="setGeotoolsLogFactory">
<constructor-arg value="org.geotools.util.logging.Log4JLoggerFactory" />
</bean>
<bean id="spatialQueryFactory" class="com.raytheon.uf.common.geospatial.SpatialQueryFactory"
factory-method="setImplementation">
<constructor-arg value="com.raytheon.edex.common.SpatialDbQuery"/>
</bean>
<!-- Holds the registry of request routers by server key -->
<bean id="handlerRegistry" class="com.raytheon.uf.edex.requestsrv.HandlerRegistry"

View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Radar
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.radar
Bundle-Version: 1.14.1.qualifier
Eclipse-RegisterBuddy: com.raytheon.uf.common.geospatial
Eclipse-RegisterBuddy: org.geotools
Bundle-Vendor: RAYTHEON
Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
@ -18,6 +18,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
com.raytheon.uf.common.util;bundle-version="1.12.1174",
javax.persistence;bundle-version="1.0.0",
org.hibernate;bundle-version="1.0.0",
org.geotools;bundle-version="10.5.0",
com.raytheon.uf.common.numeric;bundle-version="1.14.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy