From efe43d10241bb2d2c05571c2583449f71a1a3da1 Mon Sep 17 00:00:00 2001 From: renealr Date: Wed, 27 Feb 2019 12:59:50 -0500 Subject: update cadi file location to be configurable update epsdk library to the release version add the cadi properties file for local testing add the keyFile for local testing Issue-ID: AAI-2196 Change-Id: I71cd681af8415f7b1874b27136cfe5a6b24e2760 Signed-off-by: renealr --- .../src/main/java/org/onap/aai/sparky/portal/PortalBean.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sparkybe-onap-application/src/main/java/org') diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java index 4443443..63f1fe1 100644 --- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java +++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/portal/PortalBean.java @@ -5,6 +5,7 @@ import javax.servlet.Filter; import org.onap.aai.sparky.security.filter.LoginFilter; import org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter; import org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; @@ -17,6 +18,9 @@ public class PortalBean { private Filter loginFilter = new LoginFilter(); private Filter cadiAuthFilter = new CadiAuthFilter(); + + @Value("${portal.cadiFileLocation}") + private String cadiPropsLocation; /** * bind LoginFilter @@ -41,7 +45,7 @@ public class PortalBean { registration.setFilter(cadiAuthFilter); registration.addUrlPatterns("/*"); registration.setOrder(0); - registration.addInitParameter("cadi_prop_files","/opt/app/sparky/resources/portal/cadi.properties"); + registration.addInitParameter("cadi_prop_files",cadiPropsLocation); registration.addInitParameter("inlclude_url_endpoints","/api/v3/*"); registration.addInitParameter("exclude_url_endpoints","/api/v2/*"); -- cgit 1.2.3-korg