drop 'openflow-plugin-provider-impl' odl:type

because that actually seems to be un-used (there is no other type)

This will make it easier to migrate to annotations instead XML for BP.

JIRA: OPNFLWPLUG-1046
Change-Id: I77af6065063801672bb01ca5f81dcf8aac2e8aaa
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/extension/openflowplugin-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-nicira.xml b/extension/openflowplugin-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-nicira.xml
index 922708b9d1655232539107af2a3b0769b8b59344..413bb78a49ad0c242991ff0decf12cffc9ea1a30 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-nicira.xml
+++ b/extension/openflowplugin-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-nicira.xml
@@ -5,8 +5,7 @@
            odl:use-default-for-reference-types="true">
 
     <reference id="registratorProvider"
-               interface="org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider"
-               odl:type="openflow-plugin-provider-impl"/>
+               interface="org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider"/>
 
     <bean id="niciraExtensionProvider"
           class="org.opendaylight.openflowplugin.extension.vendor.nicira.NiciraExtensionProvider"

diff --git a/extension/openflowplugin-extension-onf/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-onf.xml b/extension/openflowplugin-extension-onf/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-onf.xml
index 76f090ef747b2f656906d4d189e39dd2c4534f71..2c8998ec0167349f0be93c89e21576161bdcfba4 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-onf.xml
+++ b/extension/openflowplugin-extension-onf/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-onf.xml
@@ -15,8 +15,7 @@
                odl:type="openflow-switch-connection-provider-default-impl"/>
 
     <reference id="extensionRegistratorProvider"
-               interface="org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider"
-               odl:type="openflow-plugin-provider-impl"/>
+               interface="org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider"/>
 
     <bean id="onfExtensionProvider"
           class="org.opendaylight.openflowplugin.extension.onf.OnfExtensionProvider"
@@ -24,4 +23,4 @@
         <argument ref="switchConnectionProvider"/>
         <argument ref="extensionRegistratorProvider"/>
     </bean>
-</blueprint>
\ No newline at end of file
+</blueprint>

diff --git a/openflowplugin-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowplugin.xml b/openflowplugin-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowplugin.xml
index 88022a4dc102d22c7fc30add13dab61e76f89a98..d29aa7badd5fdb1b4717dd70a16c3a7944659a66 100644 (file)
--- a/openflowplugin-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowplugin.xml
+++ b/openflowplugin-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowplugin.xml
@@ -76,7 +76,7 @@
         <argument ref="systemReadyMonitor"/>
     </bean>
 
-    <service ref="openflowPluginProvider" odl:type="openflow-plugin-provider-impl">
+    <service ref="openflowPluginProvider">
         <interfaces>
             <value>org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider</value>
             <value>org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider</value>