Remove use of ODL blueprint extensions

The only use here revolves around odl:type=default, which has been
deprecated for some time now. Eliminate these instructions and also
remove blueprint-cm namespace where it is not used.

Change-Id: I13e9ebf2749a0d5d0207de9a14c77f340f5ffd3f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 8add362595501c9c5c71920e408182c8769fdcb5..527ef648c09711b64f4b2325de19255786d2a017 100644 (file)
--- a/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
+++ b/common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
@@ -7,9 +7,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<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">
 
     <reference id="mountPointService" interface="org.opendaylight.mdsal.binding.api.MountPointService" />
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />

diff --git a/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml b/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml
index 459848e63e275d00f55b59b9934bd22c22591787..ece6f21402d06cec4c92bdf18d935c4b960caa89 100644 (file)
--- a/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml
+++ b/dmaap-client/src/main/resources/OSGI-INF/blueprint/dmaap-blueprint.xml
@@ -3,9 +3,8 @@
 <!-- Copyright © 2021 Orange and others. All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-    odl:use-default-for-reference-types="true">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
     <cm:property-placeholder persistent-id="org.opendaylight.transportpce.dmaap" update-strategy="reload">
         <cm:default-properties>
             <cm:property name="dmaap.baseUrl" value="http://localhost:8080" />
@@ -16,11 +15,11 @@
     <reference id="notificationService" interface="org.opendaylight.mdsal.binding.api.NotificationService"/>
 
     <bean id="provider"
-        class="org.opendaylight.transportpce.dmaap.client.impl.DmaapClientProvider"
-        init-method="init" destroy-method="close">
+          class="org.opendaylight.transportpce.dmaap.client.impl.DmaapClientProvider"
+          init-method="init" destroy-method="close">
         <argument ref="notificationService" />
-        <argument value="${dmaap.baseUrl}"></argument>
-        <argument value="${dmaap.username}"></argument>
-        <argument value="${dmaap.password}"></argument>
+        <argument value="${dmaap.baseUrl}" />
+        <argument value="${dmaap.username}" />
+        <argument value="${dmaap.password}" />
     </bean>
 </blueprint>

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 1889ee7b5148449a96c485ba4c12e41eff0d52d0..d242a7c1b8ec2d62265722666f23d3d7e28fba0b 100644 (file)
--- a/inventory/src/main/resources/OSGI-INF/blueprint/inventory-blueprint.xml
+++ b/inventory/src/main/resources/OSGI-INF/blueprint/inventory-blueprint.xml
@@ -3,8 +3,7 @@
 <!-- Copyright © 2016 Orange and others. All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<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">
 
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
     <reference id="dataSource" interface="javax.sql.DataSource"/>

diff --git a/nbinotifications/src/main/resources/OSGI-INF/blueprint/nobinotifications-blueprint.xml b/nbinotifications/src/main/resources/OSGI-INF/blueprint/nobinotifications-blueprint.xml
index 39bb0c041418fec801173e0a71a78bd7b2cedb18..5b0176c3a892e3eb83fd8ae4684083f857453341 100644 (file)
--- a/nbinotifications/src/main/resources/OSGI-INF/blueprint/nobinotifications-blueprint.xml
+++ b/nbinotifications/src/main/resources/OSGI-INF/blueprint/nobinotifications-blueprint.xml
@@ -3,9 +3,8 @@
 <!-- Copyright © 2020 Orange and others. All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-    odl:use-default-for-reference-types="true">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
     <cm:property-placeholder persistent-id="org.opendaylight.transportpce.nbinotifications" update-strategy="reload">
         <cm:default-properties>
             <cm:property name="suscriber.server" value="" />

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 9dc2d699d70c912f3e5c55ad3aa8d1476db7e571..e129842c3c9ef2569fad2a308e322d2549600ccb 100644 (file)
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -3,8 +3,7 @@
 <!-- Copyright © 2016 Orange and others. All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<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">
 
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />
     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService" />

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 f8c41c5018c5570d098f11e01db836fa83f55f76..ca76f85b46130ea9783bc1415682122e3f157e95 100644 (file)
--- a/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
+++ b/olm/src/main/resources/OSGI-INF/blueprint/olm-blueprint.xml
@@ -8,9 +8,7 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-      xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-      xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-      odl:use-default-for-reference-types="true">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
 
     <cm:property-placeholder persistent-id="org.opendaylight.transportpce" update-strategy="reload">
         <cm:default-properties>

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 1716b4aeb1917511b7ee1d797d47a250f7bb48b2..c8da033f44094ad5573fd9ba923d5264407d90ca 100755 (executable)
--- a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
+++ b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml
@@ -10,9 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-  xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-  odl:use-default-for-reference-types="true">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
     <cm:property-placeholder persistent-id="org.opendaylight.transportpce.pce" update-strategy="reload">
         <cm:default-properties>
             <cm:property name="url" value="http://127.0.0.1:8008" />

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 38c7147dc53affb1214a2729b44373a893bd4379..7c4ebe5b738883a8dabc07c870ff67d0badf69a9 100644 (file)
--- a/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
+++ b/renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
@@ -7,9 +7,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<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">
 
   <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
   <reference id="notificationPublishService"
@@ -106,6 +104,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <service ref="rendererServiceOperations"
            interface="org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations" />
   <service ref="otnDeviceRenderer"
-            interface="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService"/>
+           interface="org.opendaylight.transportpce.renderer.provisiondevice.OtnDeviceRendererService"/>
 
 </blueprint>

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 730c10227c5eb23f19ed1f4bd42c698a8d53067d..1de4c6a4eb7c7a0815c2ff65d1c498c322cdab25 100644 (file)
--- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
+++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml
@@ -9,9 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
 Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 -->
-<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">
 
     <reference id="rpcService"
           interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>

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 419993e791bc2d26152023cf308e8b63af672076..83522f98ab7a61091d2dd243b4112ef791695527 100644 (file)
--- a/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
+++ b/tapi/src/main/resources/OSGI-INF/blueprint/tapi-blueprint.xml
@@ -9,9 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
 Author: Gilles Thouenon <gilles.thouenon@orange.com>
 -->
-<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">
 
     <reference id="dataBroker"
           interface="org.opendaylight.mdsal.binding.api.DataBroker"/>