introduce Rfc8040RestConfWiring for standalone (simple) environments

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

diff --git a/restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml b/restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
index 758a0ed8e2dfdf16d77a0371e42565a4d275d2ce..b009a9ae6439a6d938ce54ebc5d73d13e9020775 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
+++ b/restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml
@@ -26,88 +26,12 @@
     </cm:default-properties>
   </cm:property-placeholder>
 
-  <reference id="domRpcService" interface="org.opendaylight.mdsal.dom.api.DOMRpcService"/>
-  <reference id="domMountPointService" interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"/>
-  <reference id="domNotificationService" interface="org.opendaylight.mdsal.dom.api.DOMNotificationService"/>
-  <reference id="domDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
+  <reference id="dOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
           ext:filter="(type=@{databroker-service-type})"/>
-  <reference id="domSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
 
-  <bean id="transactionChainHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.TransactionChainHandler"
-          destroy-method="close">
-    <argument ref="domDataBroker"/>
-  </bean>
+  <bean id="servicesWrapper" factory-ref="rfc8040RestConfWiring" factory-method="getServicesWrapper" />
 
-  <bean id="schemaContextHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler"
-      factory-method="newInstance" init-method="init" destroy-method="close">
-    <argument ref="transactionChainHandler"/>
-    <argument ref="domSchemaService"/>
-  </bean>
-
-  <bean id="mountPointServiceHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.DOMMountPointServiceHandler"
-      factory-method="newInstance">
-    <argument ref="domMountPointService"/>
-  </bean>
-
-  <bean id="dataBrokerHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.DOMDataBrokerHandler">
-    <argument ref="domDataBroker"/>
-  </bean>
-
-  <bean id="rpcServiceHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.RpcServiceHandler">
-    <argument ref="domRpcService"/>
-  </bean>
-
-  <bean id="notificationServiceHandler" class="org.opendaylight.restconf.nb.rfc8040.handlers.NotificationServiceHandler">
-    <argument ref="domNotificationService"/>
-  </bean>
-
-  <bean id="servicesWrapper" class="org.opendaylight.restconf.nb.rfc8040.services.wrapper.ServicesWrapper"
-      factory-method="newInstance">
-    <argument ref="schemaContextHandler"/>
-    <argument ref="mountPointServiceHandler"/>
-    <argument ref="transactionChainHandler"/>
-    <argument ref="dataBrokerHandler"/>
-    <argument ref="rpcServiceHandler"/>
-    <argument ref="notificationServiceHandler"/>
-    <argument ref="domSchemaService"/>
-  </bean>
-
-  <bean id="restconfApplication" class="org.opendaylight.restconf.nb.rfc8040.RestconfApplication">
-    <argument ref="schemaContextHandler"/>
-    <argument ref="mountPointServiceHandler"/>
-    <argument ref="servicesWrapper"/>
-  </bean>
-
-  <!-- JSONRestconfService -->
-  <bean id="jsonRestconfService"
-      class="org.opendaylight.restconf.nb.rfc8040.rests.services.impl.JSONRestconfServiceRfc8040Impl"
-      destroy-method="close">
-    <argument ref="servicesWrapper"/>
-    <argument ref="mountPointServiceHandler"/>
-    <argument ref="schemaContextHandler"/>
-  </bean>
-
-  <service ref="jsonRestconfService" odl:type="rfc8040"
+  <service ref="jSONRestconfServiceRfc8040Impl" odl:type="rfc8040"
       interface="org.opendaylight.restconf.nb.rfc8040.rests.services.api.JSONRestconfService" />
 
-  <!-- Web app registration -->
-
-  <reference id="customFilterAdapterConfig"
-      interface="org.opendaylight.aaa.filterchain.configuration.CustomFilterAdapterConfiguration"/>
-
-  <reference id="webServer" interface="org.opendaylight.aaa.web.WebServer" />
-
-  <reference id="webContextSecurer" interface="org.opendaylight.aaa.web.WebContextSecurer" />
-
-  <reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport" />
-
-  <bean id="webInitializer" class="org.opendaylight.restconf.nb.rfc8040.web.WebInitializer"
-          destroy-method="close">
-    <argument ref="webServer"/>
-    <argument ref="webContextSecurer"/>
-    <argument ref="servletSupport"/>
-    <argument ref="restconfApplication"/>
-    <argument ref="customFilterAdapterConfig"/>
-  </bean>
-
 </blueprint>