Code Review / netconf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump versions to 4.0.0-SNAPSHOT
[netconf.git] / restconf / restconf-nb-bierman02 / src / main / resources / OSGI-INF / blueprint / restconf-config.xml
diff --git a/restconf/restconf-nb-bierman02/src/main/resources/OSGI-INF/blueprint/restconf-config.xml b/restconf/restconf-nb-bierman02/src/main/resources/OSGI-INF/blueprint/restconf-config.xml
index cad9c3d6a0b73c5306f5eceb31bf81ead2a39f02..ab235e7c303b8c6986c1312c906f0ae013766b63 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/resources/OSGI-INF/blueprint/restconf-config.xml
+++ b/restconf/restconf-nb-bierman02/src/main/resources/OSGI-INF/blueprint/restconf-config.xml
@@ -7,13 +7,8 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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"
-           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.4.0"
-           odl:use-default-for-reference-types="true">
-
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
   <!-- Restconf providers -->
-
   <cm:property-placeholder persistent-id="org.opendaylight.restconf" update-strategy="reload">
     <cm:default-properties>
       <cm:property name="websocket-address" value="0.0.0.0"/>
@@ -21,28 +16,7 @@
     </cm:default-properties>
   </cm:property-placeholder>
 
-  <!--
-    This cfg file defines the type of the DOMDataBroker service to use. 'default' indicates to use
-    the default DOMDataBroker provided by MD-SAL. This setting is useful for providing a custom
-    DOMDataBroker implementation that does, e.g., validation or additional security checking on
-    top of the default DOMDataBroker.
-  -->
-  <cm:property-placeholder persistent-id="org.opendaylight.restconf.databroker"
-        placeholder-prefix = "@{" placeholder-suffix = "}" update-strategy="reload">
-    <cm:default-properties>
-      <cm:property name="databroker-service-type" value="default"/>
-    </cm:default-properties>
-  </cm:property-placeholder>
-
-  <reference id="schemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
-  <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"
-          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">
+  <bean id="webSocketPort" class="org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber" factory-method="getDefaultInstance">
     <argument value="${websocket-port}"/>
   </bean>
 
@@ -50,76 +24,55 @@
     <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="domMountPointService"/>
-    <argument ref="domSchemaService"/>
+  <bean id="restconfProviderDraft02" class="org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl"
+          init-method="start" destroy-method="close">
+    <argument ref="statisticsRestconfServiceWrapper"/>
+    <argument ref="webSocketAddress"/>
+    <argument ref="webSocketPort"/>
   </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"/>
+  <bean id="brokerFacade" class="org.opendaylight.netconf.sal.restconf.impl.BrokerFacade" destroy-method="close">
+    <argument ref="dOMRpcService"/>
+    <argument ref="dOMDataBroker"/>
+    <argument ref="dOMNotificationService"/>
     <argument ref="controllerContext"/>
   </bean>
-
-  <bean id="restconfImpl" class="org.opendaylight.netconf.sal.restconf.impl.RestconfImpl"
-      factory-method="newInstance">
-    <argument ref="brokerFacade"/>
-    <argument ref="controllerContext"/>
+  <bean id="controllerContext" class="org.opendaylight.netconf.sal.restconf.impl.ControllerContext" destroy-method="close">
+    <argument ref="dOMSchemaService"/>
+    <argument ref="dOMMountPointService"/>
+    <argument ref="dOMSchemaService"/>
   </bean>
-
-  <bean id="statsServiceWrapper" class="org.opendaylight.netconf.sal.restconf.impl.StatisticsRestconfServiceWrapper"
-      factory-method="newInstance">
+  <bean id="jSONRestconfServiceImpl" class="org.opendaylight.netconf.sal.restconf.impl.JSONRestconfServiceImpl">
+    <argument ref="controllerContext"/>
     <argument ref="restconfImpl"/>
   </bean>
-
-  <bean id="restconfProviderDraft02" class="org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl"
-          init-method="start" destroy-method="close">
-    <argument ref="statsServiceWrapper"/>
-    <argument ref="webSocketAddress"/>
-    <argument ref="webSocketPort"/>
-  </bean>
-
   <bean id="restconfApplication" class="org.opendaylight.netconf.sal.rest.impl.RestconfApplication">
     <argument ref="controllerContext"/>
-    <argument ref="statsServiceWrapper"/>
+    <argument ref="statisticsRestconfServiceWrapper"/>
   </bean>
-
-  <!-- JSONRestconfService -->
-  <bean id="jsonRestconfServiceDraft02"
-      class="org.opendaylight.netconf.sal.restconf.impl.JSONRestconfServiceImpl"
-      destroy-method="close">
+  <bean id="restconfImpl" class="org.opendaylight.netconf.sal.restconf.impl.RestconfImpl">
+    <argument ref="brokerFacade"/>
     <argument ref="controllerContext"/>
+  </bean>
+  <bean id="statisticsRestconfServiceWrapper" class="org.opendaylight.netconf.sal.restconf.impl.StatisticsRestconfServiceWrapper">
     <argument ref="restconfImpl"/>
   </bean>
-
-  <service ref="jsonRestconfServiceDraft02" odl:type="default"
-      interface="org.opendaylight.netconf.sal.restconf.api.JSONRestconfService" />
-
-  <!-- Bierman02WebRegistrar -->
-
-  <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="webRegistrar" class="org.opendaylight.netconf.sal.restconf.web.Bierman02WebRegistrarImpl"
-          destroy-method="close">
+  <bean id="webInitializer" class="org.opendaylight.netconf.sal.restconf.web.WebInitializer" destroy-method="close">
     <argument ref="webServer"/>
     <argument ref="webContextSecurer"/>
     <argument ref="servletSupport"/>
     <argument ref="restconfApplication"/>
-    <argument ref="customFilterAdapterConfig"/>
+    <argument ref="customFilterAdapterConfiguration"/>
   </bean>
 
-  <service ref="webRegistrar"
-      interface="org.opendaylight.netconf.sal.restconf.web.Bierman02WebRegistrar" />
-
+  <reference id="customFilterAdapterConfiguration" interface="org.opendaylight.aaa.filterchain.configuration.CustomFilterAdapterConfiguration"/>
+  <reference id="webContextSecurer" interface="org.opendaylight.aaa.web.WebContextSecurer"/>
+  <reference id="webServer" interface="org.opendaylight.aaa.web.WebServer"/>
+  <reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport"/>
+  <reference id="dOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"/>
+  <reference id="dOMMountPointService" interface="org.opendaylight.mdsal.dom.api.DOMMountPointService"/>
+  <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"/>
+  <service ref="jSONRestconfServiceImpl" interface="org.opendaylight.netconf.sal.restconf.api.JSONRestconfService"/>
 </blueprint>
Netconf