mv BP XML from org/opendaylight to OSGI-INF/

1. Blueprint XML files moved, following
   https://wiki.opendaylight.org/view/Neon_platform_upgrade#Blueprint_declarations
   find . -path '*/src/main/resources/org/opendaylight/blueprint/*.xml' -execdir sh -c "mkdir -p ../../../OSGI-INF/blueprint; git mv {} ../../../OSGI-INF/blueprint" \;

2. ditch un-used http://opendaylight.org/xmlns/blueprint/v1.0.0 namespace
   in openflow-protocol-impl bundle which has no other controller dependency;
   see related update to Wiki just made for full background.

JIRA: OPNFLWPLUG-1032
Change-Id: I222d0a8aceee10960e493b7b165b79d7dd65d4a3
Signed-off-by: gobinath <gobinath@ericsson.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/applications/bulk-o-matic/src/main/resources/org/opendaylight/blueprint/bulk-o-matic.xml b/applications/bulk-o-matic/src/main/resources/OSGI-INF/blueprint/bulk-o-matic.xml
similarity index 100%
rename from applications/bulk-o-matic/src/main/resources/org/opendaylight/blueprint/bulk-o-matic.xml
rename to applications/bulk-o-matic/src/main/resources/OSGI-INF/blueprint/bulk-o-matic.xml

diff --git a/applications/device-ownership-service/src/main/resources/org/opendaylight/blueprint/device-ownership-state-service.xml b/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/device-ownership-state-service.xml
similarity index 100%
rename from applications/device-ownership-service/src/main/resources/org/opendaylight/blueprint/device-ownership-state-service.xml
rename to applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/device-ownership-state-service.xml

diff --git a/applications/forwardingrules-manager/src/main/resources/org/opendaylight/blueprint/forwardingrules-manager.xml b/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/forwardingrules-manager.xml
similarity index 100%
rename from applications/forwardingrules-manager/src/main/resources/org/opendaylight/blueprint/forwardingrules-manager.xml
rename to applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/forwardingrules-manager.xml

diff --git a/applications/forwardingrules-sync/src/main/resources/org/opendaylight/blueprint/forwardingrules-sync.xml b/applications/forwardingrules-sync/src/main/resources/OSGI-INF/blueprint/forwardingrules-sync.xml
similarity index 100%
rename from applications/forwardingrules-sync/src/main/resources/org/opendaylight/blueprint/forwardingrules-sync.xml
rename to applications/forwardingrules-sync/src/main/resources/OSGI-INF/blueprint/forwardingrules-sync.xml

diff --git a/applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml b/applications/lldp-speaker/src/main/resources/OSGI-INF/blueprint/lldp-speaker.xml
similarity index 100%
rename from applications/lldp-speaker/src/main/resources/org/opendaylight/blueprint/lldp-speaker.xml
rename to applications/lldp-speaker/src/main/resources/OSGI-INF/blueprint/lldp-speaker.xml

diff --git a/applications/notification-supplier/src/main/resources/org/opendaylight/blueprint/notification-supplier.xml b/applications/notification-supplier/src/main/resources/OSGI-INF/blueprint/notification-supplier.xml
similarity index 100%
rename from applications/notification-supplier/src/main/resources/org/opendaylight/blueprint/notification-supplier.xml
rename to applications/notification-supplier/src/main/resources/OSGI-INF/blueprint/notification-supplier.xml

diff --git a/applications/of-switch-config-pusher/src/main/resources/org/opendaylight/blueprint/of-switch-config-pusher.xml b/applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/of-switch-config-pusher.xml
similarity index 100%
rename from applications/of-switch-config-pusher/src/main/resources/org/opendaylight/blueprint/of-switch-config-pusher.xml
rename to applications/of-switch-config-pusher/src/main/resources/OSGI-INF/blueprint/of-switch-config-pusher.xml

diff --git a/applications/reconciliation-framework/src/main/resources/org/opendaylight/blueprint/commands.xml b/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/commands.xml
similarity index 100%
rename from applications/reconciliation-framework/src/main/resources/org/opendaylight/blueprint/commands.xml
rename to applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/commands.xml

diff --git a/applications/reconciliation-framework/src/main/resources/org/opendaylight/blueprint/reconciliation-framework.xml b/applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/reconciliation-framework.xml
similarity index 100%
rename from applications/reconciliation-framework/src/main/resources/org/opendaylight/blueprint/reconciliation-framework.xml
rename to applications/reconciliation-framework/src/main/resources/OSGI-INF/blueprint/reconciliation-framework.xml

diff --git a/applications/southbound-cli/src/main/resources/org/opendaylight/blueprint/southbound-cli.xml b/applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/southbound-cli.xml
similarity index 100%
rename from applications/southbound-cli/src/main/resources/org/opendaylight/blueprint/southbound-cli.xml
rename to applications/southbound-cli/src/main/resources/OSGI-INF/blueprint/southbound-cli.xml

diff --git a/applications/table-miss-enforcer/src/main/resources/org/opendaylight/blueprint/table-miss-enforcer.xml b/applications/table-miss-enforcer/src/main/resources/OSGI-INF/blueprint/table-miss-enforcer.xml
similarity index 100%
rename from applications/table-miss-enforcer/src/main/resources/org/opendaylight/blueprint/table-miss-enforcer.xml
rename to applications/table-miss-enforcer/src/main/resources/OSGI-INF/blueprint/table-miss-enforcer.xml

diff --git a/applications/topology-lldp-discovery/src/main/resources/org/opendaylight/blueprint/topology-lldp-discovery.xml b/applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/topology-lldp-discovery.xml
similarity index 100%
rename from applications/topology-lldp-discovery/src/main/resources/org/opendaylight/blueprint/topology-lldp-discovery.xml
rename to applications/topology-lldp-discovery/src/main/resources/OSGI-INF/blueprint/topology-lldp-discovery.xml

diff --git a/applications/topology-manager/src/main/resources/org/opendaylight/blueprint/topology-manager.xml b/applications/topology-manager/src/main/resources/OSGI-INF/blueprint/topology-manager.xml
similarity index 100%
rename from applications/topology-manager/src/main/resources/org/opendaylight/blueprint/topology-manager.xml
rename to applications/topology-manager/src/main/resources/OSGI-INF/blueprint/topology-manager.xml

diff --git a/drop-test-karaf/src/main/resources/org/opendaylight/blueprint/commands.xml b/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml
similarity index 100%
rename from drop-test-karaf/src/main/resources/org/opendaylight/blueprint/commands.xml
rename to drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml

diff --git a/drop-test-karaf/src/main/resources/org/opendaylight/blueprint/drop-test-karaf.xml b/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/drop-test-karaf.xml
similarity index 100%
rename from drop-test-karaf/src/main/resources/org/opendaylight/blueprint/drop-test-karaf.xml
rename to drop-test-karaf/src/main/resources/OSGI-INF/blueprint/drop-test-karaf.xml

diff --git a/extension/openflowjava-extension-nicira/src/main/resources/org/opendaylight/blueprint/openflowjava-extension-nicira.xml b/extension/openflowjava-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowjava-extension-nicira.xml
similarity index 100%
rename from extension/openflowjava-extension-nicira/src/main/resources/org/opendaylight/blueprint/openflowjava-extension-nicira.xml
rename to extension/openflowjava-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowjava-extension-nicira.xml

diff --git a/extension/openflowplugin-extension-nicira/src/main/resources/org/opendaylight/blueprint/openflowplugin-extension-nicira.xml b/extension/openflowplugin-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-nicira.xml
similarity index 100%
rename from extension/openflowplugin-extension-nicira/src/main/resources/org/opendaylight/blueprint/openflowplugin-extension-nicira.xml
rename to extension/openflowplugin-extension-nicira/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-nicira.xml

diff --git a/extension/openflowplugin-extension-onf/src/main/resources/org/opendaylight/blueprint/openflowplugin-extension-onf.xml b/extension/openflowplugin-extension-onf/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-onf.xml
similarity index 100%
rename from extension/openflowplugin-extension-onf/src/main/resources/org/opendaylight/blueprint/openflowplugin-extension-onf.xml
rename to extension/openflowplugin-extension-onf/src/main/resources/OSGI-INF/blueprint/openflowplugin-extension-onf.xml

diff --git a/extension/test-extension/src/main/resources/org/opendaylight/blueprint/test-extension.xml b/extension/test-extension/src/main/resources/OSGI-INF/blueprint/test-extension.xml
similarity index 100%
rename from extension/test-extension/src/main/resources/org/opendaylight/blueprint/test-extension.xml
rename to extension/test-extension/src/main/resources/OSGI-INF/blueprint/test-extension.xml

diff --git a/openflowjava/openflow-protocol-impl/src/main/resources/org/opendaylight/blueprint/openflow-protocol-impl.xml b/openflowjava/openflow-protocol-impl/src/main/resources/OSGI-INF/blueprint/openflow-protocol-impl.xml
similarity index 61%
rename from openflowjava/openflow-protocol-impl/src/main/resources/org/opendaylight/blueprint/openflow-protocol-impl.xml
rename to openflowjava/openflow-protocol-impl/src/main/resources/OSGI-INF/blueprint/openflow-protocol-impl.xml
index c4ce514b7f4cb2886851b52ebd37a5456993d955..a635a84b2fca89aecf9b3aea7d95bb4586a56d99 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/resources/org/opendaylight/blueprint/openflow-protocol-impl.xml
+++ b/openflowjava/openflow-protocol-impl/src/main/resources/OSGI-INF/blueprint/openflow-protocol-impl.xml
@@ -1,9 +1,7 @@
 <?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">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
   <bean id="switchConnFactory" class="org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderFactoryImpl"/>
 
-  <service ref="switchConnFactory" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"
-          odl:type="default"/>
-</blueprint>
\ No newline at end of file
+  <service ref="switchConnFactory" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
+</blueprint>

diff --git a/openflowjava/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml b/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml
similarity index 96%
rename from openflowjava/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml
rename to openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml
index e1d3c000e375501d4fe6583f1b14778cc054a5d4..f54f1dca3779cc0b21765f02d5a54e08a32d9040 100644 (file)
--- a/openflowjava/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml
+++ b/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml
@@ -2,8 +2,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
-  <reference id="switchConnectionProviderFactory" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"
-          odl:type="default"/>
+  <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"
@@ -31,4 +30,4 @@
   <service ref="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
           odl:type="openflow-switch-connection-provider-legacy-impl"/>
 
-</blueprint>
\ No newline at end of file
+</blueprint>

diff --git a/openflowplugin-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml b/openflowplugin-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowplugin.xml
similarity index 100%
rename from openflowplugin-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
rename to openflowplugin-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowplugin.xml

diff --git a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/commands.xml b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
similarity index 100%
rename from openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/commands.xml
rename to openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/commands.xml

diff --git a/openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml b/openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml
similarity index 100%
rename from openflowplugin-impl/src/main/resources/org/opendaylight/blueprint/openflowplugin-impl.xml
rename to openflowplugin-impl/src/main/resources/OSGI-INF/blueprint/openflowplugin-impl.xml

diff --git a/samples/learning-switch/src/main/resources/org/opendaylight/blueprint/learning-switch.xml b/samples/learning-switch/src/main/resources/OSGI-INF/blueprint/learning-switch.xml
similarity index 100%
rename from samples/learning-switch/src/main/resources/org/opendaylight/blueprint/learning-switch.xml
rename to samples/learning-switch/src/main/resources/OSGI-INF/blueprint/learning-switch.xml

diff --git a/samples/sample-bundles/src/main/resources/org/opendaylight/blueprint/bundle-blueprint.xml b/samples/sample-bundles/src/main/resources/OSGI-INF/blueprint/bundle-blueprint.xml
similarity index 100%
rename from samples/sample-bundles/src/main/resources/org/opendaylight/blueprint/bundle-blueprint.xml
rename to samples/sample-bundles/src/main/resources/OSGI-INF/blueprint/bundle-blueprint.xml

diff --git a/samples/sample-consumer/src/main/resources/org/opendaylight/blueprint/bundle-blueprint.xml b/samples/sample-consumer/src/main/resources/OSGI-INF/blueprint/bundle-blueprint.xml
similarity index 100%
rename from samples/sample-consumer/src/main/resources/org/opendaylight/blueprint/bundle-blueprint.xml
rename to samples/sample-consumer/src/main/resources/OSGI-INF/blueprint/bundle-blueprint.xml

diff --git a/test-provider/src/main/resources/org/opendaylight/blueprint/test-provider.xml b/test-provider/src/main/resources/OSGI-INF/blueprint/test-provider.xml
similarity index 100%
rename from test-provider/src/main/resources/org/opendaylight/blueprint/test-provider.xml
rename to test-provider/src/main/resources/OSGI-INF/blueprint/test-provider.xml