move trace impl-blueprint.xml DI into TraceBindingBrokerWiring

[controller.git] / opendaylight / md-sal / mdsal-trace / binding-impl / src / main / resources / org / opendaylight / blueprint / impl-blueprint.xml

diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 6f362132c6bc9f253d06d9b133c651ce22f9a62e..30b8a997464e5003137aa2f2637df88a9cd3c57a 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/opendaylight/md-sal/mdsal-trace/binding-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -12,28 +12,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
 
+  <reference id="adapterFactory" interface="org.opendaylight.controller.md.sal.binding.spi.AdapterFactory"/>
+
   <reference id="tracingDefaultDOMBroker"
       interface="org.opendaylight.controller.md.sal.trace.api.TracingDOMDataBroker"
       odl:type="default" />
 
-  <reference id="adapterFactory" interface="org.opendaylight.controller.md.sal.binding.spi.AdapterFactory"/>
-
-  <bean id="tracingBindingDataBroker" factory-ref="adapterFactory" factory-method="createDataBroker">
-    <argument ref="tracingDefaultDOMBroker"/>
-  </bean>
-
-  <service id="tracingBindingDataBrokerSvc" ref="tracingBindingDataBroker"
-            interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-            odl:type="default" ranking="10"/>
-
   <reference id="tracingPingPongDOMDataBroker"
       interface="org.opendaylight.controller.md.sal.trace.api.TracingDOMDataBroker"
       odl:type="pingpong"/>
 
-  <bean id="bindingTracingPingPongDataBroker" factory-ref="adapterFactory" factory-method="createDataBroker">
+  <bean id="wiring" class="org.opendaylight.controller.md.sal.trace.binding.impl.TracingBindingBrokerWiring">
+    <argument ref="tracingDefaultDOMBroker"/>
     <argument ref="tracingPingPongDOMDataBroker"/>
+    <argument ref="adapterFactory"/>
   </bean>
 
-  <service ref="bindingTracingPingPongDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-                                                                                    odl:type="pingpong" ranking="10"/>
+  <bean id="tracingBindingDataBroker" factory-ref="wiring" factory-method="getTracingDataBroker" />
+  <service id="tracingBindingDataBrokerSvc" ref="tracingBindingDataBroker"
+           interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+           odl:type="default" ranking="10"/>
+
+  <bean id="bindingTracingPingPongDataBroker" factory-ref="wiring" factory-method="getTracingPingPongDataBroker" />
+  <service ref="bindingTracingPingPongDataBroker"
+           interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+           odl:type="pingpong" ranking="10"/>
 </blueprint>