Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / aaf / Defaults.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/Defaults.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/Defaults.java
index 43709cc..ab525af 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/Defaults.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/Defaults.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,12 +23,7 @@ package org.onap.aaf.cadi.aaf;
 public interface Defaults {
     public final static String AAF_VERSION = "2.1";
     public final static String AAF_NS = "AAF_NS";
-    public final static String AAF_ROOT =  "https://AAF_LOCATE_URL/" + AAF_NS;
-    public final static String AAF_URL = AAF_ROOT + ".service:" + AAF_VERSION;
-    public final static String GUI_URL = AAF_ROOT + ".gui:" + AAF_VERSION;
-    public final static String CM_URL = AAF_ROOT + ".cm:" + AAF_VERSION;
-    public final static String FS_URL = AAF_ROOT + ".fs:" + AAF_VERSION;
-    public final static String HELLO_URL = AAF_ROOT + ".hello:" + AAF_VERSION;
-    public final static String OAUTH2_TOKEN_URL = AAF_ROOT  + ".token:" + AAF_VERSION;
-    public final static String OAUTH2_INTROSPECT_URL = AAF_ROOT + ".introspect:" + AAF_VERSION;
+    public final static String AAF_LOCATE_CONST="https://AAF_LOCATE_URL";
+    public final static String AAF_ROOT =   AAF_LOCATE_CONST + "/%CNS.%" + AAF_NS;
+
 }