Use BrokerFacade non-statically

[netconf.git] / restconf / restconf-nb-bierman02 / src / main / resources / org / opendaylight / blueprint / restconf-config.xml

diff --git a/restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml b/restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml
index 676ab128e6359bb30c962336f87f88ed20373733..4286306c21907b8171ce1b9b071d95779853aabf 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml
+++ b/restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml
@@ -43,6 +43,7 @@
   <reference id="domNotificationService" interface="org.opendaylight.controller.md.sal.dom.api.DOMNotificationService"/>
   <reference id="domDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker"
           ext:filter="(type=@{databroker-service-type})"/>
+  <reference id="domSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
 
   <bean id="webSocketPort" class="org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber">
     <argument value="${websocket-port}"/>
@@ -52,13 +53,23 @@
     <argument value="${websocket-address}"/>
   </bean>
 
-  <bean id="restconfProviderDraft02" class="org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl"
-          init-method="start" destroy-method="close">
-    <argument ref="domDataBroker"/>
+  <bean id="controllerContext" class="org.opendaylight.netconf.sal.restconf.impl.ControllerContext"
+      factory-method="newInstance" destroy-method="close">
     <argument ref="schemaService"/>
+    <argument ref="domMountPointService"/>
+    <argument ref="domSchemaService"/>
+  </bean>
+
+  <bean id="brokerFacade" class="org.opendaylight.netconf.sal.restconf.impl.BrokerFacade"
+      factory-method="newInstance" destroy-method="close">
     <argument ref="domRpcService"/>
+    <argument ref="domDataBroker"/>
     <argument ref="domNotificationService"/>
-    <argument ref="domMountPointService"/>
+    <argument ref="controllerContext"/>
+  </bean>
+
+  <bean id="restconfProviderDraft02" class="org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl"
+          init-method="start" destroy-method="close">
     <argument ref="webSocketAddress"/>
     <argument ref="webSocketPort"/>
   </bean>
@@ -66,7 +77,9 @@
   <!-- JSONRestconfService -->
   <bean id="jsonRestconfServiceDraft02"
       class="org.opendaylight.netconf.sal.restconf.impl.JSONRestconfServiceImpl"
-      destroy-method="close"/>
+      destroy-method="close">
+    <argument ref="controllerContext"/>
+  </bean>
 
   <service ref="jsonRestconfServiceDraft02" odl:type="default"
       interface="org.opendaylight.netconf.sal.restconf.api.JSONRestconfService" />