X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fresources%2Forg%2Fopendaylight%2Fblueprint%2Fdom-broker.xml;h=f77b7935e5c6981f856b551039b298a52a633d46;hp=b7d4d5dd22639766bf26be7b94bc200a40b51338;hb=c7515b27b065ef5f4d14ae931413ea83a4c047a8;hpb=21b1c23954208525d2b81ae66cc1d55d9f4a314d

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml b/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml
index b7d4d5dd22..f77b7935e5 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/resources/org/opendaylight/blueprint/dom-broker.xml
@@ -2,7 +2,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-    odl:restart-dependents-on-updates="true">
+    odl:restart-dependents-on-updates="false">
 
   <cm:property-placeholder persistent-id="org.opendaylight.mdsal.dom.notification" update-strategy="none">
     <cm:default-properties>
@@ -14,24 +14,22 @@
 
   <!-- Schema Service -->
 
-  <bean id="schemaServiceImpl" class="org.opendaylight.controller.sal.dom.broker.GlobalBundleScanningSchemaServiceImpl"
-          factory-method="getInstance" />
-
-  <service ref="schemaServiceImpl">
-    <interfaces>
-      <value>org.opendaylight.controller.sal.core.api.model.SchemaService</value>
-      <value>org.opendaylight.controller.sal.core.api.model.YangTextSourceProvider</value>
-    </interfaces>
-  </service>
+  <odl:static-reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
 
   <!-- DOM Notification Service -->
 
+  <reference id="domNotificationService" interface="org.opendaylight.mdsal.dom.api.DOMNotificationService"
+      odl:type="default"/>
+  <reference id="domNotificationPublishService" interface="org.opendaylight.mdsal.dom.api.DOMNotificationPublishService"
+      odl:type="default"/>
+  <reference id="domNotificationSubscriptionListenerRegistry" interface="org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListenerRegistry"
+      odl:type="default"/>
+
   <bean id="domNotificationRouter" class="org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter"
           factory-method="create">
-    <argument value="${notification-queue-depth}"/>
-    <argument value="${notification-queue-spin}"/>
-    <argument value="${notification-queue-park}"/>
-    <argument value="MILLISECONDS"/>
+    <argument ref="domNotificationService"/>
+    <argument ref="domNotificationPublishService"/>
+    <argument ref="domNotificationSubscriptionListenerRegistry"/>
   </bean>
 
   <service ref="domNotificationRouter" odl:type="default">
@@ -44,9 +42,14 @@
 
   <!-- DOM RPC Service -->
 
-  <bean id="domRpcRouter" class="org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter"
-          factory-method="newInstance">
-    <argument ref="schemaServiceImpl"/>
+  <reference id="domRpcService" interface="org.opendaylight.mdsal.dom.api.DOMRpcService"
+      odl:type="default"/>
+  <reference id="domRpcProviderService" interface="org.opendaylight.mdsal.dom.api.DOMRpcProviderService"
+      odl:type="default"/>
+
+  <bean id="domRpcRouter" class="org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter">
+    <argument ref="domRpcService"/>
+    <argument ref="domRpcProviderService"/>
   </bean>
 
   <service ref="domRpcRouter" odl:type="default">