diff options
| author |   Instrumental <jgonap@stl.gathman.org> | 2020-03-24 17:07:27 -0500 |
|---|---|---|
| committer | Instrumental <jgonap@stl.gathman.org> | 2020-03-26 01:28:32 -0500 |
| commit | 96bf6a2771dfe992fb27bd6361d191d83b6ff605 (patch) | |
| tree | b26581f65d15574fe81f5dfa3e061b93744ef7fd /cadi | |
| parent | 48bcfb9d4b03ac3e2e6915f7bdf72599c8794d43 (diff) | |
AAF Services non root, all platforms2.1.20
adjust Agent for JDK 11
Included redoing Config and Agent Init Containers
refit for "hello" (sample)
Issue-ID: AAF-1102
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: Ia957b1ccce34d164580ccb0a6d02d7b800e4887e
Diffstat (limited to 'cadi')
| -rw-r--r-- | cadi/aaf/src/assemble/cadi-aaf.xml | 10 | ||||
| -rw-r--r-- | cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cadi/aaf/src/assemble/cadi-aaf.xml b/cadi/aaf/src/assemble/cadi-aaf.xml index 63741ffa..64bc8eec 100644 --- a/cadi/aaf/src/assemble/cadi-aaf.xml +++ b/cadi/aaf/src/assemble/cadi-aaf.xml @@ -12,16 +12,6 @@ <dependencySet> <unpack>true</unpack> <scope>compile</scope> - <includes> - <include>org.onap.aaf.authz:aaf-auth-client</include> - <include>org.onap.aaf.authz:aaf-cadi-aaf</include> - <include>org.onap.aaf.authz:aaf-cadi-core</include> - <include>org.onap.aaf.authz:aaf-cadi-client</include> - <include>org.onap.aaf.authz:aaf-misc-env</include> - <include>org.onap.aaf.authz:aaf-misc-rosetta</include> - <include>javax.xml.bind:jaxb-api</include> - <include>org.glassfish.jaxb:jaxb-runtime</include> - </includes> </dependencySet> </dependencySets> diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java index f6808a90..db606a50 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java @@ -190,11 +190,16 @@ public class Agent { } if(access==null) { + boolean createOutsideForLoop = false; for(Entry<Object, Object> es : System.getProperties().entrySet()) { if(Config.CADI_PROP_FILES.equals(es.getKey())) { - access = new PropAccess(); + createOutsideForLoop = true; + break; } } + if(createOutsideForLoop) { + access = new PropAccess(); + } } // When using Config file, check if Cred Exists, and if not, work with Deployer. @@ -762,7 +767,12 @@ public class Agent { machine = fqdns[1]; } else { key = machine; - fqdns = machines(cmds); + if(cmds.size()>0) { + fqdns = machines(cmds); + } else { + // make sure machine is also in SANS + fqdns = new String[] {machine}; + } } TimeTaken tt = transitiveInfo.start("Place Artifact", Env.REMOTE); |