From 7e836e1ff7e918961e9003c5dc8126cf84d24da2 Mon Sep 17 00:00:00 2001 From: xg353y Date: Wed, 6 Jun 2018 15:50:33 +0200 Subject: Integrate AAF Update aaf dependency version; fix a bug in UI; remove logout page; update default certificates Issue-ID: CLAMP-103 Change-Id: I3bdd45730f616165d7a484033c5102241f872c1d Signed-off-by: xg353y --- src/main/java/org/onap/clamp/clds/config/SSLConfiguration.java | 6 +++--- .../org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java | 0 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/main/java/org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java (limited to 'src/main/java/org/onap') diff --git a/src/main/java/org/onap/clamp/clds/config/SSLConfiguration.java b/src/main/java/org/onap/clamp/clds/config/SSLConfiguration.java index f1d50c777..6a97f2356 100644 --- a/src/main/java/org/onap/clamp/clds/config/SSLConfiguration.java +++ b/src/main/java/org/onap/clamp/clds/config/SSLConfiguration.java @@ -34,11 +34,11 @@ public class SSLConfiguration { private static final String TRUST_STORE_PW = "javax.net.ssl.trustStorePassword"; private static final String TRUST_STORE_TYPE = "javax.net.ssl.trustStoreType"; - @Value("${server.ssl.trust:/opt/app/osaaf/client/local/truststoreONAP.p12}") + @Value("${server.ssl.trust:none}") private String sslTruststoreFile; - @Value("${server.ssl.trust-password:changeit}") + @Value("${server.ssl.trust-password:none}") private String sslTruststorePw; - @Value("${server.ssl.trust-type:PKCS12}") + @Value("${server.ssl.trust-type:none}") private String sslTruststoreType; @PostConstruct diff --git a/src/main/java/org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java b/src/main/java/org/onap/clamp/clds/config/spring/CldsSecurityConfigUsers.java deleted file mode 100644 index e69de29bb..000000000 -- cgit 1.2.3-korg