Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Turn FileAkkaConfigurationReader into a component
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
resources
/
OSGI-INF
/
blueprint
/
clustered-datastore.xml
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/OSGI-INF/blueprint/clustered-datastore.xml
b/opendaylight/md-sal/sal-distributed-datastore/src/main/resources/OSGI-INF/blueprint/clustered-datastore.xml
index ac3d982729c73aa8f385a4bc873acb93aa95e669..d6fadcbb37bb0aa710857be1495f0da7b1c59c20 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/resources/OSGI-INF/blueprint/clustered-datastore.xml
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/resources/OSGI-INF/blueprint/clustered-datastore.xml
@@
-12,7
+12,11
@@
<odl:static-reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService" />
<odl:static-reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService" />
- <reference id="classLoadingStrategy" interface="org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy" />
+ <reference id="bindingSerializer" interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer"/>
+
+ <bean id="introspectorFactory" class="org.opendaylight.controller.cluster.datastore.DatastoreContextIntrospectorFactory">
+ <argument ref="bindingSerializer"/>
+ </bean>
<!-- ActorSystemProvider -->
<!-- ActorSystemProvider -->
@@
-21,17
+25,19
@@
<argument ref="blueprintBundleContext" />
</bean>
<argument ref="blueprintBundleContext" />
</bean>
- <bean id="actorSystemProps" class="org.opendaylight.controller.cluster.akka.osgi.impl.QuarantinedMonitorActorPropsFactory"
- factory-method="createProps">
- <argument ref="blueprintBundleContext" />
- </bean>
+ <reference id="akkaReader" interface="org.opendaylight.controller.cluster.common.actor.AkkaConfigurationReader"/>
- <bean id="akkaReader" class="org.opendaylight.controller.cluster.common.actor.FileAkkaConfigurationReader"/>
<bean id="akkaConfig" class="org.opendaylight.controller.cluster.akka.impl.AkkaConfigFactory"
factory-method="createAkkaConfig">
<argument ref="akkaReader" />
</bean>
<bean id="akkaConfig" class="org.opendaylight.controller.cluster.akka.impl.AkkaConfigFactory"
factory-method="createAkkaConfig">
<argument ref="akkaReader" />
</bean>
+ <bean id="actorSystemProps" class="org.opendaylight.controller.cluster.akka.osgi.impl.QuarantinedMonitorActorPropsFactory"
+ factory-method="createProps">
+ <argument ref="blueprintBundleContext" />
+ <argument ref="akkaConfig"/>
+ </bean>
+
<bean id="actorSystemProvider" class="org.opendaylight.controller.cluster.akka.impl.ActorSystemProviderImpl"
destroy-method="close">
<argument ref="bundleClassLoader" />
<bean id="actorSystemProvider" class="org.opendaylight.controller.cluster.akka.impl.ActorSystemProviderImpl"
destroy-method="close">
<argument ref="bundleClassLoader" />
@@
-50,11
+56,6
@@
<argument value="./clustered-datastore-restore"/>
</bean>
<argument value="./clustered-datastore-restore"/>
</bean>
- <bean id="introspectorFactory" class="org.opendaylight.controller.cluster.datastore.DatastoreContextIntrospectorFactory">
- <argument ref="schemaService"/>
- <argument ref="classLoadingStrategy"/>
- </bean>
-
<bean id="introspectorConfig" factory-ref="introspectorFactory" factory-method="newInstance">
<argument type="org.opendaylight.mdsal.common.api.LogicalDatastoreType" value="CONFIGURATION"/>
</bean>
<bean id="introspectorConfig" factory-ref="introspectorFactory" factory-method="newInstance">
<argument type="org.opendaylight.mdsal.common.api.LogicalDatastoreType" value="CONFIGURATION"/>
</bean>
@@
-153,13
+154,6
@@
<service ref="clusteredDOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
odl:type="default"/>
<service ref="clusteredDOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
odl:type="default"/>
- <bean id="legacyDOMDataBroker" class="org.opendaylight.controller.sal.core.compat.LegacyDOMDataBrokerAdapter">
- <argument ref="clusteredDOMDataBroker"/>
- </bean>
-
- <service ref="legacyDOMDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker"
- odl:type="default"/>
-
<!-- JMX beans for the data broker -->
<bean id="commitStatsMXBean" class="org.opendaylight.controller.cluster.datastore.jmx.mbeans.CommitStatsMXBeanImpl"
<!-- JMX beans for the data broker -->
<bean id="commitStatsMXBean" class="org.opendaylight.controller.cluster.datastore.jmx.mbeans.CommitStatsMXBeanImpl"