diff options
author | 2019-02-01 15:13:16 +0000 | |
---|---|---|
committer | 2019-02-01 15:13:16 +0000 | |
commit | e36daf12cf4c5aa4b22fa3cec66a79ff2e2b8b94 (patch) | |
tree | 76d8b5e81d853e33a06f86c4478f5616e83a1b51 /auth/auth-core | |
parent | 73223229c68129715fcd7b0c9d128345f13b3b4d (diff) | |
parent | 3505a52ac853c134ecaf40f2977667de8770ec59 (diff) |
Merge "Implement public private locator"
Diffstat (limited to 'auth/auth-core')
-rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java | 4 | ||||
-rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java | 2 | ||||
-rw-r--r-- | auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsService.java | 2 | ||||
-rw-r--r-- | auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java | 2 | ||||
-rw-r--r-- | auth/auth-core/src/test/java/org/onap/aaf/auth/util/test/TestKill.java (renamed from auth/auth-core/src/main/java/org/onap/aaf/auth/server/TestKill.java) | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java index 9ece4847..e2317a52 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java @@ -62,10 +62,10 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte this.access = access; this.env = env; - String str = access.getProperty(Config.AAF_LOCATOR_NAMES, null); + String str = access.getProperty(Config.AAF_LOCATOR_ENTRIES, null); String[] scomp = Split.splitTrim(',', str); if(scomp.length==0) { - throw new CadiException(Config.AAF_LOCATOR_NAMES + " must be defined."); + throw new CadiException(Config.AAF_LOCATOR_ENTRIES + " must be defined."); } else { str = ROOT_NS + '.' + scomp[0]; } diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java index d29b8f26..413b7919 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/JettyServiceStarter.java @@ -130,7 +130,7 @@ public class JettyServiceStarter<ENV extends RosettaEnv, TRANS extends Trans> ex throw new CadiException("No Truststore Password configured for " + truststore); } sslContextFactory.setTrustStorePath(truststore); - sslContextFactory.setTrustStorePassword(access().decrypt(truststorePassword, true)); + sslContextFactory.setTrustStorePassword(access().decrypt(truststorePassword, false)); } // Be able to accept only certain protocols, i.e. TLSv1.1+ String subprotocols = access().getProperty(Config.CADI_PROTOCOLS, SecurityInfo.HTTPS_PROTOCOLS_DEFAULT); diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsService.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsService.java index 65f019f0..b89e2e5d 100644 --- a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsService.java +++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsService.java @@ -103,7 +103,7 @@ public class JU_AbsService { BasicEnv bEnv = new BasicEnv(); PropAccess prop = new PropAccess(); - prop.setProperty(Config.AAF_LOCATOR_NAMES, "te.st"); + prop.setProperty(Config.AAF_LOCATOR_ENTRIES, "te.st"); prop.setProperty(Config.AAF_LOCATOR_VERSION, "te.st"); prop.setLogLevel(Level.DEBUG); AbsServiceStub absServiceStub = new AbsServiceStub(prop, bEnv); //Testing other branches requires "fails" due to exception handling, will leave that off for now. diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java index 1fe98d84..2fa9e123 100644 --- a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java +++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java @@ -131,7 +131,7 @@ public class JU_AbsServiceStarter { BasicEnv bEnv = new BasicEnv(); PropAccess prop = new PropAccess(); - prop.setProperty(Config.AAF_LOCATOR_NAMES, "te.st"); + prop.setProperty(Config.AAF_LOCATOR_ENTRIES, "te.st"); prop.setProperty(Config.AAF_LOCATOR_VERSION, "te.st"); prop.setLogLevel(Level.DEBUG); absServiceStub = new AbsServiceStub(prop, bEnv); diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/TestKill.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/util/test/TestKill.java index 78172a22..c6ddc79f 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/TestKill.java +++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/util/test/TestKill.java @@ -18,7 +18,7 @@ * ============LICENSE_END==================================================== */ -package org.onap.aaf.auth.server; +package org.onap.aaf.auth.util.test; import java.io.IOException; import java.util.concurrent.ExecutorService; |