From 4e888e9099a29b43859702f0291499260ebd4720 Mon Sep 17 00:00:00 2001 From: Venkatraghavan Sankarasubbu Date: Fri, 12 Apr 2013 15:54:17 -0700 Subject: [PATCH] Changing NB API authentication/authorization to use Tomcat Valve. Affected modules 1. Flow Programmer 2. Host Tracker 3. Static Roting 4. Statistics 5. Subnets 6. Switch Manager 7. Topology 8. Loadbalancer Change-Id: I94267ed1878c49b9615e956aa816473361ded8f2 Signed-off-by: Venkatraghavan Sankarasubbu --- opendaylight/commons/opendaylight/pom.xml | 31 --------- opendaylight/northbound/commons/pom.xml | 18 +---- .../AuthenticationProviderWrapper.java | 51 -------------- .../commons/WebSecurityContextRepository.java | 68 ------------------- .../northbound/flowprogrammer/pom.xml | 9 +-- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 59 +++++++++------- opendaylight/northbound/hosttracker/pom.xml | 8 --- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 57 +++++++++------- opendaylight/northbound/staticrouting/pom.xml | 8 --- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 64 +++++++++-------- opendaylight/northbound/statistics/pom.xml | 31 +-------- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 57 +++++++++------- opendaylight/northbound/subnets/pom.xml | 8 --- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 57 +++++++++------- opendaylight/northbound/switchmanager/pom.xml | 24 +------ .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 57 +++++++++------- opendaylight/northbound/topology/pom.xml | 8 --- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 56 ++++++++------- .../samples/northbound/loadbalancer/pom.xml | 8 --- .../main/resources/WEB-INF/spring/context.xml | 10 --- .../WEB-INF/spring/servlet/security.xml | 36 ---------- .../src/main/resources/WEB-INF/web.xml | 57 +++++++++------- 36 files changed, 265 insertions(+), 839 deletions(-) delete mode 100644 opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/AuthenticationProviderWrapper.java delete mode 100644 opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/WebSecurityContextRepository.java delete mode 100644 opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/servlet/security.xml delete mode 100644 opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/context.xml delete mode 100644 opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/servlet/security.xml diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 370526aca1..f2817ed481 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -789,36 +789,5 @@ jersey-json ${jersey.version} - - com.sun.jersey.contribs - jersey-spring - ${jersey.version} - - - org.springframework - spring - - - org.springframework - spring-aop - - - org.springframework - spring-core - - - org.springframework - spring-web - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 61e5304e73..d52bedf819 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -32,11 +32,7 @@ org.opendaylight.controller.sal.utils, org.opendaylight.controller.usermanager, javax.servlet.http, - org.slf4j, - org.springframework.security.authentication, - org.springframework.security.core, - org.springframework.security.core.context, - org.springframework.security.web.context + org.slf4j, @@ -54,17 +50,5 @@ usermanager 0.4.0-SNAPSHOT - - org.springframework.security - spring-security-core - ${spring-security.version} - provided - - - org.springframework.security - spring-security-web - ${spring-security.version} - provided - diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/AuthenticationProviderWrapper.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/AuthenticationProviderWrapper.java deleted file mode 100644 index 821fb12f80..0000000000 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/AuthenticationProviderWrapper.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.northbound.commons; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; - -import org.opendaylight.controller.sal.utils.ServiceHelper; -import org.opendaylight.controller.usermanager.IUserManager; - -import org.opendaylight.controller.northbound.commons.exception.InternalServerErrorException; - -public class AuthenticationProviderWrapper implements AuthenticationProvider { - - private static final Logger logger = LoggerFactory - .getLogger(AuthenticationProviderWrapper.class); - - @Override - public Authentication authenticate(Authentication authentication) - throws AuthenticationException { - return ((AuthenticationProvider) getUserManagerRef()) - .authenticate(authentication); - } - - @Override - public boolean supports(Class authentication) { - return ((AuthenticationProvider) getUserManagerRef()) - .supports(authentication); - } - - private IUserManager getUserManagerRef() { - IUserManager userManager = (IUserManager) ServiceHelper - .getGlobalInstance(IUserManager.class, this); - if (userManager != null) { - return userManager; - } else { - logger.error("UserManager Ref is null. "); - throw new InternalServerErrorException("UserManager Ref is null. "); - } - } - -} diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/WebSecurityContextRepository.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/WebSecurityContextRepository.java deleted file mode 100644 index 9f1c4a5fc0..0000000000 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/WebSecurityContextRepository.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.northbound.commons; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.web.context.HttpRequestResponseHolder; -import org.springframework.security.web.context.SecurityContextRepository; - -import org.opendaylight.controller.sal.utils.ServiceHelper; -import org.opendaylight.controller.usermanager.IUserManager; - -import org.opendaylight.controller.northbound.commons.exception.InternalServerErrorException; - -public class WebSecurityContextRepository implements SecurityContextRepository { - - private static final Logger logger = LoggerFactory - .getLogger(WebSecurityContextRepository.class); - - WebSecurityContextRepository() { - } - - @Override - public SecurityContext loadContext( - HttpRequestResponseHolder requestResponseHolder) { - - SecurityContextRepository contextRepo = (SecurityContextRepository) getUserManagerRef() - .getSecurityContextRepo(); - return contextRepo.loadContext(requestResponseHolder); - } - - @Override - public void saveContext(SecurityContext context, - HttpServletRequest request, HttpServletResponse response) { - SecurityContextRepository contextRepo = (SecurityContextRepository) getUserManagerRef() - .getSecurityContextRepo(); - contextRepo.saveContext(context, request, response); - } - - private IUserManager getUserManagerRef() { - IUserManager userManager = (IUserManager) ServiceHelper - .getGlobalInstance(IUserManager.class, this); - if (userManager != null) { - return userManager; - } else { - logger.error("UserManager Ref is null. "); - throw new InternalServerErrorException("UserManager Ref is null. "); - } - } - - @Override - public boolean containsContext(HttpServletRequest request) { - SecurityContextRepository contextRepo = (SecurityContextRepository) getUserManagerRef() - .getSecurityContextRepo(); - return contextRepo.containsContext(request); - } - -} diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index c0f03edf5c..1bfd4ebf12 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -41,14 +41,7 @@ org.opendaylight.controller.switchmanager, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, + com.sun.jersey.spi.container.servlet, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index bce59ee3c5..0000000000 --- a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml index df8cba156e..83f7e4b35d 100644 --- a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml @@ -1,12 +1,11 @@ - + JAXRSFlowProgrammer - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.flowprogrammer.northbound.FlowProgrammerNorthboundRSApplication @@ -18,27 +17,35 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" JAXRSFlowProgrammer /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - contextConfigLocation - /WEB-INF/spring/*.xml - - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + + + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - springSecurityFilterChain - /* - + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 4cb9919b9c..eab9fcb0c7 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -44,14 +44,6 @@ com.sun.jersey.spi.container.servlet, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, diff --git a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index bce59ee3c5..0000000000 --- a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml index bfa9fc77c7..7eb940875a 100644 --- a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSHostTracker - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.hosttracker.northbound.HostTrackerNorthboundRSApplication @@ -18,26 +17,34 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" /* - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - org.springframework.web.context.ContextLoaderListener - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - contextConfigLocation - /WEB-INF/spring/*.xml - - - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index c35c5e6220..eeaf550e6b 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -43,14 +43,6 @@ com.sun.jersey.spi.container.servlet, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, org.slf4j, javax.ws.rs, javax.ws.rs.core, diff --git a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index bce59ee3c5..0000000000 --- a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml index da8937e89f..37901a68a8 100644 --- a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSStaticRouting - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.forwarding.staticrouting.northbound.StaticRoutingNorthboundRSApplication @@ -13,30 +12,39 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 1 - - JAXRSStaticRouting - /* - - + + JAXRSStaticRouting + /* + - - org.springframework.web.context.ContextLoaderListener - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - contextConfigLocation - /WEB-INF/spring/*.xml - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index b3fe26f6a0..e10a5b1e1f 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -51,14 +51,6 @@ com.sun.jersey.spi.container.servlet, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, @@ -102,28 +94,7 @@ commons.northbound 0.4.0-SNAPSHOT - - - org.springframework - spring-web - ${spring.version} - provided - - - - org.springframework.security - spring-security-config - ${spring-security.version} - provided - - - - org.springframework.security - spring-security-web - ${spring-security.version} - provided - - + org.codehaus.enunciate enunciate-core-annotations diff --git a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index 768aafb275..0000000000 --- a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml index 2b9f75f578..24242d3c45 100644 --- a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSStatistics - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.statistics.northbound.StatisticsNorthboundRSApplication @@ -18,26 +17,34 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" /* - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - org.springframework.web.context.ContextLoaderListener - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - contextConfigLocation - /WEB-INF/spring/*.xml - - - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index aa18909f48..cfba4ffce9 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -62,14 +62,6 @@ javax.ws.rs.core, javax.xml.bind.annotation, org.slf4j, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index 768aafb275..0000000000 --- a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml index b0fc9ee97a..1c201d3b33 100644 --- a/opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/subnets/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSSubnets - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.subnets.northbound.SubnetsNorthboundRSApplication @@ -17,26 +16,34 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" JAXRSSubnets /* - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - org.springframework.web.context.ContextLoaderListener - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - contextConfigLocation - /WEB-INF/spring/*.xml - - - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index 4a8504bef0..e4c73ac743 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -44,14 +44,6 @@ com.sun.jersey.spi.container.servlet, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, @@ -101,21 +93,7 @@ ${spring.version} provided - - - org.springframework.security - spring-security-config - ${spring-security.version} - provided - - - - org.springframework.security - spring-security-web - ${spring-security.version} - provided - - + org.codehaus.enunciate enunciate-core-annotations diff --git a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index 768aafb275..0000000000 --- a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml index 697a7e359a..a16cdfab48 100644 --- a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSSwitchManager - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.switchmanager.northbound.SwitchNorthboundRSApplication @@ -18,26 +17,34 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" /* - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - org.springframework.web.context.ContextLoaderListener - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - contextConfigLocation - /WEB-INF/spring/*.xml - - - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + \ No newline at end of file diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index 803fe40457..c31b478fb5 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -52,14 +52,6 @@ javax.xml.bind, javax.xml.bind.annotation, org.slf4j, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, !org.codehaus.enunciate.jaxrs /controller/nb/v2/topology diff --git a/opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index 768aafb275..0000000000 --- a/opendaylight/northbound/topology/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml index 9d2159979a..e40c5fbfbf 100644 --- a/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSTopology - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.topology.northbound.TopologyNorthboundRSApplication @@ -17,26 +16,35 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" JAXRSTopology /* - - - org.springframework.web.context.ContextLoaderListener - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - contextConfigLocation - /WEB-INF/spring/*.xml - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index 2b9b1c448d..cabcf8d972 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -47,14 +47,6 @@ com.sun.jersey.spi.container.servlet, org.opendaylight.controller.northbound.commons, org.opendaylight.controller.northbound.commons.exception, - com.sun.jersey.spi.spring.container.servlet, - org.springframework.web.context, - org.springframework.web, - org.springframework.web.servlet, - org.springframework.web.filter, - org.springframework.security.config, - org.springframework.security.web.authentication, - org.springframework.security.web.authentication.www, javax.ws.rs, javax.ws.rs.core, javax.xml.bind.annotation, diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/context.xml b/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/context.xml deleted file mode 100644 index 8a4bda53b0..0000000000 --- a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/context.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/servlet/security.xml b/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/servlet/security.xml deleted file mode 100644 index bce59ee3c5..0000000000 --- a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/spring/servlet/security.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml b/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml index 5011e748df..365e4b22d6 100644 --- a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml +++ b/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml @@ -1,11 +1,10 @@ - + JAXRSLoadBalancer - com.sun.jersey.spi.spring.container.servlet.SpringServlet + com.sun.jersey.spi.container.servlet.ServletContainer javax.ws.rs.Application org.opendaylight.controller.samples.loadbalancer.northbound.LoadBalancerNorthboundRSApplication @@ -18,26 +17,34 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" /* - + + + NB api + /* + + + System-Admin + Network-Admin + Network-Operator + Container-User + + - - org.springframework.web.context.ContextLoaderListener - + + System-Admin + + + Network-Admin + + + Network-Operator + + + Container-User + - - contextConfigLocation - /WEB-INF/spring/*.xml - - - - springSecurityFilterChain - - org.springframework.web.filter.DelegatingFilterProxy - - - - - springSecurityFilterChain - /* - + + BASIC + opendaylight + -- 2.36.6