[AAF-21] Updated Copyright Headers for AAF

Change-Id: I6075e7a49fc6ad61db0c89a980d39e8d8691fd5f
Signed-off-by: sg481n <sg481n@att.com>

46 files changed, 45 insertions, 95 deletions

diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/client/pom.xml b/client/pom.xml
index 562a92a..bb04333 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -1,9 +1,8 @@
 <!--

   ============LICENSE_START====================================================

-  * org.onap.aai

+  * org.onap.aaf

   * ===========================================================================

   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

-  * Copyright © 2017 Amdocs

   * ===========================================================================

   * Licensed under the Apache License, Version 2.0 (the "License");

   * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/AAFClient.java b/client/src/main/java/com/att/cadi/client/AAFClient.java
index 843f3b1..3f8fb47 100644
--- a/client/src/main/java/com/att/cadi/client/AAFClient.java
+++ b/client/src/main/java/com/att/cadi/client/AAFClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java b/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
index ef8abf4..a0ab06d 100644
--- a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
+++ b/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java b/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
index 3056187..69647e6 100644
--- a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
+++ b/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Delete.java b/client/src/main/java/com/att/cadi/client/Delete.java
index 9367d4d..f780af1 100644
--- a/client/src/main/java/com/att/cadi/client/Delete.java
+++ b/client/src/main/java/com/att/cadi/client/Delete.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/EClient.java b/client/src/main/java/com/att/cadi/client/EClient.java
index f508029..166d150 100644
--- a/client/src/main/java/com/att/cadi/client/EClient.java
+++ b/client/src/main/java/com/att/cadi/client/EClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/EnvAccess.java b/client/src/main/java/com/att/cadi/client/EnvAccess.java
index f331c9a..f78f2ff 100644
--- a/client/src/main/java/com/att/cadi/client/EnvAccess.java
+++ b/client/src/main/java/com/att/cadi/client/EnvAccess.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Future.java b/client/src/main/java/com/att/cadi/client/Future.java
index 1752907..18987a6 100644
--- a/client/src/main/java/com/att/cadi/client/Future.java
+++ b/client/src/main/java/com/att/cadi/client/Future.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Get.java b/client/src/main/java/com/att/cadi/client/Get.java
index d05654d..a39aaf1 100644
--- a/client/src/main/java/com/att/cadi/client/Get.java
+++ b/client/src/main/java/com/att/cadi/client/Get.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Holder.java b/client/src/main/java/com/att/cadi/client/Holder.java
index 93067f9..3ad7ce3 100644
--- a/client/src/main/java/com/att/cadi/client/Holder.java
+++ b/client/src/main/java/com/att/cadi/client/Holder.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Post.java b/client/src/main/java/com/att/cadi/client/Post.java
index 7cc1b8c..001f1b3 100644
--- a/client/src/main/java/com/att/cadi/client/Post.java
+++ b/client/src/main/java/com/att/cadi/client/Post.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/PropertyLocator.java b/client/src/main/java/com/att/cadi/client/PropertyLocator.java
index 37bc7b6..acd3b4a 100644
--- a/client/src/main/java/com/att/cadi/client/PropertyLocator.java
+++ b/client/src/main/java/com/att/cadi/client/PropertyLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Put.java b/client/src/main/java/com/att/cadi/client/Put.java
index 033216b..b14bfac 100644
--- a/client/src/main/java/com/att/cadi/client/Put.java
+++ b/client/src/main/java/com/att/cadi/client/Put.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/RawClient.java b/client/src/main/java/com/att/cadi/client/RawClient.java
index d1a1fc2..c1ad633 100644
--- a/client/src/main/java/com/att/cadi/client/RawClient.java
+++ b/client/src/main/java/com/att/cadi/client/RawClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Rcli.java b/client/src/main/java/com/att/cadi/client/Rcli.java
index f14645e..c25cb2b 100644
--- a/client/src/main/java/com/att/cadi/client/Rcli.java
+++ b/client/src/main/java/com/att/cadi/client/Rcli.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Result.java b/client/src/main/java/com/att/cadi/client/Result.java
index 1e4909e..b86d9b9 100644
--- a/client/src/main/java/com/att/cadi/client/Result.java
+++ b/client/src/main/java/com/att/cadi/client/Result.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/client/Retryable.java b/client/src/main/java/com/att/cadi/client/Retryable.java
index e276837..4f49a72 100644
--- a/client/src/main/java/com/att/cadi/client/Retryable.java
+++ b/client/src/main/java/com/att/cadi/client/Retryable.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DEClient.java b/client/src/main/java/com/att/cadi/dme2/DEClient.java
index 6810916..138fb63 100644
--- a/client/src/main/java/com/att/cadi/dme2/DEClient.java
+++ b/client/src/main/java/com/att/cadi/dme2/DEClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java b/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
index 988c92f..3fb1f13 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java b/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
index f64367b..8895e9f 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java b/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
index b81cf4a..f28fe94 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java b/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
index d4612f1..a8d7ac9 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java b/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
index f60f791..45978e4 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dme2/DRcli.java b/client/src/main/java/com/att/cadi/dme2/DRcli.java
index 9ff56ca..8a1f5fb 100644
--- a/client/src/main/java/com/att/cadi/dme2/DRcli.java
+++ b/client/src/main/java/com/att/cadi/dme2/DRcli.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java b/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
index 498b013..3bf9080 100644
--- a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
+++ b/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java b/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
index 8d8826e..dfedcc1 100644
--- a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
+++ b/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/http/HClient.java b/client/src/main/java/com/att/cadi/http/HClient.java
index d17dcc7..6704bf4 100644
--- a/client/src/main/java/com/att/cadi/http/HClient.java
+++ b/client/src/main/java/com/att/cadi/http/HClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/http/HMangr.java b/client/src/main/java/com/att/cadi/http/HMangr.java
index 78aff4e..13fe815 100644
--- a/client/src/main/java/com/att/cadi/http/HMangr.java
+++ b/client/src/main/java/com/att/cadi/http/HMangr.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/http/HRcli.java b/client/src/main/java/com/att/cadi/http/HRcli.java
index a55b55a..cfbb5c1 100644
--- a/client/src/main/java/com/att/cadi/http/HRcli.java
+++ b/client/src/main/java/com/att/cadi/http/HRcli.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/http/HTransferSS.java b/client/src/main/java/com/att/cadi/http/HTransferSS.java
index 180a341..89a38c3 100644
--- a/client/src/main/java/com/att/cadi/http/HTransferSS.java
+++ b/client/src/main/java/com/att/cadi/http/HTransferSS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/http/HX509SS.java b/client/src/main/java/com/att/cadi/http/HX509SS.java
index 3022c0f..b790ede 100644
--- a/client/src/main/java/com/att/cadi/http/HX509SS.java
+++ b/client/src/main/java/com/att/cadi/http/HX509SS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/locator/DME2Locator.java b/client/src/main/java/com/att/cadi/locator/DME2Locator.java
index 72a5f73..c750448 100644
--- a/client/src/main/java/com/att/cadi/locator/DME2Locator.java
+++ b/client/src/main/java/com/att/cadi/locator/DME2Locator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/locator/DNSLocator.java b/client/src/main/java/com/att/cadi/locator/DNSLocator.java
index 9fbf2d4..baa65ed 100644
--- a/client/src/main/java/com/att/cadi/locator/DNSLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/DNSLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java b/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
index ecbdfaa..db95d91 100644
--- a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java b/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
index f8a1546..5b756b2 100644
--- a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java b/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
index 011e42c..216be4f 100644
--- a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/main/java/com/att/cadi/routing/GreatCircle.java b/client/src/main/java/com/att/cadi/routing/GreatCircle.java
index 5a58920..8558f8e 100644
--- a/client/src/main/java/com/att/cadi/routing/GreatCircle.java
+++ b/client/src/main/java/com/att/cadi/routing/GreatCircle.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/BasicDME2Client.java b/client/src/test/java/com/client/test/BasicDME2Client.java
index a7b2f41..f26d3b1 100644
--- a/client/src/test/java/com/client/test/BasicDME2Client.java
+++ b/client/src/test/java/com/client/test/BasicDME2Client.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/JU_DNSLocator.java b/client/src/test/java/com/client/test/JU_DNSLocator.java
index fcd14c8..04a4f17 100644
--- a/client/src/test/java/com/client/test/JU_DNSLocator.java
+++ b/client/src/test/java/com/client/test/JU_DNSLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/JU_PropertyLocator.java b/client/src/test/java/com/client/test/JU_PropertyLocator.java
index be8e587..89bef62 100644
--- a/client/src/test/java/com/client/test/JU_PropertyLocator.java
+++ b/client/src/test/java/com/client/test/JU_PropertyLocator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/PaulUzee.java b/client/src/test/java/com/client/test/PaulUzee.java
index 6f82146..24aeb49 100644
--- a/client/src/test/java/com/client/test/PaulUzee.java
+++ b/client/src/test/java/com/client/test/PaulUzee.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/TestAccess.java b/client/src/test/java/com/client/test/TestAccess.java
index 3724f1b..434ae62 100644
--- a/client/src/test/java/com/client/test/TestAccess.java
+++ b/client/src/test/java/com/client/test/TestAccess.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/TestDME2Client.java b/client/src/test/java/com/client/test/TestDME2Client.java
index 5e5e822..415f992 100644
--- a/client/src/test/java/com/client/test/TestDME2Client.java
+++ b/client/src/test/java/com/client/test/TestDME2Client.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/TestDME2RcliClient.java b/client/src/test/java/com/client/test/TestDME2RcliClient.java
index 61bc76a..6ff5d6f 100644
--- a/client/src/test/java/com/client/test/TestDME2RcliClient.java
+++ b/client/src/test/java/com/client/test/TestDME2RcliClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.

diff --git a/client/src/test/java/com/client/test/TestHClient.java b/client/src/test/java/com/client/test/TestHClient.java
index 0c6a162..7fcd113 100644
--- a/client/src/test/java/com/client/test/TestHClient.java
+++ b/client/src/test/java/com/client/test/TestHClient.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.