Change API Version to 2.1.15

[aaf/authz.git] / auth / auth-locate / src / main / java / org / onap / aaf / auth / locate / AAF_Locate.java

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 26bdb69..ebbeae6 100644 (file)
--- 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
@@ -182,7 +182,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     protected AAFConHttp _newAAFConHttp() throws CadiException {
         try {
             if (dal==null) {
-                dal = AbsAAFLocator.create("%AAF_NS.service",Config.AAF_DEFAULT_API_VERSION);
+                dal = AbsAAFLocator.create("%CNS.%NS.service",Config.AAF_DEFAULT_API_VERSION);
             }
             // utilize pre-constructed DirectAAFLocator
             return new AAFConHttp(env.access(),dal);
@@ -199,8 +199,8 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
                        } catch (UnknownHostException | CadiException e) {
                                throw new LocatorException(e);
                        }
-            gui_locator = AbsAAFLocator.create(rph.getPublicEntryName("gui", rph.default_container),
-               Config.AAF_DEFAULT_API_VERSION);
+               String url = rph.getPublicEntryName("gui", rph.default_container);
+            gui_locator = AbsAAFLocator.create(url,Config.AAF_DEFAULT_API_VERSION);
         }
         return gui_locator;
     }
@@ -241,9 +241,13 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
             Log4JLogIt logIt = new Log4JLogIt(args, "locate");
             PropAccess propAccess = new PropAccess(logIt,args);
 
-             AAF_Locate service = new AAF_Locate(new AuthzEnv(propAccess));
-            JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
-            jss.start();
+            try {
+                new JettyServiceStarter<AuthzEnv,AuthzTrans>(
+                       new AAF_Locate(new AuthzEnv(propAccess)),true)
+                               .start();
+               } catch (Exception e) {
+                   propAccess.log(e);
+               }
         } catch (Exception e) {
             e.printStackTrace();
         }