diff options
| author |   Instrumental <jcgmisc@stl.gathman.org> | 2018-03-29 09:58:42 -0500 |
|---|---|---|
| committer | Instrumental <jcgmisc@stl.gathman.org> | 2018-03-29 09:58:52 -0500 |
| commit | 3635fc5c8d8409d1c5e0f521469a6aaca4d19ffe (patch) | |
| tree | 11ca165582a9b040923e475e1528afa6fcbde425 /cadi/core | |
| parent | 52f34cd975401f918169fe9373b0b4576f6b36ef (diff) | |
Local CA to use Keystores
Issue-ID: AAF-204
Change-Id: I59491ffa26d5ea117a98470f38f090900b9e1b4e
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
Diffstat (limited to 'cadi/core')
| -rw-r--r-- | cadi/core/.gitignore | 4 | ||||
| -rw-r--r-- | cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java | 33 | ||||
| -rw-r--r-- | cadi/core/target/classes/.gitignore | 1 | ||||
| -rw-r--r-- | cadi/core/target/test-classes/.gitignore | 0 |
4 files changed, 23 insertions, 15 deletions
diff --git a/cadi/core/.gitignore b/cadi/core/.gitignore new file mode 100644 index 00000000..6028f0a5 --- /dev/null +++ b/cadi/core/.gitignore @@ -0,0 +1,4 @@ +/.classpath +/.settings/ +/target/ +/.project diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java index dda4b6cd..122996a6 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java @@ -347,23 +347,26 @@ public class Config { if(AAF_TAF_CLASS_DEF.equals(aafTafClassName)) { try { Class<?> aafTafClass = loadClass(access,aafTafClassName); - - Constructor<?> cstr = aafTafClass.getConstructor(Connector.class,boolean.class,AbsUserCache.class); - if(cstr!=null) { - if(lur instanceof AbsUserCache) { - aaftaf = (HttpTaf)cstr.newInstance(aafcon,basic_warn,lur); - } else { - cstr = aafTafClass.getConstructor(Connector.class,boolean.class); - if(cstr!=null) { - aaftaf = (HttpTaf)cstr.newInstance(aafcon,basic_warn); + if(aafTafClass!=null) { + Constructor<?> cstr = aafTafClass.getConstructor(Connector.class,boolean.class,AbsUserCache.class); + if(cstr!=null) { + if(lur instanceof AbsUserCache) { + aaftaf = (HttpTaf)cstr.newInstance(aafcon,basic_warn,lur); + } else { + cstr = aafTafClass.getConstructor(Connector.class,boolean.class); + if(cstr!=null) { + aaftaf = (HttpTaf)cstr.newInstance(aafcon,basic_warn); + } + } + if(aaftaf==null) { + access.log(Level.INIT,"ERROR! AAF TAF Failed construction. NOT Configured"); + } else { + access.log(Level.INIT,"AAF TAF Configured to ",aafURL); + // Note: will add later, after all others configured } } - if(aaftaf==null) { - access.log(Level.INIT,"ERROR! AAF TAF Failed construction. NOT Configured"); - } else { - access.log(Level.INIT,"AAF TAF Configured to ",aafURL); - // Note: will add later, after all others configured - } + } else { + access.log(Level.INIT, "There is no AAF TAF class available: %s. AAF TAF not configured.",aafTafClassName); } } catch(Exception e) { access.log(Level.INIT,"ERROR! AAF TAF Failed construction. NOT Configured",e); diff --git a/cadi/core/target/classes/.gitignore b/cadi/core/target/classes/.gitignore new file mode 100644 index 00000000..cf1db2ee --- /dev/null +++ b/cadi/core/target/classes/.gitignore @@ -0,0 +1 @@ +/org/ diff --git a/cadi/core/target/test-classes/.gitignore b/cadi/core/target/test-classes/.gitignore new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/cadi/core/target/test-classes/.gitignore |