Update project structure for aaf/cadi

Update project structure from com.att to org.onap
and add distribution management and staging plugin.

Issue-id: AAF-22
Change-Id: Idf2b591139e38921ad28782a51486714a05dee92
Signed-off-by: sg481n <sg481n@att.com>

45 files changed, 332 insertions, 255 deletions

diff --git a/client/pom.xml b/client/pom.xml
index 1b0d6e3..45615cb 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
 -->

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

 <parent>

-		<groupId>com.att.cadi</groupId>

+		<groupId>org.onap.aaf.cadi</groupId>

 		<artifactId>parent</artifactId>

 		<version>1.0.0-SNAPSHOT</version>

 		<relativePath>..</relativePath>

@@ -34,14 +34,22 @@
 	<url>https://github.com/att/AAF</url>

 	<description>CADI</description>

 	<modelVersion>4.0.0</modelVersion>

-

+<properties>

+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>

+        <nexusproxy>https://nexus.onap.org</nexusproxy>

+		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>

+		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>

+		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>

+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>

+	</properties>

 	<dependencies>

 		<dependency>

-			<groupId>com.att.inno</groupId>

+			<groupId>org.onap.aaf.inno</groupId>

 			<artifactId>rosetta</artifactId>

 		</dependency>

 		<dependency>

-			<groupId>com.att.cadi</groupId>

+			<groupId>org.onap.aaf.cadi</groupId>

 			<artifactId>cadi-core</artifactId>

 		</dependency>

 		<dependency>

@@ -89,19 +97,61 @@
 		      </executions>

 		    </plugin>

 	

- 

-		<plugin>

-			<groupId>org.sonatype.plugins</groupId>

-			<artifactId>nexus-staging-maven-plugin</artifactId>

-			<version>1.6.7</version>

-			<extensions>true</extensions>

-			<configuration>

-			<serverId>ossrhdme</serverId>

-			<nexusUrl>https://oss.sonatype.org/</nexusUrl>

-			<autoReleaseAfterClose>true</autoReleaseAfterClose>

-			</configuration>

-		</plugin>

+  <plugin>

+				<groupId>org.sonatype.plugins</groupId>

+				<artifactId>nexus-staging-maven-plugin</artifactId>

+				<version>1.6.7</version>

+				<extensions>true</extensions>

+				<configuration>

+					<nexusUrl>${nexusproxy}</nexusUrl>

+					<stagingProfileId>176c31dfe190a</stagingProfileId>

+					<serverId>ecomp-staging</serverId>

+				</configuration>

+			</plugin> 

 		</plugins>

 	</build>

+		<distributionManagement>

+		<repository>

+			<id>ecomp-releases</id>

+			<name>AAF Release Repository</name>

+			<url>${nexusproxy}${releaseNexusPath}</url>

+		</repository>

+		<snapshotRepository>

+			<id>ecomp-snapshots</id>

+			<name>AAF Snapshot Repository</name>

+			<url>${nexusproxy}${snapshotNexusPath}</url>

+		</snapshotRepository>

+		<site>

+			<id>ecomp-site</id>

+			<url>dav:${nexusproxy}${sitePath}</url>

+		</site>

+	</distributionManagement>

+<pluginRepositories>

+        <pluginRepository>

+            <id>onap-plugin-snapshots</id>

+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>

+        </pluginRepository>

+    </pluginRepositories>

 	

+	<repositories>

+		<repository>

+			<id>central</id>

+			<name>Maven 2 repository 2</name>

+			<url>http://repo2.maven.org/maven2/</url>

+		</repository>

+		<repository>

+            <id>onap-jar-snapshots</id>

+            <url>https://nexus.onap.org/content/repositories/snapshots</url>

+        </repository>

+		<repository>

+			<id>spring-repo</id>

+			<name>Spring repo</name>

+			<url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>

+		</repository>

+		<repository>

+			<id>repository.jboss.org-public</id>

+			<name>JBoss.org Maven repository</name>

+			<url>https://repository.jboss.org/nexus/content/groups/public</url>

+		</repository>

+	</repositories>

 </project>

diff --git a/client/src/main/java/com/att/cadi/client/AAFClient.java b/client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java
index 3f8fb47..cb6299b 100644
--- a/client/src/main/java/com/att/cadi/client/AAFClient.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java
@@ -20,22 +20,23 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.net.HttpURLConnection;

 import java.util.HashMap;

 import java.util.Map;

 

+import org.onap.aaf.cadi.Access;

+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.Access;

-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 com.att.rosetta.env.RosettaDF;

-import com.att.rosetta.env.RosettaEnv;

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.rosetta.env.RosettaDF;

+import org.onap.aaf.rosetta.env.RosettaEnv;

 

 public class AAFClient {

 	private RosettaEnv env;

diff --git a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java b/client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java
index a0ab06d..e714e3a 100644
--- a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.io.IOException;

 

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.Symm;

-import com.att.cadi.config.SecurityInfoC;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.Symm;

+import org.onap.aaf.cadi.config.SecurityInfoC;

 

 public abstract class AbsBasicAuth<CLIENT> implements SecuritySetter<CLIENT> {

 		protected static final String REPEAT_OFFENDER="This call is aborted because of repeated usage of invalid Passwords";

diff --git a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java b/client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java
index 69647e6..e731f09 100644
--- a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java
@@ -20,15 +20,15 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.security.Principal;

 

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.config.SecurityInfoC;

-import com.att.cadi.principal.BasicPrincipal;

-import com.att.cadi.principal.TGuardPrincipal;

-import com.att.cadi.principal.TrustPrincipal;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.config.SecurityInfoC;

+import org.onap.aaf.cadi.principal.BasicPrincipal;

+import org.onap.aaf.cadi.principal.TGuardPrincipal;

+import org.onap.aaf.cadi.principal.TrustPrincipal;

 

 public abstract class AbsTransferSS<CLIENT> implements SecuritySetter<CLIENT> {

 	protected String value;

diff --git a/client/src/main/java/com/att/cadi/client/Delete.java b/client/src/main/java/org/onap/aaf/cadi/client/Delete.java
index f780af1..9f03aab 100644
--- a/client/src/main/java/com/att/cadi/client/Delete.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Delete.java
@@ -20,11 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

-import com.att.cadi.CadiException;

-import com.att.inno.env.APIException;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.cadi.CadiException;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 public class Delete<T> extends AAFClient.Call<T> {

 	public Delete(AAFClient ac, RosettaDF<T> df) {

diff --git a/client/src/main/java/com/att/cadi/client/EClient.java b/client/src/main/java/org/onap/aaf/cadi/client/EClient.java
index 166d150..a880331 100644
--- a/client/src/main/java/com/att/cadi/client/EClient.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/EClient.java
@@ -20,16 +20,16 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.io.IOException;

 import java.io.OutputStream;

 

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.inno.env.APIException;

-import com.att.inno.env.Data;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 

 public interface EClient<CT> {

diff --git a/client/src/main/java/com/att/cadi/client/EnvAccess.java b/client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java
index f78f2ff..bcf41f8 100644
--- a/client/src/main/java/com/att/cadi/client/EnvAccess.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java
@@ -20,18 +20,20 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.io.IOException;

 import java.io.InputStream;

 import java.util.Map.Entry;

+

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Symm;

+

 import java.util.Properties;

 

-import com.att.cadi.Access;

-import com.att.cadi.Symm;

-import com.att.inno.env.Decryptor;

-import com.att.inno.env.Env;

-import com.att.inno.env.impl.BasicEnv;

+import org.onap.aaf.inno.env.Decryptor;

+import org.onap.aaf.inno.env.Env;

+import org.onap.aaf.inno.env.impl.BasicEnv;

 

 public class EnvAccess implements Access {

 	private Env env;

diff --git a/client/src/main/java/com/att/cadi/client/Future.java b/client/src/main/java/org/onap/aaf/cadi/client/Future.java
index 18987a6..01a85b8 100644
--- a/client/src/main/java/com/att/cadi/client/Future.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Future.java
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

-import com.att.cadi.CadiException;

+import org.onap.aaf.cadi.CadiException;

 

 public abstract class Future<T> {

 	public T value;

diff --git a/client/src/main/java/com/att/cadi/client/Get.java b/client/src/main/java/org/onap/aaf/cadi/client/Get.java
index a39aaf1..920b476 100644
--- a/client/src/main/java/com/att/cadi/client/Get.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Get.java
@@ -20,11 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

-import com.att.cadi.CadiException;

-import com.att.inno.env.APIException;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.cadi.CadiException;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 public class Get<T> extends AAFClient.Call<T> {

 	public Get(AAFClient ac, RosettaDF<T> df) {

diff --git a/client/src/main/java/com/att/cadi/client/Holder.java b/client/src/main/java/org/onap/aaf/cadi/client/Holder.java
index 3ad7ce3..577fa5f 100644
--- a/client/src/main/java/com/att/cadi/client/Holder.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Holder.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 /**

  * Use to set Variables outside of Anonymous classes.

diff --git a/client/src/main/java/com/att/cadi/client/Post.java b/client/src/main/java/org/onap/aaf/cadi/client/Post.java
index 001f1b3..5c9bde2 100644
--- a/client/src/main/java/com/att/cadi/client/Post.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Post.java
@@ -20,12 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.inno.env.APIException;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.LocatorException;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 public class Post<T> extends AAFClient.Call<T> {

 	public Post(AAFClient ac, RosettaDF<T> df) {

diff --git a/client/src/main/java/com/att/cadi/client/PropertyLocator.java b/client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java
index acd3b4a..15705ab 100644
--- a/client/src/main/java/com/att/cadi/client/PropertyLocator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java
@@ -20,14 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.net.URI;

 import java.net.URISyntaxException;

 import java.util.Random;

 

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

 

 public class PropertyLocator implements Locator {

 	private final URI [] orig;

diff --git a/client/src/main/java/com/att/cadi/client/Put.java b/client/src/main/java/org/onap/aaf/cadi/client/Put.java
index b14bfac..ebd6e0d 100644
--- a/client/src/main/java/com/att/cadi/client/Put.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Put.java
@@ -20,11 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

-import com.att.cadi.CadiException;

-import com.att.inno.env.APIException;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.cadi.CadiException;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 public class Put<T> extends AAFClient.Call<T> {

 	public Put(AAFClient ac, RosettaDF<T> df) {

diff --git a/client/src/main/java/com/att/cadi/client/RawClient.java b/client/src/main/java/org/onap/aaf/cadi/client/RawClient.java
index c1ad633..0386383 100644
--- a/client/src/main/java/com/att/cadi/client/RawClient.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/RawClient.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.io.File;

 import java.io.FileInputStream;

@@ -28,9 +28,10 @@ import java.io.FileOutputStream;
 import java.io.PrintStream;

 import java.net.URI;

 

+import org.onap.aaf.cadi.Symm;

+import org.onap.aaf.cadi.config.Config;

+

 import com.att.aft.dme2.api.DME2Client;

-import com.att.cadi.Symm;

-import com.att.cadi.config.Config;

 

 public abstract class RawClient {

 	protected static String aafid, aafpass, aafurl;

diff --git a/client/src/main/java/com/att/cadi/client/Rcli.java b/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
index c25cb2b..23158ef 100644
--- a/client/src/main/java/com/att/cadi/client/Rcli.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.io.IOException;

 import java.io.OutputStream;

@@ -31,13 +31,14 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.cadi.CadiException;

-import com.att.cadi.SecuritySetter;

-import com.att.inno.env.APIException;

-import com.att.inno.env.Data.TYPE;

-import com.att.inno.env.util.Pool;

-import com.att.inno.env.util.Pool.Pooled;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.SecuritySetter;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data.TYPE;

+import org.onap.aaf.inno.env.util.Pool;

+import org.onap.aaf.inno.env.util.Pool.Pooled;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 public abstract class Rcli<CT> {

 	public static final String BLANK = "";

diff --git a/client/src/main/java/com/att/cadi/client/Result.java b/client/src/main/java/org/onap/aaf/cadi/client/Result.java
index b86d9b9..5b3d8fd 100644
--- a/client/src/main/java/com/att/cadi/client/Result.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Result.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 public class Result<T> {

 	public final int code;

diff --git a/client/src/main/java/com/att/cadi/client/Retryable.java b/client/src/main/java/org/onap/aaf/cadi/client/Retryable.java
index 4f49a72..9c701ef 100644
--- a/client/src/main/java/com/att/cadi/client/Retryable.java
+++ b/client/src/main/java/org/onap/aaf/cadi/client/Retryable.java
@@ -20,13 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.client;

+package org.onap.aaf.cadi.client;

 

 import java.net.ConnectException;

 

-import com.att.cadi.CadiException;

-import com.att.cadi.Locator;

-import com.att.inno.env.APIException;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.Locator;

+

+import org.onap.aaf.inno.env.APIException;

 

 /**

  * 

diff --git a/client/src/main/java/com/att/cadi/dme2/DEClient.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java
index 138fb63..7bbdc25 100644
--- a/client/src/main/java/com/att/cadi/dme2/DEClient.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 import java.io.ByteArrayOutputStream;

 import java.io.IOException;

@@ -28,19 +28,20 @@ import java.net.URI;
 

 import javax.servlet.http.HttpServletResponse;

 

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.client.EClient;

+import org.onap.aaf.cadi.client.Future;

+import org.onap.aaf.cadi.client.Rcli;

+

 import com.att.aft.dme2.api.DME2Client;

 import com.att.aft.dme2.api.DME2Exception;

 import com.att.aft.dme2.api.DME2Manager;

 import com.att.aft.dme2.handler.DME2RestfulHandler;

 import com.att.aft.dme2.handler.DME2RestfulHandler.ResponseInfo;

-import com.att.cadi.CadiException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.client.EClient;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.inno.env.APIException;

-import com.att.inno.env.Data;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 public class DEClient implements EClient<DME2Client> {

 	private DME2Client client;

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java
index 3fb1f13..b29074f 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java
@@ -20,18 +20,19 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 import java.io.IOException;

 import java.security.GeneralSecurityException;

 

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.client.AbsBasicAuth;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.config.SecurityInfoC;

+import org.onap.aaf.cadi.principal.BasicPrincipal;

+

 import com.att.aft.dme2.api.DME2Client;

-import com.att.cadi.Access;

-import com.att.cadi.CadiException;

-import com.att.cadi.client.AbsBasicAuth;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfoC;

-import com.att.cadi.principal.BasicPrincipal;

 

 public class DME2BasicAuth extends AbsBasicAuth<DME2Client> {

 	public DME2BasicAuth(String user, String pass, SecurityInfoC<DME2Client> si) throws IOException {

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java
index 8895e9f..167fe3b 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java
@@ -20,14 +20,15 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 import java.io.IOException;

 

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.Access.Level;

+

 import com.att.aft.dme2.api.DME2Client;

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.SecuritySetter;

 

 public class DME2ClientSS implements SecuritySetter<DME2Client> {

 	private Access access;

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java
index f28fe94..47af9ea 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 

 import java.net.InetAddress;

@@ -31,15 +31,16 @@ import java.util.Arrays;
 import java.util.Comparator;

 import java.util.Random;

 

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.Access.Level;

+

 //

 import com.att.aft.dme2.api.DME2Exception;

 import com.att.aft.dme2.api.DME2Manager;

 import com.att.aft.dme2.api.DME2Server;

 import com.att.aft.dme2.manager.registry.DME2Endpoint;

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

 

 public class DME2Locator implements Locator {

 	private DME2Manager dm;

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java
index a8d7ac9..f71d19c 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java
@@ -20,16 +20,17 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 import java.io.IOException;

 import java.security.Principal;

 

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.client.AbsTransferSS;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.config.SecurityInfoC;

+

 import com.att.aft.dme2.api.DME2Client;

-import com.att.cadi.CadiException;

-import com.att.cadi.client.AbsTransferSS;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfoC;

 

 public class DME2TransferSS extends AbsTransferSS<DME2Client> {

 

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java
index 45978e4..af803c1 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java
@@ -20,17 +20,18 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 import java.io.IOException;

 import java.security.cert.CertificateEncodingException;

 

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.config.SecurityInfoC;

+

 import com.att.aft.dme2.api.DME2Client;

-import com.att.cadi.CadiException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfoC;

-import com.att.inno.env.APIException;

+import org.onap.aaf.inno.env.APIException;

 

 

 public class DME2x509SS implements SecuritySetter<DME2Client> {

diff --git a/client/src/main/java/com/att/cadi/dme2/DRcli.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java
index 8a1f5fb..cd95bcc 100644
--- a/client/src/main/java/com/att/cadi/dme2/DRcli.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dme2;

+package org.onap.aaf.cadi.dme2;

 

 import java.net.MalformedURLException;

 import java.net.URI;

@@ -28,17 +28,18 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;

 import java.util.List;

 

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.client.EClient;

+import org.onap.aaf.cadi.client.Rcli;

+

 import com.att.aft.dme2.api.DME2Client;

 import com.att.aft.dme2.api.DME2Exception;

 import com.att.aft.dme2.api.DME2Manager;

 import com.att.aft.dme2.manager.registry.DME2Endpoint;

 import com.att.aft.dme2.request.DmeUniformResource;

-import com.att.cadi.CadiException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.client.EClient;

-import com.att.cadi.client.Rcli;

-import com.att.inno.env.APIException;

-import com.att.inno.env.Data.TYPE;

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data.TYPE;

 

 /**

  * DME2 Rosetta Client

diff --git a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java b/client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java
index 3bf9080..105ccf1 100644
--- a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java
@@ -20,17 +20,17 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.dnsloc;

+package org.onap.aaf.cadi.dnsloc;

 

 import java.io.IOException;

 import java.net.InetAddress;

 import java.net.URI;

 import java.net.URISyntaxException;

 

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.Access.Level;

 

 public class DNSLocator implements Locator {

 	private static enum Status {UNTRIED, OK, INVALID, SLOW};

diff --git a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java b/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
index dfedcc1..f9212e8 100644
--- a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
@@ -20,19 +20,19 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.http;

+package org.onap.aaf.cadi.http;

 

 import java.io.IOException;

 import java.net.HttpURLConnection;

 

 import javax.net.ssl.HttpsURLConnection;

 

-import com.att.cadi.Access;

-import com.att.cadi.CadiException;

-import com.att.cadi.client.AbsBasicAuth;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfoC;

-import com.att.cadi.principal.BasicPrincipal;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.client.AbsBasicAuth;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.config.SecurityInfoC;

+import org.onap.aaf.cadi.principal.BasicPrincipal;

 

 public class HBasicAuthSS extends AbsBasicAuth<HttpURLConnection> {

 	public HBasicAuthSS(Access access, SecurityInfoC<HttpURLConnection> si) throws IOException {

diff --git a/client/src/main/java/com/att/cadi/http/HClient.java b/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
index 6704bf4..70a703e 100644
--- a/client/src/main/java/com/att/cadi/http/HClient.java
+++ b/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.http;

+package org.onap.aaf.cadi.http;

 

 import java.io.IOException;

 import java.io.InputStream;

@@ -34,17 +34,18 @@ import java.util.ArrayList;
 

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.client.EClient;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.inno.env.APIException;

-import com.att.inno.env.Data;

-import com.att.inno.env.Data.TYPE;

-import com.att.inno.env.util.Pool.Pooled;

-import com.att.rosetta.env.RosettaDF;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.client.EClient;

+import org.onap.aaf.cadi.client.Future;

+import org.onap.aaf.cadi.client.Rcli;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data;

+import org.onap.aaf.inno.env.Data.TYPE;

+import org.onap.aaf.inno.env.util.Pool.Pooled;

+import org.onap.aaf.rosetta.env.RosettaDF;

 

 /**

  * Low Level Http Client Mechanism. Chances are, you want the high level "HRcli"

diff --git a/client/src/main/java/com/att/cadi/http/HMangr.java b/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
index 13fe815..833434f 100644
--- a/client/src/main/java/com/att/cadi/http/HMangr.java
+++ b/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.http;

+package org.onap.aaf.cadi.http;

 

 import java.net.ConnectException;

 import java.net.HttpURLConnection;

@@ -30,16 +30,17 @@ import java.net.URISyntaxException;
 

 import javax.net.ssl.SSLHandshakeException;

 

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.Locator.Item;

-import com.att.cadi.CadiException;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.inno.env.APIException;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.Access.Level;

+import org.onap.aaf.cadi.Locator.Item;

+import org.onap.aaf.cadi.client.Rcli;

+import org.onap.aaf.cadi.client.Retryable;

+

+import org.onap.aaf.inno.env.APIException;

 

 public class HMangr {

 	private String apiVersion;

diff --git a/client/src/main/java/com/att/cadi/http/HRcli.java b/client/src/main/java/org/onap/aaf/cadi/http/HRcli.java
index cfbb5c1..1ad0fcc 100644
--- a/client/src/main/java/com/att/cadi/http/HRcli.java
+++ b/client/src/main/java/org/onap/aaf/cadi/http/HRcli.java
@@ -20,21 +20,22 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.http;

+package org.onap.aaf.cadi.http;

 

 import java.net.HttpURLConnection;

 import java.net.URI;

 import java.net.URISyntaxException;

 

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.Locator.Item;

+import org.onap.aaf.cadi.client.EClient;

+import org.onap.aaf.cadi.client.Rcli;

+

 import com.att.aft.dme2.api.DME2Exception;

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.Locator.Item;

-import com.att.cadi.client.EClient;

-import com.att.cadi.client.Rcli;

-import com.att.inno.env.APIException;

-import com.att.inno.env.Data.TYPE;

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.Data.TYPE;

 

 /**

  * DME2 Rosetta Client

diff --git a/client/src/main/java/com/att/cadi/http/HTransferSS.java b/client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java
index 89a38c3..db456f2 100644
--- a/client/src/main/java/com/att/cadi/http/HTransferSS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.http;

+package org.onap.aaf.cadi.http;

 

 import java.io.IOException;

 import java.net.HttpURLConnection;

@@ -28,10 +28,10 @@ import java.security.Principal;
 

 import javax.net.ssl.HttpsURLConnection;

 

-import com.att.cadi.CadiException;

-import com.att.cadi.client.AbsTransferSS;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfoC;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.client.AbsTransferSS;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.config.SecurityInfoC;

 

 

 public class HTransferSS extends AbsTransferSS<HttpURLConnection> {

diff --git a/client/src/main/java/com/att/cadi/http/HX509SS.java b/client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java
index b790ede..0bdc843 100644
--- a/client/src/main/java/com/att/cadi/http/HX509SS.java
+++ b/client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.http;

+package org.onap.aaf.cadi.http;

 

 import java.io.ByteArrayInputStream;

 import java.io.ByteArrayOutputStream;

@@ -35,13 +35,14 @@ import java.security.cert.X509Certificate;
 import javax.net.ssl.HttpsURLConnection;

 import javax.net.ssl.X509KeyManager;

 

-import com.att.cadi.CadiException;

-import com.att.cadi.SecuritySetter;

-import com.att.cadi.Symm;

-import com.att.cadi.config.Config;

-import com.att.cadi.config.SecurityInfoC;

-import com.att.inno.env.APIException;

-import com.att.inno.env.util.Chrono;

+import org.onap.aaf.cadi.CadiException;

+import org.onap.aaf.cadi.SecuritySetter;

+import org.onap.aaf.cadi.Symm;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.config.SecurityInfoC;

+

+import org.onap.aaf.inno.env.APIException;

+import org.onap.aaf.inno.env.util.Chrono;

 

 

 public class HX509SS implements SecuritySetter<HttpURLConnection> {

diff --git a/client/src/main/java/com/att/cadi/locator/DME2Locator.java b/client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java
index c750448..656fd19 100644
--- a/client/src/main/java/com/att/cadi/locator/DME2Locator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.locator;

+package org.onap.aaf.cadi.locator;

 

 

 import java.net.InetAddress;

@@ -31,6 +31,13 @@ import java.util.Arrays;
 import java.util.Comparator;

 import java.util.Properties;

 import java.util.Random;

+

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.PropAccess;

+import org.onap.aaf.cadi.Access.Level;

+

 import java.security.SecureRandom;

 

 //import com.att.aft.dme2.api.DME2Endpoint;

@@ -38,11 +45,6 @@ import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.api.DME2Manager;

 import com.att.aft.dme2.api.DME2Server;

 import com.att.aft.dme2.manager.registry.DME2Endpoint;

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

-import com.att.cadi.PropAccess;

 

 public class DME2Locator implements Locator<URI> {

 	private DME2Manager dm;

diff --git a/client/src/main/java/com/att/cadi/locator/DNSLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
index baa65ed..9d420d2 100644
--- a/client/src/main/java/com/att/cadi/locator/DNSLocator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
@@ -20,17 +20,17 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.locator;

+package org.onap.aaf.cadi.locator;

 

 import java.io.IOException;

 import java.net.InetAddress;

 import java.net.URI;

 import java.net.URISyntaxException;

 

-import com.att.cadi.Access;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

-import com.att.cadi.Access.Level;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.Access.Level;

 

 public class DNSLocator implements Locator<URI> {

 	private static enum Status {UNTRIED, OK, INVALID, SLOW};

diff --git a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java
index db95d91..0aa69a3 100644
--- a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java
@@ -20,15 +20,15 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.locator;

+package org.onap.aaf.cadi.locator;

 

 import java.net.URI;

 import java.net.URISyntaxException;

 

-import com.att.cadi.Access;

-import com.att.cadi.LocatorException;

-import com.att.cadi.http.HClient;

-import com.att.cadi.http.HX509SS;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.http.HClient;

+import org.onap.aaf.cadi.http.HX509SS;

 

 public class HClientHotPeerLocator extends HotPeerLocator<HClient> {

 	private final HX509SS ss;

diff --git a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java
index 5b756b2..04d2a28 100644
--- a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java
@@ -20,14 +20,15 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.locator;

+package org.onap.aaf.cadi.locator;

 

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

-import com.att.cadi.routing.GreatCircle;

-import com.att.inno.env.util.Split;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+import org.onap.aaf.cadi.Access.Level;

+import org.onap.aaf.cadi.routing.GreatCircle;

+

+import org.onap.aaf.inno.env.util.Split;

 

 /**

  * This Locator is to handle Hot Peer load protection, when the Servers are 

diff --git a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
index 216be4f..3d9470e 100644
--- a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
+++ b/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.locator;

+package org.onap.aaf.cadi.locator;

 

 import java.io.IOException;

 import java.net.InetAddress;

@@ -35,9 +35,10 @@ import java.security.SecureRandom;
 import java.util.Timer;

 import java.util.TimerTask;

 

-import com.att.cadi.Locator;

-import com.att.cadi.LocatorException;

-import com.att.inno.env.util.Split;

+import org.onap.aaf.cadi.Locator;

+import org.onap.aaf.cadi.LocatorException;

+

+import org.onap.aaf.inno.env.util.Split;

 

 public class PropertyLocator implements Locator<URI> {

 	private final URI [] orig;

diff --git a/client/src/main/java/com/att/cadi/routing/GreatCircle.java b/client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java
index 8558f8e..9e47b3f 100644
--- a/client/src/main/java/com/att/cadi/routing/GreatCircle.java
+++ b/client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.routing;

+package org.onap.aaf.cadi.routing;

 

-import com.att.inno.env.util.Split;

+import org.onap.aaf.inno.env.util.Split;

 

 public class GreatCircle {

 	// Note: multiplying by this constant is faster than calling Math equivalent function 

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) {