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 268dfe2274767a448bfe29fb8eda80f585192e8f..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
@@ -16,6 +16,7 @@
 
   <cm:property-placeholder persistent-id="org.opendaylight.restconf" update-strategy="reload">
     <cm:default-properties>
+      <cm:property name="websocket-address" value="0.0.0.0"/>
       <cm:property name="websocket-port" value="8185"/>
     </cm:default-properties>
   </cm:property-placeholder>
@@ -42,55 +43,45 @@
   <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}"/>
   </bean>
 
-  <bean id="restconfProviderDraft02" class="org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl"
-          init-method="start" destroy-method="close">
-    <argument ref="domDataBroker"/>
+  <bean id="webSocketAddress" class="org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress">
+    <argument value="${websocket-address}"/>
+  </bean>
+
+  <bean id="controllerContext" class="org.opendaylight.netconf.sal.restconf.impl.ControllerContext"
+      factory-method="newInstance" destroy-method="close">
     <argument ref="schemaService"/>
-    <argument ref="domRpcService"/>
-    <argument ref="domNotificationService"/>
     <argument ref="domMountPointService"/>
-    <argument ref="webSocketPort"/>
+    <argument ref="domSchemaService"/>
   </bean>
 
-  <bean id="restconfProviderDraft18" class="org.opendaylight.restconf.RestConnectorProvider"
-          init-method="start" destroy-method="close">
-    <argument ref="domDataBroker"/>
-    <argument ref="schemaService"/>
+  <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>
 
-  <service ref="restconfProviderDraft18"
-      interface="org.opendaylight.netconf.sal.rest.api.RestConnector" />
+  <bean id="restconfProviderDraft02" class="org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl"
+          init-method="start" destroy-method="close">
+    <argument ref="webSocketAddress"/>
+    <argument ref="webSocketPort"/>
+  </bean>
 
   <!-- JSONRestconfService -->
-
   <bean id="jsonRestconfServiceDraft02"
       class="org.opendaylight.netconf.sal.restconf.impl.JSONRestconfServiceImpl"
-      destroy-method="close"/>
-
-  <service ref="jsonRestconfServiceDraft02" odl:type="default"
-      interface="org.opendaylight.netconf.sal.restconf.api.JSONRestconfService" />
-
-  <bean id="jsonRestconfServiceDraft18" depends-on="restconfProviderDraft18"
-      class="org.opendaylight.netconf.sal.restconf.impl.JSONRestconfServiceDraft18"
       destroy-method="close">
-    <argument>
-      <bean class="org.opendaylight.restconf.common.wrapper.services.ServicesWrapperImpl"
-          factory-method="getInstance" />
-    </argument>
-    <argument>
-      <bean factory-ref="restconfProviderDraft18" factory-method="getMountPointServiceHandler" />
-    </argument>
+    <argument ref="controllerContext"/>
   </bean>
 
-  <service ref="jsonRestconfServiceDraft18" odl:type="draft18"
+  <service ref="jsonRestconfServiceDraft02" odl:type="default"
       interface="org.opendaylight.netconf.sal.restconf.api.JSONRestconfService" />
 
 </blueprint>