Merge "fix oauth code"newdelhi

2 files changed, 0 insertions, 213 deletions

diff --git a/sdnr/wt/oauth-provider/provider-osgi/pom.xml b/sdnr/wt/oauth-provider/provider-osgi/pom.xml
deleted file mode 100644
index 99634cbeb..000000000
--- a/sdnr/wt/oauth-provider/provider-osgi/pom.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============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>
-
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.6.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-    <artifactId>sdnr-wt-oauth-provider</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <name>ccsdk-features :: ${project.artifactId}</name>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <properties>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-        <checkstyle.skip>true</checkstyle.skip>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-oauth-provider-jar</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.opendaylight.aaa</groupId>
-                    <artifactId>aaa-shiro</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.aaa</groupId>
-                    <artifactId>aaa-shiro</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.shiro</groupId>
-                    <artifactId>shiro-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>sdnr-wt-common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Version>${project.version}</Bundle-Version>
-                        <Export-Package>
-                            org.onap.ccsdk.features.sdnr.wt.oauthprovider;version=${project.version},
-                            org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters;version=${project.version},
-                            org.onap.ccsdk.features.sdnr.wt.oauthprovider.http;version=${project.version},
-                            org.onap.ccsdk.features.sdnr.wt.oauthprovider.http.client;version=${project.version},
-                            org.onap.ccsdk.features.sdnr.wt.oauthprovider.data;version=${project.version},
-                            org.onap.ccsdk.features.sdnr.wt.oauthprovider.services;version=${project.version}
-                        </Export-Package>
-                        <Import-Package>
-                            javax.servlet,
-                            javax.servlet.http,
-                            javax.net.ssl,
-                            javax.crypto,
-                            javax.crypto.spec,
-                            javax.xml.transform,
-                            javax.xml.datatype,
-                            javax.management,
-                            javax.security.auth,
-                            javax.security.auth.login,
-                            javax.security.auth.callback,
-                            javax.xml.parsers,
-                            javax.xml.namespace,
-                            javax.xml.transform.stream,
-                            org.apache.shiro.authc,
-                            org.apache.shiro.authz,
-                            org.apache.shiro.realm,
-                            org.apache.shiro.subject,
-                            org.apache.shiro.web.filter.authz,
-                            org.jolokia.osgi.security,
-                            org.onap.ccsdk.features.sdnr.wt.common.http,
-                            org.opendaylight.aaa.api,
-                            org.opendaylight.aaa.api.shiro.principal,
-                            org.opendaylight.aaa.shiro.realm,
-                            org.opendaylight.aaa.shiro.filters,
-                            org.opendaylight.aaa.shiro.web.env,
-                            org.opendaylight.mdsal.binding.api,
-                            org.opendaylight.mdsal.common.api,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.shiro.configuration,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.authorization,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.authorization.policies,
-                            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.http.permission,
-                            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,
-                            com.fasterxml.jackson.databind.module,
-                            com.fasterxml.jackson.annotation,
-                            com.fasterxml.jackson.core.type,
-                            com.fasterxml.jackson.core,
-                            org.apache.commons.codec.binary,
-                            com.google.common.base,
-                            com.google.common.collect,
-                            com.google.common.util.concurrent
-                        </Import-Package>
-                        <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
-                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!shiro-core;inline=false</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Fragment-Host>org.opendaylight.aaa.repackaged-shiro</Fragment-Host>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
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
deleted file mode 100644
index a8258dc8b..000000000
--- a/sdnr/wt/oauth-provider/provider-osgi/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ============LICENSE_START=======================================================
-  ~ ONAP : ccsdk features
-  ~ ================================================================================
-  ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
-  ~ All rights reserved.
-  ~ ================================================================================
-  ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-  ~ ================================================================================
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~ ============LICENSE_END=======================================================
-  ~
-  -->
-
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true">
-
-    <reference id="odlAuthenticator" interface="org.jolokia.osgi.security.Authenticator" />
-
-    <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">
-          <property ref="odlAuthenticator" name="odlAuthenticator" />
-          <property ref="odlIdentityService" name="odlIdentityService" />
-          <property ref="shiroConfiguration" name="shiroConfiguration" />
-          <property ref="dataBroker" name="dataBroker" />
-    </bean>
-
-</blueprint>