Do not use odl:type=default

Use of this type has been deprecated, do not use it.

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

diff --git a/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
index b1cdca8e25e5436c89c647097b71747ca1c0f47e..5d10c7356793f52c42eae42b4bd666e73ed870e6 100644 (file)
--- a/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
+++ b/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -8,8 +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"
-  odl:use-default-for-reference-types="true">
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
   <odl:clustered-app-config
           binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.ShiroConfiguration"
@@ -26,13 +25,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <reference id="passwordCredentialAuth" interface="org.opendaylight.aaa.api.PasswordCredentialAuth"/>
   <reference id="claimCache" interface="org.opendaylight.aaa.api.ClaimCache"/>
 
-  <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="certManager"
-    interface="org.opendaylight.aaa.cert.api.ICertificateManager"
-    odl:type="default-certificate-manager" />
+  <reference id="certManager" interface="org.opendaylight.aaa.cert.api.ICertificateManager"/>
 
   <bean id="provider" class="org.opendaylight.aaa.AAAShiroProvider" init-method="init" destroy-method="close">
     <argument ref="passwordCredentialAuth" />