org.onap migration

Change-Id: I5e2d01a6da21d4003c910b5fe0702b35c2089a77
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>

12 files changed, 289 insertions, 66 deletions

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp
index 970e6b42b..6448852a6 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp
@@ -1,29 +1,47 @@
 <%--

-  ================================================================================

-  eCOMP Portal SDK

-  ================================================================================

-  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 SDK

+  ===================================================================

+  Copyright © 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.

   --%>

 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>

 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>

 <%@ page isELIgnored="false"%>

-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

-<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%>

-<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%>

-<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%>

+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>

+<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%>

+<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiConstants"%>

+<%@ page import="org.onap.portalsdk.core.domain.MenuData"%>

 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/header.css">

 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css">

 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
index ad3201cf8..2248fd491 100644
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
@@ -20,10 +20,10 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ page isELIgnored="false"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
-<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%>
-<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%>
-<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%>
+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
+<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%>
+<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiConstants"%>
+<%@ page import="org.onap.portalsdk.core.domain.MenuData"%>
 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/header.css">
 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css">
 <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
index de0b6a2fd..5a71a1366 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
@@ -1,29 +1,47 @@
 <?xml version="1.0"?>

 <!--

-  ================================================================================

-  eCOMP Portal SDK

-  ================================================================================

-  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 SDK

+  ===================================================================

+  Copyright © 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.

   -->

 

 <!DOCTYPE hibernate-mapping PUBLIC

         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"

         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">

 

-<hibernate-mapping package="org.openecomp.portalsdk.rnotebookintegration.domain">

+<hibernate-mapping package="org.onap.portalsdk.rnotebookintegration.domain">

 

     

 	 <!-- RNotebookIntegration mapping details -->

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp
index 3c82fca19..b2274ff63 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/index.jsp
@@ -1,21 +1,39 @@
 <%--

-  ================================================================================

-  eCOMP Portal SDK

-  ================================================================================

-  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 SDK

+  ===================================================================

+  Copyright © 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.

   --%>

 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

 

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp
index 1fa75ed03..842eabd85 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -1,5 +1,41 @@
-<%@ page import="java.net.URLEncoder"%>

-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

+<%--

+  ============LICENSE_START==========================================

+  ONAP Portal SDK

+  ===================================================================

+  Copyright © 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

+ 

+  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.

+--%>

+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>

 <!DOCTYPE html>

 <%

 	// Name is defined by app; do not throw if missing

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp
new file mode 100644
index 000000000..15e228ece
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp
@@ -0,0 +1,135 @@
+<%--
+  ============LICENSE_START==========================================
+  ONAP Portal SDK
+  ===================================================================
+  Copyright © 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
+ 
+  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.
+--%>
+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
+<!DOCTYPE html>
+<%
+	// Name is defined by app; do not throw if missing
+	final String appDisplayName = SystemProperties.containsProperty(SystemProperties.APP_DISPLAY_NAME)
+			? SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME)
+			: SystemProperties.APP_DISPLAY_NAME;
+%>
+
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<style>
+		html {
+			font-family: Verdana, Arial, Helvetica, sans-serif;
+		}
+		body {
+			padding-top: 15px;
+		}
+		.logo {
+			position: fixed;
+			left: 15px;
+			top: 15px;
+			z-index: -1;
+		}
+		.loginError {
+			font-size: 18px;
+			color: red;
+			text-align: center;
+		}
+		.login {
+			font-size: 16px;
+			display: block;
+			margin-left: auto;
+			margin-right: auto;
+			text-align: center;
+			width: 100%;
+		}
+		.login input[type=submit] {
+			font-size: 16px;
+		}
+		.terms {
+			font-size: 10px;
+			text-align: center;
+			margin-left: auto;
+			margin-right: auto;
+		}
+		.terms a {
+			font-size: 10px;
+			text-align: center;
+			margin-left: auto;
+			margin-right: auto;
+		}
+		</style>
+	</head>
+	<body>
+
+		<div class="login">
+			<img src="static/fusion/images/ecomp_trans.png" />
+			<h2>
+				<%=appDisplayName%>
+			</h2>
+			<br />
+			<form action="login_external" method="POST"> 
+				<label for="loginId">Login ID:</label>
+				<input id="loginId" name="loginId" type="text" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;" maxlength="30">
+				<br/>
+				<br/>
+				<label for="password">Password:</label>
+				<input id="password" name="password" type="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;"
+							maxlength="30" >
+				<br />
+				<br />
+				<input id="loginBtn" type="submit" alt="Login" value="Login">
+			</form>
+		</div>
+		<br />
+		<br />
+		<div class="loginError">${model.error}</div>
+		<br />
+		<br />
+		<br />
+		<br />
+		<br />
+		<br />
+		<div id="footer">
+			<div class="terms">
+				Copyright 2017 Open ECOMP and Linux Foundation.
+			</div>
+			<p>
+			<div class="terms">
+				
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
index 76fe13e4b..bf3fc5722 100644
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
@@ -44,7 +44,7 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" />
 
 <%@ page import="org.onap.vid.mso.*"%>
-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
 <%
 	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
 			+ ",msoMaxPollingIntervalMsec:"
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
index 7a983a109..8ec3a8d7d 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
@@ -88,7 +88,7 @@
 

 

 <%@ page import="org.onap.vid.mso.*"%>

-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>

 <%

 	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)

 			+ ",msoMaxPollingIntervalMsec:"

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp
index 87f863f0c..56eb59efe 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp
@@ -32,7 +32,7 @@
 	REST / Angular mechanism.

 -->

 <%@ page import="org.onap.vid.mso.*"%>

-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>

 <%

 	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)

 			+ ",msoMaxPollingIntervalMsec:"

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
index f8d8d9c3f..66bb5044a 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
@@ -41,7 +41,7 @@
 	REST / Angular mechanism.

 -->

 <%@ page import="org.onap.vid.mso.*"%>

-<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>

 <%

 	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)

 			+ ",msoMaxPollingIntervalMsec:"

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp
index b505909f6..e52484e2a 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -1,36 +1,27 @@
 <script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>

 <script src="app/vid/external/upload-file/ng-file-upload.min.js"></script>

 <div>

-     <h1 class="heading1">AT&T Domain 2.0 Network</h1>

+     <h1 class="heading1">ONAP</h1>

      <br>

      <h1 class="heading1"><u>Welcome to VID</u></h1>

      <br>

    The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators 

    to instantiate service instances and their constituent parts for Distributed service models required by the 

-   internal AT&T service operations organizations that manage them, such as Mobility Network Services, 

-   Netbond Services, or FlexReach Services. The models are defined by ECOMP component ASDC. The service 

+   ONAP service operations that manage them, such as Mobility Network Services, etc. 

+   The models are defined by ONAP component SDC. The service 

    deployment operator selects the service operations owner and model that they wish to instantiate. After 

-   entry of appropriate data, the operator instructs VID to direct another ECOMP component, MSO, to instantiate 

+   entry of appropriate data, the operator instructs VID to direct another ONAP component, MSO, to instantiate 

    the selected service model. Once the service instance has been instantiated, the service operator can instruct 

    VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. 

    The VID user can also search for, and display, existing service instances and direct the instantiation of 

    subsequent instance components.

      <br><br>

-   <h1 class="heading1"><u>About VID</u></h1>

-    VID was originally developed for the October 2016 release by an integrated IT and Labs team, under the 

-      direction of Steve Smokowski and Vivian Pressley.

-      <br><br>

-    <h1 class="heading1"><a href="mailto:VID-Tier4@ist.att.com" target="_top">Contact Us</a></h1>

-    <a href="mailto:VID-Tier4@ist.att.com" target="_top">Please click here to contact us.</a>

-

+  

+    <h1 class="heading1"><a href="mailto:portal@lists.onap.org" target="_top">Contact Us</a></h1>

+    <a href="mailto:portal@lists.onap.org" target="_top">Please click here to contact us.</a>

 	

-

 <BR>

-

-

-

 </div>

-<!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->

 <br>

 <br>

 <br>

@@ -47,4 +38,3 @@
 <br>

 <br>

 

-

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml
index b09fa57d6..0355fb28b 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml
@@ -10,8 +10,16 @@
 	<distributable />

 

 	<session-config>

-		<session-timeout>7</session-timeout>

+		<session-timeout>30</session-timeout>

 		<tracking-mode>COOKIE</tracking-mode>

 	</session-config>

+	<filter>

+    <filter-name>SecurityXssFilter</filter-name>

+    <filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class>

+   </filter> 

+    <filter-mapping>

+    <filter-name>SecurityXssFilter</filter-name>

+    <url-pattern>/*</url-pattern>

+  </filter-mapping>

 

 </web-app>
\ No newline at end of file