Remove the ability to inject differing DOMDataBroker

[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 484de873f19883eaa7849fcec039b9d2f1823007..8446ebcec9acaa58deadd5ffd99b9f14833637f6 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
@@ -7,25 +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 -->
-  <!--
-    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>
-
   <cm:property-placeholder persistent-id="org.opendaylight.restconf.nb.rfc8040">
     <cm:default-properties>
       <cm:property name="maximum-fragment-length" value="0"/>
@@ -37,9 +20,6 @@
     </cm:default-properties>
   </cm:property-placeholder>
 
-  <reference id="dOMDataBroker" interface="org.opendaylight.mdsal.dom.api.DOMDataBroker"
-          ext:filter="(type=@{databroker-service-type})"/>
-
   <bean id="threadPoolFactory"
         class="org.opendaylight.controller.config.threadpool.util.NamingThreadPoolFactory">
     <argument value="${ping-executor-name-prefix}"/>
@@ -58,5 +38,4 @@
     <argument value="${heartbeat-interval}"/>
     <argument value="${use-sse}" />
   </bean>
-
 </blueprint>