From 8e83c25788017acd56271a72286f7dcbc974e76d Mon Sep 17 00:00:00 2001
From: Sudarshan Kumar <sudarshan.kumar@att.com>
Date: Tue, 18 Feb 2020 16:16:26 +0530
Subject: Changes made to upgrade pom version

Upgraded pom version

Issue-ID: PORTAL-769
Change-Id: I65ae68acda464531d699dcb459d328de19a3c7c7
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>
---
 .../src/main/webapp/WEB-INF/conf/system.properties     |  6 +++---
 ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml     | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'ecomp-portal-BE-os/src/main/webapp/WEB-INF')

diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
index c6ee0e9b..041458d3 100644
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
@@ -40,9 +40,9 @@ db.driver = org.mariadb.jdbc.Driver
 #db.connectionURL = jdbc:mariadb:failover://localhost:3306/ecomp_portal
 #db.userName = XXXX
 #db.password = XXXX
-db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal
-db.userName = portal
-db.password = P0rt@l
+db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal_2_6_os
+db.userName = root
+db.password = root
 # is the db.password property encrypted?
 db.encrypt_flag = false
 
diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml
index af712d4e..050e50eb 100644
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/web.xml
@@ -82,6 +82,10 @@
   	<filter>
     	<filter-name>CorsFilter</filter-name>
 		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+		<init-param>
+			<param-name>cors.allowed.origins</param-name>
+			<param-value>http://www.portal.onap.org:9200,http://www.portal.onap.org:9000</param-value>
+		</init-param>
 	    <init-param>
 	    	<param-name>cors.allowed.methods</param-name>
 	        <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
@@ -89,7 +93,19 @@
 	    <init-param>
 	        <param-name>cors.allowed.headers</param-name>
 	        <param-value>EPService,JSESSIONID,X-ECOMP-RequestID,X-Widgets-Type,Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
-	    </init-param>       
+	    </init-param> 
+	    <init-param>
+			<param-name>cors.exposed.headers</param-name>
+			<param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
+		</init-param>
+		<init-param>
+			<param-name>cors.support.credentials</param-name>
+			<param-value>true</param-value>
+		</init-param>
+		<init-param>
+			<param-name>cors.preflight.maxage</param-name>
+			<param-value>10</param-value>  
+		</init-param>    
 	</filter>
     
     <filter-mapping>
-- 
cgit 1.2.3-korg