Remove no longer required service-properties

for restart OSGI CSS service

Change-Id: I65c4810ca5da9bd357dbdabb3ed413649ba8fbb1
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml b/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml
index b5bce64cb604e460eb05a69ca36ec15e1a782d78..751abb17ffbe6bfa16511bfc39af1abf2aa9fdd8 100644 (file)
--- a/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml
+++ b/bgp/rib-impl/src/main/resources/org/opendaylight/blueprint/bgp-rib.xml
@@ -11,16 +11,7 @@
           factory-method="instance" destroy-method="close"/>
 
   <service ref="BGPPeerRegistry" interface="org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry"
-          odl:type="default">
-    <!-- The following service properties specify the config system module and instance that correspond to
-         this OSGi service which enables the config system module to be restarted when this blueprint
-         container is restarted. -->
-    <service-properties>
-      <entry key="config-module-namespace" value="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl"/>
-      <entry key="config-module-name" value="strict-bgp-peer-registry"/>
-      <entry key="config-instance-name" value="global-bgp-peer-registry"/>
-    </service-properties>
-  </service>
+          odl:type="default"/>
 
   <bean id="BGPDispatcher" class="org.opendaylight.protocol.bgp.rib.impl.BGPDispatcherImpl"  destroy-method="close">
     <argument>
@@ -31,16 +22,7 @@
     <argument ref="BGPPeerRegistry"/>
   </bean>
 
-  <service ref="BGPDispatcher" interface="org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher">
-    <!-- The following service properties specify the config system module and instance that correspond to
-         this OSGi service which enables the config system module to be restarted when this blueprint
-         container is restarted. -->
-    <service-properties>
-      <entry key="config-module-namespace" value="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl"/>
-      <entry key="config-module-name" value="bgp-dispatcher-impl"/>
-      <entry key="config-instance-name" value="global-bgp-dispatcher"/>
-    </service-properties>
-  </service>
+  <service ref="BGPDispatcher" interface="org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher"/>
 
   <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="pingpong"/>
   <reference id="globalBgpExtensions" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext"/>

diff --git a/bgp/rib-spi/src/main/resources/org/opendaylight/blueprint/bgp-rib-spi.xml b/bgp/rib-spi/src/main/resources/org/opendaylight/blueprint/bgp-rib-spi.xml
index d740067a9bcdb2dd399650bc4b205459cc203508..7e85d72e067ed659cc9604c8d81281690d7b63d7 100644 (file)
--- a/bgp/rib-spi/src/main/resources/org/opendaylight/blueprint/bgp-rib-spi.xml
+++ b/bgp/rib-spi/src/main/resources/org/opendaylight/blueprint/bgp-rib-spi.xml
@@ -20,13 +20,5 @@
       <value>org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext</value>
       <value>org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext</value>
     </interfaces>
-    <!-- The following service properties specify the config system module and instance that correspond to
-         this OSGi service which enables the config system module to be restarted when this blueprint
-         container is restarted. -->
-    <service-properties>
-      <entry key="config-module-namespace" value="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi"/>
-      <entry key="config-module-name" value="bgp-rib-extensions-impl"/>
-      <entry key="config-instance-name" value="global-rib-extensions"/>
-    </service-properties>
   </service>
 </blueprint>
\ No newline at end of file

diff --git a/bmp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml b/bmp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml
index cd45ccdaca45a5a715aaac491ec12a1d5e5abde1..07a9dbcaa8593bc591689bdca8ca1e4f7bb24c2e 100644 (file)
--- a/bmp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml
+++ b/bmp/bmp-impl/src/main/resources/org/opendaylight/blueprint/bgp-bmp.xml
@@ -16,16 +16,7 @@
     <argument ref="bmpSessionFactory"/>
   </bean>
 
-  <service ref="bmpDispatcher" interface="org.opendaylight.protocol.bmp.api.BmpDispatcher">
-    <!-- The following service properties specify the config system module and instance that correspond to
-         this OSGi service which enables the config system module to be restarted when this blueprint
-         container is restarted. -->
-    <service-properties>
-      <entry key="config-module-namespace" value="urn:opendaylight:params:xml:ns:yang:controller:bmp:impl"/>
-      <entry key="config-module-name" value="bmp-dispatcher-impl"/>
-      <entry key="config-instance-name" value="global-bmp-dispatcher"/>
-    </service-properties>
-  </service>
+  <service ref="bmpDispatcher" interface="org.opendaylight.protocol.bmp.api.BmpDispatcher"/>
 
   <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" odl:type="default"/>
   <reference id="domPingPongDataBroker" interface="org.opendaylight.controller.md.sal.dom.api.DOMDataBroker" odl:type="pingpong"/>

diff --git a/pcep/topology/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml
index 0b136ed219b81cd08f11868d00b7e65ab6588d82..3e7ac4fce2f2f5eec330004a9da1ee01f1cecb31 100644 (file)
--- a/pcep/topology/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml
+++ b/pcep/topology/topology-provider/src/main/resources/org/opendaylight/blueprint/pcep-topology.xml
@@ -5,18 +5,8 @@
     <bean id="Stateful07TopologySessionListenerFactory"
           class="org.opendaylight.bgpcep.pcep.topology.provider.Stateful07TopologySessionListenerFactory"/>
     <service ref="Stateful07TopologySessionListenerFactory"
-             interface="org.opendaylight.bgpcep.pcep.topology.provider.TopologySessionListenerFactory">
-        <!-- The following service properties specify the config system module and instance that correspond to
-             this OSGi service which enables the config system module to be restarted when this blueprint
-             container is restarted. -->
-        <service-properties>
-            <entry key="config-module-namespace"
-                   value="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider"/>
-            <entry key="config-module-name" value="pcep-topology-stateful07"/>
-            <entry key="config-instance-name" value="global"/>
-        </service-properties>
-    </service>
-
+             interface="org.opendaylight.bgpcep.pcep.topology.provider.TopologySessionListenerFactory"/>
+    
     <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
                odl:type="pingpong"/>
     <reference id="rpcRegistry" interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>