X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-locate%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Flocate%2FAAF_Locate.java;h=a5e12f5244681de62e379c19ae822c797c86f6f6;hb=dd097a4b411cd78ced737548a43e019b1f3172f1;hp=c8294d1fe77e06d40f3fdbb6e714f530d63943d8;hpb=762dabc6f9577b5b1a8211dddf38ce34295f22a4;p=aaf%2Fauthz.git

diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
index c8294d1f..a5e12f52 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
@@ -66,8 +66,6 @@ import org.onap.aaf.misc.env.Env;
 import com.datastax.driver.core.Cluster;
 
 public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
-    private static final String DOT_LOCATOR = ".locator";
-
     private static final String USER_PERMS = "userPerms";
     private LocateFacade_1_1 facade; // this is the default Facade
     private LocateFacade_1_1 facade_1_1_XML;
@@ -80,8 +78,6 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     public final LocateDAO locateDAO;
     public final ConfigDAO configDAO;
     private Locator<URI> dal;
-    private final String aaf_service_name;
-    private final String aaf_gui_name;
 
     
     /**
@@ -95,8 +91,6 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
      */
     public AAF_Locate(final AuthzEnv env) throws Exception {
         super(env.access(), env);
-        aaf_service_name = app_name.replace(DOT_LOCATOR, ".service");
-        aaf_gui_name = app_name.replace(DOT_LOCATOR, ".gui");
         
         expireIn = Long.parseLong(env.getProperty(Config.AAF_USER_EXPIRES, Config.AAF_USER_EXPIRES_DEF));
 
@@ -186,7 +180,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     protected AAFConHttp _newAAFConHttp() throws CadiException {
         try {
             if (dal==null) {
-                dal = AbsAAFLocator.create(aaf_service_name,Config.AAF_DEFAULT_API_VERSION);
+                dal = AbsAAFLocator.create("%CNS.%AAF_NS.service",Config.AAF_DEFAULT_API_VERSION);
             }
             // utilize pre-constructed DirectAAFLocator
             return new AAFConHttp(env.access(),dal);
@@ -197,7 +191,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
 
     public Locator<URI> getGUILocator() throws LocatorException {
         if (gui_locator==null) {
-            gui_locator = AbsAAFLocator.create(aaf_gui_name,Config.AAF_DEFAULT_API_VERSION);
+            gui_locator = AbsAAFLocator.create("AAF_NS.gui",Config.AAF_DEFAULT_API_VERSION);
         }
         return gui_locator;
     }
@@ -220,7 +214,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     @Override
     public Registrant<AuthzEnv>[] registrants(final int port) throws CadiException {
         return new Registrant[] {
-            new DirectRegistrar(access,locateDAO,app_name,app_version,port)
+            new DirectRegistrar(access,locateDAO,port)
         };
     }