From c104cd8aa064737c9dab44bb33f6f2aaba1e579c Mon Sep 17 00:00:00 2001
From: Sangwook Ha <sangwook.ha@verizon.com>
Date: Mon, 14 Mar 2022 17:00:03 -0700
Subject: [PATCH] Rename autowire.xml

Rename autowire.xml to use the module name for consistency with
other Blueprint XML files.

Change-Id: Icb69c6cedcaa5abe9bb5559ad102b13bfeba7cbc
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
---
 .../blueprint/arbitratorreconciliation.xml    | 21 ++++++++++
 .../resources/OSGI-INF/blueprint/autowire.xml | 12 ------
 .../resources/OSGI-INF/blueprint/autowire.xml |  8 ----
 .../blueprint/device-ownership-service.xml    | 14 +++++++
 .../resources/OSGI-INF/blueprint/autowire.xml |  8 ----
 .../blueprint/reconciliation-framework.xml    | 14 +++++++
 .../src/main/resources/blueprint/autowire.xml | 23 -----------
 .../resources/blueprint/topology-manager.xml  | 40 +++++++++++++++++++
 8 files changed, 89 insertions(+), 51 deletions(-)
 create mode 100644 applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/arbitratorreconciliation.xml
 delete mode 100644 applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
 delete mode 100644 applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml
 create mode 100644 applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/device-ownership-service.xml
 delete mode 100644 applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/autowire.xml
 create mode 100644 applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/reconciliation-framework.xml
 delete mode 100644 applications/topology-manager/src/main/resources/blueprint/autowire.xml
 create mode 100644 applications/topology-manager/src/main/resources/blueprint/topology-manager.xml

diff --git a/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/arbitratorreconciliation.xml b/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/arbitratorreconciliation.xml
new file mode 100644
index 0000000000..a4920634d3
--- /dev/null
+++ b/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/arbitratorreconciliation.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+  <bean id="arbitratorReconciliationManagerImpl"
+        class="org.opendaylight.openflowplugin.applications.arbitratorreconciliation.impl.ArbitratorReconciliationManagerImpl"
+        init-method="start"
+        destroy-method="close">
+    <argument ref="reconciliationManager"/>
+    <argument ref="rpcProviderService"/>
+    <argument ref="rpcConsumerRegistry"/>
+    <argument ref="upgradeState"/>
+  </bean>
+
+  <reference id="reconciliationManager"
+             interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
+  <reference id="rpcProviderService"
+             interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
+  <reference id="rpcConsumerRegistry"
+             interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>
+  <reference id="upgradeState"
+             interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
+</blueprint>
diff --git a/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
deleted file mode 100644
index 83c323e691..0000000000
--- a/applications/arbitratorreconciliation/impl/src/main/resources/OSGI-INF/blueprint/autowire.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="arbitratorReconciliationManagerImpl" class="org.opendaylight.openflowplugin.applications.arbitratorreconciliation.impl.ArbitratorReconciliationManagerImpl" init-method="start" destroy-method="close">
-        <argument ref="reconciliationManager"/>
-        <argument ref="rpcProviderService"/>
-        <argument ref="rpcConsumerRegistry"/>
-        <argument ref="upgradeState"/>
-    </bean>
-    <reference id="rpcConsumerRegistry" interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>
-    <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
-    <reference id="reconciliationManager" interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
-    <reference id="upgradeState" interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
-</blueprint>
diff --git a/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml
deleted file mode 100644
index b0d7acd308..0000000000
--- a/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="deviceOwnershipServiceImpl" class="org.opendaylight.openflowplugin.applications.deviceownershipservice.impl.DeviceOwnershipServiceImpl" init-method="start" destroy-method="close">
-        <argument ref="entityOwnershipService"/>
-    </bean>
-    <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
-    <service ref="deviceOwnershipServiceImpl" interface="org.opendaylight.openflowplugin.applications.deviceownershipservice.DeviceOwnershipService"/>
-</blueprint>
diff --git a/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/device-ownership-service.xml b/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/device-ownership-service.xml
new file mode 100644
index 0000000000..6af955d9b2
--- /dev/null
+++ b/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/device-ownership-service.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+  <bean id="deviceOwnershipServiceImpl"
+        class="org.opendaylight.openflowplugin.applications.deviceownershipservice.impl.DeviceOwnershipServiceImpl"
+        init-method="start"
+        destroy-method="close">
+    <argument ref="entityOwnershipService"/>
+  </bean>
+  <service ref="deviceOwnershipServiceImpl"
+           interface="org.opendaylight.openflowplugin.applications.deviceownershipservice.DeviceOwnershipService"/>
+
+  <reference id="entityOwnershipService"
+             interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
+</blueprint>
diff --git a/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/autowire.xml
deleted file mode 100644
index 2f582f3d4a..0000000000
--- a/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/autowire.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="reconciliationManagerImpl" class="org.opendaylight.openflowplugin.applications.reconciliation.impl.ReconciliationManagerImpl" init-method="start" destroy-method="close">
-        <argument ref="mastershipChangeServiceManager"/>
-    </bean>
-    <reference id="mastershipChangeServiceManager" interface="org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager"/>
-    <service ref="reconciliationManagerImpl" interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
-</blueprint>
diff --git a/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/reconciliation-framework.xml b/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/reconciliation-framework.xml
new file mode 100644
index 0000000000..92e2ede683
--- /dev/null
+++ b/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/reconciliation-framework.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+  <bean id="reconciliationManagerImpl"
+        class="org.opendaylight.openflowplugin.applications.reconciliation.impl.ReconciliationManagerImpl"
+        init-method="start"
+        destroy-method="close">
+    <argument ref="mastershipChangeServiceManager"/>
+  </bean>
+  <service ref="reconciliationManagerImpl"
+           interface="org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationManager"/>
+
+  <reference id="mastershipChangeServiceManager"
+             interface="org.opendaylight.openflowplugin.api.openflow.mastership.MastershipChangeServiceManager"/>
+</blueprint>
diff --git a/applications/topology-manager/src/main/resources/blueprint/autowire.xml b/applications/topology-manager/src/main/resources/blueprint/autowire.xml
deleted file mode 100644
index 8a351717c2..0000000000
--- a/applications/topology-manager/src/main/resources/blueprint/autowire.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <bean id="flowCapableTopologyProvider" class="org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableTopologyProvider" init-method="start" destroy-method="close">
-        <argument ref="dataBroker"/>
-        <argument ref="notificationService"/>
-        <argument ref="operationProcessor"/>
-        <argument ref="clusterSingletonServiceProvider"/>
-    </bean>
-    <bean id="nodeChangeListenerImpl" class="org.opendaylight.openflowplugin.applications.topology.manager.NodeChangeListenerImpl" destroy-method="close">
-        <argument ref="dataBroker"/>
-        <argument ref="operationProcessor"/>
-    </bean>
-    <bean id="operationProcessor" class="org.opendaylight.openflowplugin.applications.topology.manager.OperationProcessor" init-method="start" destroy-method="close">
-        <argument ref="dataBroker"/>
-    </bean>
-    <bean id="terminationPointChangeListenerImpl" class="org.opendaylight.openflowplugin.applications.topology.manager.TerminationPointChangeListenerImpl" destroy-method="close">
-        <argument ref="dataBroker"/>
-        <argument ref="operationProcessor"/>
-    </bean>
-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
-    <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
-    <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
-</blueprint>
diff --git a/applications/topology-manager/src/main/resources/blueprint/topology-manager.xml b/applications/topology-manager/src/main/resources/blueprint/topology-manager.xml
new file mode 100644
index 0000000000..39b6fe077e
--- /dev/null
+++ b/applications/topology-manager/src/main/resources/blueprint/topology-manager.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+  <bean id="flowCapableTopologyProvider"
+        class="org.opendaylight.openflowplugin.applications.topology.manager.FlowCapableTopologyProvider"
+        init-method="start"
+        destroy-method="close">
+    <argument ref="dataBroker"/>
+    <argument ref="notificationService"/>
+    <argument ref="operationProcessor"/>
+    <argument ref="clusterSingletonServiceProvider"/>
+  </bean>
+
+  <bean id="nodeChangeListenerImpl"
+        class="org.opendaylight.openflowplugin.applications.topology.manager.NodeChangeListenerImpl"
+        destroy-method="close">
+    <argument ref="dataBroker"/>
+    <argument ref="operationProcessor"/>
+  </bean>
+
+  <bean id="terminationPointChangeListenerImpl"
+        class="org.opendaylight.openflowplugin.applications.topology.manager.TerminationPointChangeListenerImpl"
+        destroy-method="close">
+    <argument ref="dataBroker"/>
+    <argument ref="operationProcessor"/>
+  </bean>
+
+  <bean id="operationProcessor"
+        class="org.opendaylight.openflowplugin.applications.topology.manager.OperationProcessor"
+        init-method="start"
+        destroy-method="close">
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <reference id="dataBroker"
+             interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="notificationService"
+             interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
+  <reference id="clusterSingletonServiceProvider"
+             interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
+</blueprint>
-- 
2.36.6