Refactor restconf-nb blueprint

[netconf.git] / restconf / restconf-nb / src / main / resources / OSGI-INF / blueprint / restconf-bp.xml

diff --git a/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml b/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
index 2f65471e58a02a42a6f4f6c7f368439373cd74d1..2bf394bb2616c4d86565b973e121d899d44d22a7 100644 (file)
--- a/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
+++ b/restconf/restconf-nb/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
@@ -20,59 +20,6 @@
     </cm:default-properties>
   </cm:property-placeholder>
 
-  <bean id="scheduledThreadPool"
-        class="org.opendaylight.controller.config.threadpool.util.ScheduledThreadPoolWrapper">
-    <argument value="${max-thread-count}"/>
-    <argument>
-      <bean class="org.opendaylight.controller.config.threadpool.util.NamingThreadPoolFactory">
-        <argument value="${ping-executor-name-prefix}"/>
-      </bean>
-    </argument>
-  </bean>
-
-  <bean id="configuration"
-        class="org.opendaylight.restconf.nb.rfc8040.streams.Configuration">
-    <argument value="${maximum-fragment-length}"/>
-    <argument value="${idle-timeout}"/>
-    <argument value="${heartbeat-interval}"/>
-    <argument value="${use-sse}" />
-  </bean>
-
-  <bean id="webInitializer" class="org.opendaylight.restconf.nb.rfc8040.web.WebInitializer" destroy-method="close">
-    <argument ref="webServer"/>
-    <argument ref="webContextSecurer"/>
-    <argument ref="servletSupport"/>
-    <argument>
-      <bean class="org.opendaylight.restconf.nb.rfc8040.RestconfApplication">
-        <argument ref="databindProvider"/>
-        <argument ref="dOMMountPointService"/>
-        <argument ref="dOMDataBroker"/>
-        <argument ref="dOMRpcService"/>
-        <argument ref="dOMActionService"/>
-        <argument ref="dOMNotificationService"/>
-        <argument ref="dOMSchemaService"/>
-        <argument ref="configuration"/>
-      </bean>
-    </argument>
-    <argument>
-      <bean class="org.opendaylight.restconf.nb.rfc8040.DataStreamApplication">
-        <argument ref="databindProvider"/>
-        <argument ref="dOMMountPointService"/>
-        <argument>
-          <bean class="org.opendaylight.restconf.nb.rfc8040.rests.services.impl.RestconfDataStreamServiceImpl">
-            <argument ref="scheduledThreadPool"/>
-            <argument ref="configuration"/>
-          </bean>
-        </argument>
-      </bean>
-    </argument>
-    <argument ref="customFilterAdapterConfiguration"/>
-    <argument ref="webSocketInitializer"/>
-  </bean>
-  <bean id="webSocketInitializer" class="org.opendaylight.restconf.nb.rfc8040.streams.WebSocketInitializer">
-    <argument ref="scheduledThreadPool"/>
-    <argument ref="configuration"/>
-  </bean>
   <reference id="databindProvider" interface="org.opendaylight.restconf.nb.rfc8040.databind.DatabindProvider"/>
   <reference id="customFilterAdapterConfiguration" interface="org.opendaylight.aaa.filterchain.configuration.CustomFilterAdapterConfiguration"/>
   <reference id="webContextSecurer" interface="org.opendaylight.aaa.web.WebContextSecurer"/>
@@ -84,4 +31,24 @@
   <reference id="dOMNotificationService" interface="org.opendaylight.mdsal.dom.api.DOMNotificationService"/>
   <reference id="dOMRpcService" interface="org.opendaylight.mdsal.dom.api.DOMRpcService"/>
   <reference id="dOMSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
+
+  <bean id="restconfNorthbound" class="org.opendaylight.restconf.nb.rfc8040.JaxRsNorthbound" destroy-method="close">
+    <argument ref="webServer"/>
+    <argument ref="webContextSecurer"/>
+    <argument ref="servletSupport"/>
+    <argument ref="customFilterAdapterConfiguration"/>
+    <argument ref="dOMActionService"/>
+    <argument ref="dOMDataBroker"/>
+    <argument ref="dOMMountPointService"/>
+    <argument ref="dOMNotificationService"/>
+    <argument ref="dOMRpcService"/>
+    <argument ref="dOMSchemaService"/>
+    <argument ref="databindProvider"/>
+    <argument value="${ping-executor-name-prefix}"/>
+    <argument value="${max-thread-count}"/>
+    <argument value="${maximum-fragment-length}"/>
+    <argument value="${heartbeat-interval}"/>
+    <argument value="${idle-timeout}"/>
+    <argument value="${use-sse}"/>
+  </bean>
 </blueprint>