From a958c2c5fefbc331af3d233e33afeb3b9d168427 Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Tue, 14 Mar 2023 18:44:49 +0530
Subject: Update oauth-provider to use new OSGi APIs

oauth-provider to use new OSGi APIs

Issue-ID: CCSDK-3868
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I55704391fe2d7e051d9b204c948f72675a75d03a
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
---
 .../org/opendaylight/blueprint/impl-blueprint.xml  | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'sdnr/wt/oauth-provider/provider-osgi/src/main')

diff --git a/sdnr/wt/oauth-provider/provider-osgi/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/oauth-provider/provider-osgi/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index ae11de631..a8258dc8b 100644
--- a/sdnr/wt/oauth-provider/provider-osgi/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/oauth-provider/provider-osgi/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -31,23 +31,27 @@
     <reference id="odlIdentityService" interface="org.opendaylight.aaa.api.IdMService" />
 
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker" />
-    
+
+    <bean id="provider" class="org.onap.ccsdk.features.sdnr.wt.oauthprovider.Helper" init-method="init" destroy-method="close">
+        <property ref="odlAuthenticator" name="odlAuthenticator" />
+        <property ref="odlIdentityService" name="odlIdentityService" />
+        <property ref="shiroConfiguration" name="shiroConfiguration" />
+        <property ref="dataBroker" name="dataBroker" />
+    </bean>
+
+    <reference id="onBindService" availability="mandatory" activation="eager" interface="org.osgi.service.http.HttpService">
+        <reference-listener ref="provider" bind-method="onBindService" unbind-method="onUnbindService"/>
+    </reference>
+
     <odl:clustered-app-config
           binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.ShiroConfiguration"
           id="shiroConfiguration" default-config-file-name="aaa-app-config.xml" />
           
-    <bean id="authServlet"
-          class="org.onap.ccsdk.features.sdnr.wt.oauthprovider.http.AuthHttpServlet">
+    <bean id="authServlet" class="org.onap.ccsdk.features.sdnr.wt.oauthprovider.http.AuthHttpServlet">
           <property ref="odlAuthenticator" name="odlAuthenticator" />
           <property ref="odlIdentityService" name="odlIdentityService" />
           <property ref="shiroConfiguration" name="shiroConfiguration" />
           <property ref="dataBroker" name="dataBroker" />
     </bean>
 
-    <service interface="javax.servlet.http.HttpServlet" ref="authServlet">
-        <service-properties>
-            <entry key="alias" value="/oauth"/>
-        </service-properties>
-    </service>
-
 </blueprint>
-- 
cgit 1.2.3-korg