fix blueprints to let karaf inject mdsal deps

https://docs.opendaylight.org/en/latest/release-notes/upgrade-process.html#use-of-odl-type-in-blueprint-is-discouraged

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I43bf6c7d733656df2c4f0288b30e9ca777911927

diff --git a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
index 06e88827e587601fc8466ce9ce18a4176bdc416c..c44e120e378676e2ff001f833a88b5bf3ad164e0 100644 (file)
--- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
+++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
            odl:use-default-for-reference-types="true">
 
     <reference id="mountPointService" interface="org.opendaylight.mdsal.binding.api.MountPointService" />
            odl:use-default-for-reference-types="true">
 
     <reference id="mountPointService" interface="org.opendaylight.mdsal.binding.api.MountPointService" />

-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default" />
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />

 
     <bean id="deviceTransactionManager" class="org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl"
           destroy-method="preDestroy" >
 
     <bean id="deviceTransactionManager" class="org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl"
           destroy-method="preDestroy" >

diff --git a/inventory/src/main/resources/OSGI-INF/blueprint/inventory-blueprint.xml b/inventory/src/main/resources/OSGI-INF/blueprint/inventory-blueprint.xml
index 6f9d85789444d155a5c14f4282069d94968fdf9a..1889ee7b5148449a96c485ba4c12e41eff0d52d0 100644 (file)
--- a/inventory/src/main/resources/OSGI-INF/blueprint/inventory-blueprint.xml
+++ b/inventory/src/main/resources/OSGI-INF/blueprint/inventory-blueprint.xml
@@ -6,8 +6,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            odl:use-default-for-reference-types="true"  xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
 
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            odl:use-default-for-reference-types="true"  xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
 

-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"
-               odl:type="default"/>
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>

     <reference id="dataSource" interface="javax.sql.DataSource"/>
     <reference id="deviceTransactionManager"
                interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager"/>
     <reference id="dataSource" interface="javax.sql.DataSource"/>
     <reference id="deviceTransactionManager"
                interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager"/>

diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
index 2d1097941e78f5ec75d9212e8b50eafb54139865..4f310e4cd9522d3c23b2a17820d139fcaad6f827 100644 (file)
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -6,7 +6,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
     odl:use-default-for-reference-types="true">
 
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
     odl:use-default-for-reference-types="true">
 

-    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" odl:type="default" />
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />

     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
     <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
     <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />
     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
     <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
     <reference id="portMapping" interface="org.opendaylight.transportpce.common.mapping.PortMapping" />

diff --git a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
index 1602c29236f6c9b064936bedc3bdfc9edf6ecafd..1460aec5b4373f53c2fcd780a171dfcbf8fc93f9 100644 (file)
--- a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
+++ b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
@@ -12,8 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       odl:use-default-for-reference-types="true">
 
   <reference id="dataBroker"
       odl:use-default-for-reference-types="true">
 
   <reference id="dataBroker"

-        interface="org.opendaylight.mdsal.binding.api.DataBroker"
-        odl:type="default" />
+        interface="org.opendaylight.mdsal.binding.api.DataBroker"/>

   <reference id="rpcProviderService"
         interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
   <reference id="openRoadmInterfaces"
   <reference id="rpcProviderService"
         interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
   <reference id="openRoadmInterfaces"

diff --git a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
index 7caaa39fe7cbf92145739fcce816a3c3e8102139..1646a68a15b05b573984d32d23981713138b9b97 100755 (executable)
--- a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
+++ b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
@@ -16,15 +16,13 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
   <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
 
   <reference id="dataBroker"
   <reference id="networkTransactionImpl" interface="org.opendaylight.transportpce.common.network.NetworkTransactionService" />
 
   <reference id="dataBroker"

-        interface="org.opendaylight.mdsal.binding.api.DataBroker"
-        odl:type="default"/>
+        interface="org.opendaylight.mdsal.binding.api.DataBroker"/>

 
   <reference id="rpcService"
         interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
   <reference id="notificationPublishService"
 
   <reference id="rpcService"
         interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
   <reference id="notificationPublishService"

-        interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
-        odl:type="default" />
+        interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>

 
   <bean id="pceServiceImpl"
         class="org.opendaylight.transportpce.pce.service.PathComputationServiceImpl"
 
   <bean id="pceServiceImpl"
         class="org.opendaylight.transportpce.pce.service.PathComputationServiceImpl"

diff --git a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
index 300a5b1324fa1471bcab49b49e36f1df4adfb66e..0196d940016702e8f9788bb6fafe45e1b699bcd4 100644 (file)
--- a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
+++ b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
@@ -11,11 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
 
   xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
   odl:use-default-for-reference-types="true">
 

- <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"
-        odl:type="default" />
+ <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>

   <reference id="notificationPublishService"
   <reference id="notificationPublishService"

-        interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
-        odl:type="default" />
+        interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>

   <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
   <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
   <reference id="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />
   <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />
   <reference id="deviceTransactionManager" interface="org.opendaylight.transportpce.common.device.DeviceTransactionManager" />
   <reference id="openRoadmInterfaces" interface="org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces" />

diff --git a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
index 0a6bcdfb4f911b9cdb221c1e42218360577aec7d..1ae0718773b94c03374a3fb415ba80e46b308c15 100644 (file)
--- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
+++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
@@ -17,16 +17,13 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <reference id="dataBroker"
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <reference id="dataBroker"

-          interface="org.opendaylight.mdsal.binding.api.DataBroker"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.DataBroker"/>

 
     <reference id="notificationService"
 
     <reference id="notificationService"

-          interface="org.opendaylight.mdsal.binding.api.NotificationService"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.NotificationService"/>

 
     <reference id="notificationPublishService"
 
     <reference id="notificationPublishService"

-          interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.NotificationPublishService"/>

 
     <reference id="pathComputationService"
           interface="org.opendaylight.transportpce.pce.service.PathComputationService"/>
 
     <reference id="pathComputationService"
           interface="org.opendaylight.transportpce.pce.service.PathComputationService"/>

diff --git a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
index 58d876d0f71c218cc4ce58ddf21ccc232bf77deb..75aa579324f679821af3cb1edc1c17e911068b3b 100644 (file)
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -14,8 +14,7 @@ Author: Gilles Thouenon <gilles.thouenon@orange.com>
   odl:use-default-for-reference-types="true">
 
     <reference id="dataBroker"
   odl:use-default-for-reference-types="true">
 
     <reference id="dataBroker"

-          interface="org.opendaylight.mdsal.binding.api.DataBroker"
-          odl:type="default" />
+          interface="org.opendaylight.mdsal.binding.api.DataBroker"/>

 
     <reference id="rpcProviderService"
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
 
     <reference id="rpcProviderService"
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>