Do not use odl:type=default

We have a single source of DataBroker, hence we should not be specifying
the odl:type property -- it is going away anyway.

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

diff --git a/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml b/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml
index c443f4fb746631eafbca6c38e31a0c16a173679a..7fa3e2f359186f0f8a6c1600f2dca17989ca51fc 100644 (file)
--- a/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml
+++ b/addresstracker/implementation/src/main/resources/org/opendaylight/blueprint/address-tracker.xml
@@ -1,11 +1,9 @@
 <?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"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
   <reference id="notificationProviderService"
     interface="org.opendaylight.mdsal.binding.api.NotificationService" />
 

diff --git a/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml b/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml
index e23c51d03942cb1faebaa0a22a2f13944f3db56a..6217227b006ab42d3ae4a72630c02d4094dc01b4 100644 (file)
--- a/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml
+++ b/arphandler/src/main/resources/org/opendaylight/blueprint/arp-handler.xml
@@ -1,11 +1,9 @@
 <?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"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
   <reference id="notificationProviderService"
     interface="org.opendaylight.mdsal.binding.api.NotificationService" />
 

diff --git a/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml b/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml
index 1226a915720f1c8df42e0ed2d26e89d3b6142d50..a8249ff8630223457fb94a00b397c04c65c2f171 100644 (file)
--- a/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml
+++ b/hosttracker/implementation/src/main/resources/org/opendaylight/blueprint/host-tracker.xml
@@ -1,11 +1,9 @@
 <?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"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
 
   <odl:clustered-app-config id="hostTrackerConfig"
     binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.l2switch.host.tracker.config.rev140528.HostTrackerConfig">

diff --git a/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml b/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml
index ab16957fb7775f86a814c6f83cbd51147a762d27..c6291a42487df4e399832ec27fb4b9739ab53bb0 100644 (file)
--- a/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml
+++ b/l2switch-main/src/main/resources/org/opendaylight/blueprint/l2switch-impl.xml
@@ -1,11 +1,9 @@
 <?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"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
   <reference id="notificationPublishService"
     interface="org.opendaylight.mdsal.binding.api.NotificationService" />
 

diff --git a/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml b/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml
index 058054201a1e8220a47d8774084789ee873d84f1..41d37decb9669a8ae02ee7149c996d8c7bd2381a 100644 (file)
--- a/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml
+++ b/loopremover/implementation/src/main/resources/org/opendaylight/blueprint/loop-remover.xml
@@ -1,11 +1,9 @@
 <?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"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker"
-    interface="org.opendaylight.mdsal.binding.api.DataBroker"
-    odl:type="default" />
+    interface="org.opendaylight.mdsal.binding.api.DataBroker" />
 
   <odl:clustered-app-config id="loopRemoverConfig"
     binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.loop.remover.config.rev140528.LoopRemoverConfig">

diff --git a/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml b/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml
index 7be100cde8873a1db6cdf133aec1f16e9908a55d..361cef0826e6a3ef686593937bb897d2b88cae70 100644 (file)
--- a/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml
+++ b/packethandler/implementation/src/main/resources/org/opendaylight/blueprint/packet-handler.xml
@@ -1,7 +1,5 @@
 <?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"
-  odl:use-default-for-reference-types="true">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
   <reference id="notificationPublishService"
              interface="org.opendaylight.mdsal.binding.api.NotificationPublishService" />