8 files changed, 43 insertions, 41 deletions
diff --git a/client/src/test/java/com/client/test/BasicDME2Client.java b/client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java
index f26d3b1..4619a0f 100644
--- a/client/src/test/java/com/client/test/BasicDME2Client.java
+++ b/client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.net.URI;
 import java.util.Properties;
diff --git a/client/src/test/java/com/client/test/JU_DNSLocator.java b/client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java
index 04a4f17..8cac8d1 100644
--- a/client/src/test/java/com/client/test/JU_DNSLocator.java
+++ b/client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.net.URI;
 import java.net.URL;
@@ -28,10 +28,9 @@ import java.net.URLConnection;
 
 import org.junit.AfterClass;
 import org.junit.Test;
-
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Locator.Item;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.Locator.Item;
+import org.onap.aaf.cadi.locator.DNSLocator;
 
 public class JU_DNSLocator {
 
diff --git a/client/src/test/java/com/client/test/JU_PropertyLocator.java b/client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java
index 89bef62..c09d697 100644
--- a/client/src/test/java/com/client/test/JU_PropertyLocator.java
+++ b/client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java
@@ -20,18 +20,17 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.net.URI;
 
 import org.junit.AfterClass;
 import org.junit.Test;
+import org.onap.aaf.cadi.Locator.Item;
+import org.onap.aaf.cadi.locator.PropertyLocator;
 
 import static org.junit.Assert.*;
 
-import com.att.cadi.Locator.Item;
-import com.att.cadi.locator.PropertyLocator;
-
 public class JU_PropertyLocator {
 
 	@AfterClass
diff --git a/client/src/test/java/com/client/test/PaulUzee.java b/client/src/test/java/org/onap/aaf/client/test/PaulUzee.java
index 24aeb49..4bec3fd 100644
--- a/client/src/test/java/com/client/test/PaulUzee.java
+++ b/client/src/test/java/org/onap/aaf/client/test/PaulUzee.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,12 +28,13 @@ import java.io.PrintStream;
 import java.net.URI;
 import java.util.Properties;
 
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.Locator.Item;
+import org.onap.aaf.cadi.dme2.DME2Locator;
+
 import com.att.aft.dme2.api.DME2Manager;
-import com.att.cadi.Access;
-import com.att.cadi.Locator;
-import com.att.cadi.Access.Level;
-import com.att.cadi.Locator.Item;
-import com.att.cadi.dme2.DME2Locator;
 
 public class PaulUzee {
 	public static void main(String[] args) {
diff --git a/client/src/test/java/com/client/test/TestAccess.java b/client/src/test/java/org/onap/aaf/client/test/TestAccess.java
index 434ae62..c054bc0 100644
--- a/client/src/test/java/com/client/test/TestAccess.java
+++ b/client/src/test/java/org/onap/aaf/client/test/TestAccess.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.att.cadi.Access;
-import com.att.cadi.Symm;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Symm;
 
 public class TestAccess implements Access {
 	private Symm symm;
diff --git a/client/src/test/java/com/client/test/TestDME2Client.java b/client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java
index 415f992..4abec42 100644
--- a/client/src/test/java/com/client/test/TestDME2Client.java
+++ b/client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java
@@ -20,15 +20,16 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.io.FileInputStream;
 import java.net.URI;
 import java.util.Properties;
 
+import org.onap.aaf.cadi.Symm;
+
 import com.att.aft.dme2.api.DME2Client;
 import com.att.aft.dme2.api.DME2Manager;
-import com.att.cadi.Symm;
 
 public class TestDME2Client {
 	public static void main(String[] args) {
diff --git a/client/src/test/java/com/client/test/TestDME2RcliClient.java b/client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java
index 6ff5d6f..10c917c 100644
--- a/client/src/test/java/com/client/test/TestDME2RcliClient.java
+++ b/client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java
@@ -20,16 +20,17 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.net.URI;
 import java.util.Properties;
 
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.dme2.DME2ClientSS;
+import org.onap.aaf.cadi.dme2.DRcli;
+
 import com.att.aft.dme2.api.DME2Manager;
-import com.att.cadi.Access;
-import com.att.cadi.client.Future;
-import com.att.cadi.dme2.DME2ClientSS;
-import com.att.cadi.dme2.DRcli;
 
 public class TestDME2RcliClient {
 	public static void main(String[] args) {
diff --git a/client/src/test/java/com/client/test/TestHClient.java b/client/src/test/java/org/onap/aaf/client/test/TestHClient.java
index 7fcd113..2476caf 100644
--- a/client/src/test/java/com/client/test/TestHClient.java
+++ b/client/src/test/java/org/onap/aaf/client/test/TestHClient.java
@@ -20,27 +20,28 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.client.test;
+package org.onap.aaf.client.test;
 
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.util.Properties;
 
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.SecuritySetter;
+import org.onap.aaf.cadi.Locator.Item;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.http.HBasicAuthSS;
+import org.onap.aaf.cadi.http.HMangr;
+import org.onap.aaf.cadi.locator.DME2Locator;
+
 import com.att.aft.dme2.api.DME2Manager;
-import com.att.cadi.CadiException;
-import com.att.cadi.Locator;
-import com.att.cadi.Locator.Item;
-import com.att.cadi.PropAccess;
-import com.att.cadi.SecuritySetter;
-import com.att.cadi.client.Future;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.client.Retryable;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.http.HBasicAuthSS;
-import com.att.cadi.http.HMangr;
-import com.att.cadi.locator.DME2Locator;
-import com.att.inno.env.APIException;
+import org.onap.aaf.inno.env.APIException;
 
 public class TestHClient {
 	public static void main(String[] args) {