Added Junits

[portal.git] / ecomp-portal-BE-os / src / main / webapp / WEB-INF / oid-context.xml

diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/oid-context.xml b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/oid-context.xml
index 33458d6..2aa4c35 100644 (file)
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/oid-context.xml
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/oid-context.xml
@@ -1,22 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ================================================================================
-  eCOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
+              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.
-  ================================================================================
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  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============================================
+ 
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
 
 <beans xmlns="http://www.springframework.org/schema/beans"
@@ -28,12 +46,12 @@
        xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
-               http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-               http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-               http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-               http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-               http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-               http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+               http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
+               http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.2.xsd
+               http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+               http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd
+               http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.2.xsd
+               http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd">
 
        <!-- DispatcherServlet Context: defines this servlet's request-processing 
                infrastructure -->
@@ -67,7 +85,7 @@
                <property name="suffix" value=".jsp" />
        </bean>
 
-       <context:component-scan base-package="org.openecomp.portalapp.security.openid.controllers" />
+       <context:component-scan base-package="org.onap.portalapp.security.openid.controllers" />
 
        <security:global-method-security pre-post-annotations="enabled" proxy-target-class="true" authentication-manager-ref="authenticationManager"/>
 
@@ -77,7 +95,7 @@
        </security:http>
 
        <bean id="authenticationEntryPoint" class="org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint">
-               <property name="loginFormUrl" value="/openid_connect_login" />
+               <constructor-arg name="loginFormUrl" value="/openid_connect_login" />
        </bean>
 
        <security:authentication-manager alias="authenticationManager">