diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-02-16 10:45:15 -0600 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-02-16 10:45:20 -0600 |
| commit | 05e268a2061beccd5bceb88a716aeafadb6dcc71 (patch) | |
| tree | 10c102a03cbf42e581aef15fc590383e2f263f79 | |
| parent | 628b7105ce4d9818aac69a082e515f9275fd46fd (diff) | |
Other minor batch changes
Issue-ID: AAF-740
Change-Id: Id093e584e5436d4db620acd5701fd31fdf4fce0d
Signed-off-by: Instrumental <jonathan.gathman@att.com>
| -rw-r--r-- | auth/sample/data/pull.sh | 2 | ||||
| -rw-r--r-- | auth/sample/data/push.sh | 2 | ||||
| -rw-r--r-- | cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java | 2 | ||||
| -rw-r--r-- | cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/auth/sample/data/pull.sh b/auth/sample/data/pull.sh index a49be1a1..f7b5b0a5 100644 --- a/auth/sample/data/pull.sh +++ b/auth/sample/data/pull.sh @@ -19,4 +19,4 @@ # ============LICENSE_END==================================================== # -docker cp aaf_service:/opt/app/osaaf/data/identities.dat . +docker cp aaf-service:/opt/app/osaaf/data/identities.dat . diff --git a/auth/sample/data/push.sh b/auth/sample/data/push.sh index a22d4130..2b22baec 100644 --- a/auth/sample/data/push.sh +++ b/auth/sample/data/push.sh @@ -18,4 +18,4 @@ # limitations under the License. # ============LICENSE_END==================================================== # -docker cp identities.dat aaf_service:/opt/app/osaaf/data +docker cp identities.dat aaf-service:/opt/app/osaaf/data diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java index 9d060e6c..d066d97a 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PropHolder.java @@ -147,7 +147,7 @@ public class PropHolder { pw.print('#'); } pw.println(); - pw.println("# Properties Generated by AAF Certificate Manager"); + pw.println("# Properties Generated by AT&T Certificate Manager"); pw.print("# by "); pw.println(System.getProperty("user.name")); pw.print("# on "); 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 b94ef86e..66491959 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 @@ -156,8 +156,8 @@ public class Config { public static final String CM_URL_DEF = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:" + AAF_DEFAULT_API_VERSION; public static final String FS_URL_DEF = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs:" + AAF_DEFAULT_API_VERSION; public static final String HELLO_URL_DEF = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.hello:" + AAF_DEFAULT_API_VERSION; - public static final String OAUTH2_TOKEN_URL = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:" + AAF_DEFAULT_API_VERSION; - public static final String OAUTH2_INTROSPECT_URL = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:" + AAF_DEFAULT_API_VERSION; + public static final String OAUTH2_TOKEN_URL = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.token:" + AAF_DEFAULT_API_VERSION +"/token"; + public static final String OAUTH2_INTROSPECT_URL = "https://AAF_LOCATE_URL/%CNS.%AAF_NS.introspect:" + AAF_DEFAULT_API_VERSION +"/introspect";; public static final String AAF_LOCATOR_CLASS = "aaf_locator_class"; // AAF Locator Entries are ADDITIONAL entries, which also gives the Property ability |