diff options
Diffstat (limited to 'sdnr/wt/oauth-provider/provider-osgi')
| -rw-r--r-- | sdnr/wt/oauth-provider/provider-osgi/pom.xml | 2 | ||||
| -rw-r--r-- | sdnr/wt/oauth-provider/provider-osgi/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml | 22 |
2 files changed, 15 insertions, 9 deletions
diff --git a/sdnr/wt/oauth-provider/provider-osgi/pom.xml b/sdnr/wt/oauth-provider/provider-osgi/pom.xml index 98bc2acab..8768e9206 100644 --- a/sdnr/wt/oauth-provider/provider-osgi/pom.xml +++ b/sdnr/wt/oauth-provider/provider-osgi/pom.xml @@ -22,6 +22,7 @@ ~ ============LICENSE_END======================================================= ~ --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -131,6 +132,7 @@ org.opendaylight.yangtools.concepts, org.opendaylight.yangtools.yang.binding, org.opendaylight.yangtools.yang.common, + org.osgi.service.http, com.fasterxml.jackson.databind, com.fasterxml.jackson.databind.deser.std, com.fasterxml.jackson.databind.ser.std, 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> |