Remove SwitchConnectionProviderList

[openflowplugin.git] / openflowjava / openflowjava-blueprint-config / src / main / resources / OSGI-INF / blueprint / openflowjava.xml

diff --git a/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml b/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml
index 9043183f32723c6db315ff01f1ce0c1d9ac535a2..0b8dffac68728380752352af65dc133288145085 100644 (file)
--- a/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml
+++ b/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml
@@ -1,7 +1,6 @@
 <?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">
-  <reference id="openflowPluginDiagStatusProvider" interface="org.opendaylight.openflowjava.protocol.api.connection.OpenflowDiagStatusProvider"/>
   <reference id="switchConnectionProviderFactory" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
   <!-- Create OF switch connection provider on port 6653 (default) -->
   <odl:clustered-app-config id="defaultSwitchConnConfig" default-config-file-name="default-openflow-connection-config.xml"
@@ -10,7 +9,6 @@
   </odl:clustered-app-config>
   <bean id="defaultSwitchConnProvider" factory-ref="switchConnectionProviderFactory" factory-method="newInstance">
     <argument ref="defaultSwitchConnConfig"/>
-    <argument ref="openflowPluginDiagStatusProvider"/>
   </bean>
   <service ref="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
           odl:type="openflow-switch-connection-provider-default-impl"/>
@@ -22,18 +20,7 @@
   </odl:clustered-app-config>
   <bean id="legacySwitchConnProvider" factory-ref="switchConnectionProviderFactory" factory-method="newInstance">
     <argument ref="legacySwitchConnConfig"/>
-    <argument ref="openflowPluginDiagStatusProvider"/>
   </bean>
   <service ref="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
           odl:type="openflow-switch-connection-provider-legacy-impl"/>
-
-  <bean id="switchConnectionProviders" class="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList">
-      <argument>
-          <list>
-              <ref component-id="defaultSwitchConnProvider"/>
-              <ref component-id="legacySwitchConnProvider"/>
-          </list>
-      </argument>
-  </bean>
-  <service ref="switchConnectionProviders" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList"/>
 </blueprint>