Add properties required by core controllers.

These properties were expunged for 1610 but reappeared
during the 1702 code rebasing.  Code will be cleaned;
restoring the properties as a stopgap fix.

Issue: Portal-34
Change-Id: If39d82e7c44bd7beedad7ae3ed5a6e9a9dfa00e1
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

diff --git a/.gitreview b/.gitreview
index 201d53d..eb64657 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=gerrit.onap.org
 port=29418
-project=ecompsdkos.git
\ No newline at end of file
+project=portal/sdk.git

diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index 2ddd5c9..8601a9a 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -15,6 +15,7 @@ https://www.eclipse.org/m2e-wtp/
 
 Version 1.3.0
 - [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk
+- [Portal-34] Restore required properties in fusion.properties file
 
 Version 1.1.0
 - [Portal-7] Improvements added as part of the rebasing process

diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 25465cb..6d79274 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
@@ -1,6 +1,7 @@
 # login settings
 login_method_backdoor       = backdoor
 login_method_attribute_name = login_method
+authentication_mechanism = BOTH
 
 #login message
 login.error.hrid.empty = Login failed, please contact system administrator. 
@@ -10,6 +11,7 @@ login.error.user.inactive = Account is disabled, please contact system administr
 # User Session settings
 user_attribute_name           = user
 roles_attribute_name          = roles
+role_function_list = role_function_list
 role_functions_attribute_name = role_functions
 
 # Import-user LDAP settings