Consolidate blueprint XML files for of-switch-config-pusher

There are two Blueprint XML files cross-referencing between them.
Merge them into a single file for better readability.

Change-Id: I903989a3251ab69c50c36498522c50fc16739414
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/autowire.xml
deleted file mode 100644 (file)
index 3fbc553..0000000
--- a/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/autowire.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="defaultConfigPusher" class="org.opendaylight.openflowplugin.openflow.ofswitch.config.DefaultConfigPusher" init-method="start" destroy-method="close">
-        <argument ref="nodeConfigService"/>
-        <argument ref="dataBroker"/>
-        <argument ref="deviceOwnershipService"/>
-    </bean>
-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
-    <reference id="deviceOwnershipService" interface="org.opendaylight.openflowplugin.applications.deviceownershipservice.DeviceOwnershipService"/>
-</blueprint>

diff --git a/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/of-switch-config-pusher.xml b/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/of-switch-config-pusher.xml
index e328ede6559199c4ade0abc3d78188a94a907a75..578a8797641974edc19523ff02422d031e5d8772 100644 (file)
--- a/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/of-switch-config-pusher.xml
+++ b/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/of-switch-config-pusher.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           odl:use-default-for-reference-types="true">
+  <bean id="defaultConfigPusher"
+        class="org.opendaylight.openflowplugin.openflow.ofswitch.config.DefaultConfigPusher"
+        init-method="start"
+        destroy-method="close">
+    <argument ref="nodeConfigService"/>
+    <argument ref="dataBroker"/>
+    <argument ref="deviceOwnershipService"/>
+  </bean>
 
-  <odl:rpc-service id="nodeConfigService" interface="org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.NodeConfigService"/>
+  <odl:rpc-service id="nodeConfigService"
+                   interface="org.opendaylight.yang.gen.v1.urn.opendaylight.module.config.rev141015.NodeConfigService"/>
 
+  <reference id="dataBroker"
+             interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="deviceOwnershipService"
+             interface="org.opendaylight.openflowplugin.applications.deviceownershipservice.DeviceOwnershipService"/>
 </blueprint>