Remove deprecated controller.sal.core.api interfaces

[controller.git] / opendaylight / md-sal / sal-dom-broker / src / main / resources / org / opendaylight / blueprint / dom-broker.xml

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 3cefd47b6c1f5008e19e3b379e70478eb337bd52..bff959c0edd8eaccf56cf2cd779c8c01c0ae2a0b 100644 (file)
--- 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>
@@ -18,12 +18,18 @@
 
   <!-- 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">
@@ -36,9 +42,14 @@
 
   <!-- DOM RPC Service -->
 
-  <bean id="domRpcRouter" class="org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter"
-          factory-method="newInstance">
-    <argument ref="schemaService"/>
+  <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">