From 3cba0debb7ef72781ecbab25474d27918d4d2407 Mon Sep 17 00:00:00 2001
From: sblimkie <steven.blimkie@amdocs.com>
Date: Wed, 6 Dec 2017 13:22:56 -0500
Subject: [PATCH] Use rebranded version of auth library

Use the new version of the auth library which has been renamed from
openecomp to onap

Issue-ID: AAI-10
Change-Id: Ie5f9520f6218b7550dd68844600b683e30ec6424
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
---
 README.md                                                   | 4 ++--
 ajsc-shared-config/etc/logback.xml                          | 2 +-
 bundleconfig-local/etc/appprops/app-intercepts.properties   | 2 +-
 pom.xml                                                     | 4 ++--
 src/main/java/org/onap/crud/service/AaiResourceService.java | 2 +-
 src/main/java/org/onap/crud/service/CrudRestService.java    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 75bdde5..8724b74 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ After cloning the project, execute the following Maven command from the project'
 
 Now, you can build your Docker image:
 
-    > docker build -t openecomp/crud-service target 
+    > docker build -t onap/crud-service target 
     
 ### Deploying The Microservice 
 
@@ -123,4 +123,4 @@ Gizmo exposes a bulk API to operate on multiple graph entities within a single r
 
 
  		
- 
\ No newline at end of file
+ 
diff --git a/ajsc-shared-config/etc/logback.xml b/ajsc-shared-config/etc/logback.xml
index 5972f55..99adb1f 100644
--- a/ajsc-shared-config/etc/logback.xml
+++ b/ajsc-shared-config/etc/logback.xml
@@ -180,7 +180,7 @@
   <logger name="com.att.ajsc.filemonitor" level="WARN" />
 
   <!-- CRUD Service loggers -->
-  <logger name="org.openecomp.crud" level="INFO" />
+  <logger name="org.onap.crud" level="INFO" />
 
   <!-- Other Loggers that may help troubleshoot -->
   <logger name="net.sf" level="WARN" />
diff --git a/bundleconfig-local/etc/appprops/app-intercepts.properties b/bundleconfig-local/etc/appprops/app-intercepts.properties
index dada69c..c31acbc 100644
--- a/bundleconfig-local/etc/appprops/app-intercepts.properties
+++ b/bundleconfig-local/etc/appprops/app-intercepts.properties
@@ -5,4 +5,4 @@
 #each endpoint in the request/response flow and can allow for more precise debugging and/or processing of the exchange. 
 
 #e.g. 
-#intercepts=org.openecomp.crud.JaxrsEchoService,packagename.class1name,packagename.class2name
+#intercepts=org.onap.crud.JaxrsEchoService,packagename.class1name,packagename.class2name
diff --git a/pom.xml b/pom.xml
index 99e73cc..ef500b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
         <dependency>
 	     <groupId>org.onap.aai.aai-common</groupId>
 	     <artifactId>aai-auth</artifactId>
-	     <version>1.1.0</version>
+	     <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -240,7 +240,7 @@
               <configuration>
                 <verbose>true</verbose>
                 <serverId>docker-hub</serverId>
-                <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
+                <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
                 <dockerDirectory>${docker.location}</dockerDirectory>
                 <imageTags>
                   <imageTag>latest</imageTag>
diff --git a/src/main/java/org/onap/crud/service/AaiResourceService.java b/src/main/java/org/onap/crud/service/AaiResourceService.java
index 2e4464d..98f83af 100644
--- a/src/main/java/org/onap/crud/service/AaiResourceService.java
+++ b/src/main/java/org/onap/crud/service/AaiResourceService.java
@@ -51,7 +51,7 @@ import org.onap.aai.serialization.db.EdgeProperty;
 import org.onap.aai.serialization.db.EdgeRule;
 import org.onap.aai.serialization.db.EdgeRules;
 import org.onap.aai.serialization.db.EdgeType;
-import org.openecomp.auth.Auth;
+import org.onap.aaiauth.auth.Auth;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.crud.exception.CrudException;
diff --git a/src/main/java/org/onap/crud/service/CrudRestService.java b/src/main/java/org/onap/crud/service/CrudRestService.java
index da792b5..974dbb2 100644
--- a/src/main/java/org/onap/crud/service/CrudRestService.java
+++ b/src/main/java/org/onap/crud/service/CrudRestService.java
@@ -49,7 +49,7 @@ import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.cxf.jaxrs.ext.PATCH;
-import org.openecomp.auth.Auth;
+import org.onap.aaiauth.auth.Auth;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.crud.exception.CrudException;
-- 
2.16.6