diff options
Diffstat (limited to 'auth/auth-gui/src')
| -rw-r--r-- | auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java | 2 | ||||
| -rw-r--r-- | auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java index d8e8914e..064a8a5c 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java @@ -128,7 +128,7 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E deployedVersion = access.getProperty(Config.AAF_RELEASE, "N/A:2.x"); // Certificate Manager - cmCon = new AAFConHttp(env.access(),Config.CM_URL); + cmCon = new AAFConHttp(env.access(),Config.AAF_URL_CM); artifactsDF = env.newDataFactory(Artifacts.class); certInfoDF = env.newDataFactory(CertInfo.class); diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java index 5d1d0219..16a6c940 100644 --- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java +++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/NsDetail.java @@ -65,7 +65,7 @@ public class NsDetail extends Page { private static final String BLANK = ""; private static Slot keySlot; private static Model model; - private static String gw_url; + private static String locate_url; public NsDetail(final AAF_GUI gui, Page ... breadcrumbs) throws APIException, IOException { @@ -75,11 +75,11 @@ public class NsDetail extends Page { ); model.set(this); keySlot = gui.env.slot(NAME+".ns"); - gw_url = gui.env.getProperty(Config.GW_URL); - if (gw_url==null) { - gw_url=""; + locate_url = gui.env.getProperty(Config.AAF_LOCATE_URL); + if (locate_url==null) { + locate_url=""; } else { - gw_url+="/aaf/"+Config.AAF_DEFAULT_API_VERSION; + locate_url+="/aaf/"+Config.AAF_DEFAULT_API_VERSION; } } @@ -217,7 +217,7 @@ public class NsDetail extends Page { AbsCell label = (i==0?new TextCell(sentenceCase(field)+":","style=width:20%"):AbsCell.Null); String perm = values.get(i); String[] fields = perm.split("\\|"); - String grantLink = gw_url + String grantLink = locate_url + PermGrantForm.HREF + "?type=" + fields[0].trim() + "&instance=" + fields[1].trim() |