Configuration and Auto-Certificates

[aaf/authz.git] / auth / auth-gui / src / main / java / org / onap / aaf / auth / gui / Page.java

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java
index 436b37a..eb34a62 100644 (file)
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java
@@ -67,7 +67,8 @@ public class Page extends HTMLCacheGen {
        public static final String AAF_URL_GUI_ONBOARD = "aaf_url.gui_onboard";
        public static final String AAF_URL_AAF_HELP = "aaf_url.aaf_help";
        public static final String AAF_URL_CADI_HELP = "aaf_url.cadi_help";
-       public static final String PERM_CA_TYPE = Define.ROOT_NS() + ".ca";
+       public static final String PERM_CA_TYPE = "certman";
+       public static final String PERM_NS = Define.ROOT_NS();
 
        public static enum BROWSER {iPhone,html5,ie,ieOld};
        
@@ -83,7 +84,7 @@ public class Page extends HTMLCacheGen {
        public final boolean no_cache;
 
        // Note: Only access is synchronized in "getPerm"
-       private final static Map<String,Map<String,Permission>> perms = new HashMap<String,Map<String,Permission>>();
+       private final static Map<String,Map<String,Permission>> perms = new HashMap<>();
 
        public String name() {
                return bcName;
@@ -379,14 +380,14 @@ public class Page extends HTMLCacheGen {
                Map<String,Permission> msp = perms.get(instance);
                Permission p;
                if(msp==null) {
-                       msp = new HashMap<String,Permission>();
+                       msp = new HashMap<>();
                        perms.put(instance, msp);
                        p=null;
                } else {
                        p = msp.get(instance);
                }
                if(p==null) {
-                       p=new AAFPermission(PERM_CA_TYPE,instance,action);
+                       p=new AAFPermission(PERM_NS, PERM_CA_TYPE,instance,action);
                        msp.put(action, p);
                }
                return p;