Consolidate blueprint XML files for topology-lldp-discovery

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

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

diff --git a/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/autowire.xml
deleted file mode 100644 (file)
index d04d335..0000000
--- a/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/autowire.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="lLDPActivator" class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPActivator" destroy-method="close">
-        <argument ref="notificationService"/>
-        <argument ref="lLDPDiscoveryListener"/>
-        <argument ref="topologyLldpDiscoveryConfig"/>
-    </bean>
-    <bean id="lLDPDiscoveryListener" class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPDiscoveryListener">
-        <argument ref="notificationPublishService"/>
-        <argument ref="lLDPLinkAger"/>
-        <argument ref="entityOwnershipService"/>
-    </bean>
-    <bean id="lLDPLinkAger" class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPLinkAger" destroy-method="close">
-        <argument ref="topologyLldpDiscoveryConfig"/>
-        <argument ref="notificationPublishService"/>
-        <argument ref="configurationService"/>
-        <argument ref="entityOwnershipService"/>
-        <argument ref="dataBroker"/>
-    </bean>
-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
-    <reference id="notificationPublishService" interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
-    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
-    <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
-    <reference id="configurationService" interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
-</blueprint>

diff --git a/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/topology-lldp-discovery.xml b/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/topology-lldp-discovery.xml
index ad552b5e9167aaf3db7d3614d208b26101afd861..3aaf0f95861de06795632c7d9ff6e29f069253c2 100644 (file)
--- a/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/topology-lldp-discovery.xml
+++ b/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/topology-lldp-discovery.xml
@@ -1,11 +1,34 @@
 <?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"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
         odl:use-default-for-reference-types="true">
+  <bean id="lLDPActivator"
+        class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPActivator"
+        destroy-method="close">
+    <argument ref="notificationService"/>
+    <argument ref="lLDPDiscoveryListener"/>
+    <argument ref="topologyLldpDiscoveryConfig"/>
+  </bean>
+
+  <bean id="lLDPDiscoveryListener"
+        class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPDiscoveryListener">
+    <argument ref="notificationPublishService"/>
+    <argument ref="lLDPLinkAger"/>
+    <argument ref="entityOwnershipService"/>
+  </bean>
+
+  <bean id="lLDPLinkAger"
+        class="org.opendaylight.openflowplugin.applications.topology.lldp.LLDPLinkAger"
+        destroy-method="close">
+    <argument ref="topologyLldpDiscoveryConfig"/>
+    <argument ref="notificationPublishService"/>
+    <argument ref="configurationService"/>
+    <argument ref="entityOwnershipService"/>
+    <argument ref="dataBroker"/>
+  </bean>
 
   <odl:clustered-app-config id="topologyLldpDiscoveryConfig"
-      binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.lldp.discovery.config.rev160511.TopologyLldpDiscoveryConfig">
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.lldp.discovery.config.rev160511.TopologyLldpDiscoveryConfig">
     <odl:default-config><![CDATA[
       <topology-lldp-discovery-config xmlns="urn:opendaylight:params:xml:ns:yang:topology-lldp-discovery:config">
         <lldp-secure-key>aa9251f8-c7c0-4322-b8d6-c3a84593bda3</lldp-secure-key>
@@ -13,4 +36,14 @@
     ]]></odl:default-config>
   </odl:clustered-app-config>
 
-</blueprint>
\ No newline at end of file
+  <reference id="notificationService"
+             interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
+  <reference id="notificationPublishService"
+             interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>
+  <reference id="entityOwnershipService"
+             interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
+  <reference id="configurationService"
+             interface="org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService"/>
+  <reference id="dataBroker"
+             interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+</blueprint>