From 9efe59e93578e0ee495c85dad691fa9864512113 Mon Sep 17 00:00:00 2001
From: rb7147 <rb7147@att.com>
Date: Tue, 11 Sep 2018 14:32:39 -0400
Subject: AAF integration in Policy SDK

Upgraded SDK version.
Added SQL script with encrypt key.
Added a function to save role on reading from session in
PolicyController.java
Addressed Check Style warnings in PolicyController.java

Issue-ID: POLICY-1088
Change-Id: I446b6c1a0db2a989ad3f4e982e5cdba845f81045
Signed-off-by: rb7147 <rb7147@att.com>
---
 ONAP-SDK-APP/pom.xml                              |  2 +-
 ONAP-SDK-APP/src/main/resources/portal.properties | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'ONAP-SDK-APP')

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index f08b76d76..9e845b964 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -30,7 +30,7 @@
     <packaging>war</packaging>
     <properties>
         <encoding>UTF-8</encoding>
-        <epsdk.version>2.3.1</epsdk.version>
+        <epsdk.version>2.4.0</epsdk.version>
         <springframework.version>4.2.0.RELEASE</springframework.version>
         <hibernate.version>4.3.11.Final</hibernate.version>
         <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties
index 04d39c14f..fd65b3e67 100644
--- a/ONAP-SDK-APP/src/main/resources/portal.properties
+++ b/ONAP-SDK-APP/src/main/resources/portal.properties
@@ -2,7 +2,7 @@
 # ================================================================================
 # onap Portal SDK
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property
+# Copyright (C) 2017-2018 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.
@@ -50,3 +50,11 @@ ueb_listeners_enable = false
 # If key ueb_listeners_enable is set to false,
 # then only the ueb_app_key is required.
 ueb_app_key = REPLACE-ME-UEB-APP-KEY-EPSDK-APP-OS
+
+#INFO: Once the Roles onboarded by Portal to AAF, we need to enable this property.
+# Use this tag if the app is centralized
+#role_access_centralized = remote
+
+# Connection and Read timeout values
+ext_req_connection_timeout = 15000
+ext_req_read_timeout = 20000
\ No newline at end of file
-- 
cgit 1.2.3-korg