Update netconf-topology-singleton.xml file formatting

- Inline the closing statement
- Rename to bean to be more accurate

Change-Id: I2e2052b7b86b12139b2573c0e3828730cc8d606d
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

diff --git a/netconf/netconf-topology-singleton/src/main/resources/org/opendaylight/blueprint/netconf-topology-singleton.xml b/netconf/netconf-topology-singleton/src/main/resources/org/opendaylight/blueprint/netconf-topology-singleton.xml
index 64471a1d9c113a08e5a35c9ad4d17859e0e9bb6c..8fced1956ea89d516b1ecb6c83ec60a3f3233bb8 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/resources/org/opendaylight/blueprint/netconf-topology-singleton.xml
+++ b/netconf/netconf-topology-singleton/src/main/resources/org/opendaylight/blueprint/netconf-topology-singleton.xml
@@ -9,63 +9,46 @@ 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.0.0"
            odl:use-default-for-reference-types="true">
 
     <reference id="dataBroker"
                interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
-
     <reference id="rpcRegistry"
                interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>
-
     <reference id="clusterSingletonService"
                interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
-
     <reference id="bindingAwareBroker"
-               interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"
-                />
-
+               interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"/>
     <reference id="keepAliveExecutor"
-               interface="org.opendaylight.controller.config.threadpool.ScheduledThreadPool"
-                />
-
+               interface="org.opendaylight.controller.config.threadpool.ScheduledThreadPool"/>
     <reference id="processingExecutor"
-               interface="org.opendaylight.controller.config.threadpool.ThreadPool"
-                />
-
+               interface="org.opendaylight.controller.config.threadpool.ThreadPool"/>
     <reference id="domBroker"
-               interface="org.opendaylight.controller.sal.core.api.Broker"
-                />
-
+               interface="org.opendaylight.controller.sal.core.api.Broker"/>
     <reference id="actorSystemProvider"
-               interface="org.opendaylight.controller.cluster.ActorSystemProvider"
-                />
-
+               interface="org.opendaylight.controller.cluster.ActorSystemProvider"/>
     <reference id="eventExecutor"
                interface="io.netty.util.concurrent.EventExecutor"
                odl:type="global-event-executor"/>
-
     <reference id="clientDispatcherDependency"
-               interface="org.opendaylight.netconf.client.NetconfClientDispatcher"
-               />
+               interface="org.opendaylight.netconf.client.NetconfClientDispatcher"/>
 
-    <bean id="netconfTopologyServiceProvider"
+    <bean id="netconfTopologyManager"
           class="org.opendaylight.netconf.topology.singleton.impl.NetconfTopologyManager"
           init-method="init" destroy-method="close">
-        <argument ref="dataBroker" />
-        <argument ref="rpcRegistry" />
-        <argument ref="clusterSingletonService" />
-        <argument ref="bindingAwareBroker" />
-        <argument ref="keepAliveExecutor" />
-        <argument ref="processingExecutor" />
-        <argument ref="domBroker" />
-        <argument ref="actorSystemProvider" />
-        <argument ref="eventExecutor" />
-        <argument ref="clientDispatcherDependency" />
-        <argument value="topology-netconf" />
+        <argument ref="dataBroker"/>
+        <argument ref="rpcRegistry"/>
+        <argument ref="clusterSingletonService"/>
+        <argument ref="bindingAwareBroker"/>
+        <argument ref="keepAliveExecutor"/>
+        <argument ref="processingExecutor"/>
+        <argument ref="domBroker"/>
+        <argument ref="actorSystemProvider"/>
+        <argument ref="eventExecutor"/>
+        <argument ref="clientDispatcherDependency"/>
+        <argument value="topology-netconf"/>
     </bean>
-
-    <service ref="netconfTopologyServiceProvider" interface="org.opendaylight.netconf.topology.singleton.api.NetconfTopologySingletonService"
-            />
+    <service ref="netconfTopologyManager"
+             interface="org.opendaylight.netconf.topology.singleton.api.NetconfTopologySingletonService"/>
 
 </blueprint>