[AAF-21] Updated Copyright Headers for AAF

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

49 files changed, 49 insertions, 98 deletions

diff --git a/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java b/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java
index f3d721ce..9cd76a29 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.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/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java b/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java
index 3e1eefaa..d7220209 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.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/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java b/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java
index 67a6d225..0096bfb1 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.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/authz-cmd/src/test/java/com/att/cmd/JU_Help.java b/authz-cmd/src/test/java/com/att/cmd/JU_Help.java
index c5af6f9c..28563720 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_Help.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_Help.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/authz-cmd/src/test/java/com/att/cmd/JU_Version.java b/authz-cmd/src/test/java/com/att/cmd/JU_Version.java
index f9c5727a..988dabc6 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_Version.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_Version.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/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java
index ce900f7a..9ca61ba6 100644
--- a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java
+++ b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.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/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java
index 78b630ca..ce760a4f 100644
--- a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java
+++ b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.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/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java
index 1ab0ae07..57e4a9cb 100644
--- a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java
+++ b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java
index ab67de38..59391eec 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java
index 7bf84031..9a8147a0 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java
index fe07b740..4d536011 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java
index c2ea19c4..bc584911 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_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/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java
index 85b7b22d..b5a82be4 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java
index 93b7e3d3..775a80b8 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java
index c730069e..53b5f366 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java
index a986ff55..5362d870 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java
index b9228b06..253a9c5f 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java
index 895693c8..263a4064 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java
index 4ef73840..1f80e8f9 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java
index 78b65da2..32a45760 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.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/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java
index 9e291c2e..d5335506 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java
index fa90e5f7..cfcbf442 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java
index c2b64630..1f5dfc9a 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_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/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java
index 5bcd774c..1dc317cb 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java
index fb789ec0..51befc3e 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java
index f4cf7cfa..50f35ac8 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java
index 228b46a5..851667b8 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java
index b88bc74a..96210269 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java
index 7835f22c..5db384e2 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java
index a0b6ccd3..fb25ba75 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.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/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java
index 3fffc9da..a812f0a2 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.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/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java
index e64fe93c..03708a61 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.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/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java
index c0f3ff5b..ee1c15d2 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.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/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java
index f18c20a3..66c3914d 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.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/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java
index c088a6b0..f56c4d5e 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.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/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java
index ccd687c3..92cdf330 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.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/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java
index 3d5fcad6..d015b386 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.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/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java
index 750543f4..f892a3c6 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.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/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java
index 5ef38c3e..c53ac19a 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.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/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java
index 33319a55..90946de3 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_User.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/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java
index 279fe2de..570d79f7 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.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/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java
index 0f80a810..4abdf598 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.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/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java
index e1e2d4bf..4676382d 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.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/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java
index cc4f6480..622d0204 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.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/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java
index e1d9149f..c5f94028 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.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/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java
index 5600d5a9..bf453d65 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.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/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java
index 51e20c13..5ad1a953 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.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/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java
index b68e5973..f90c8348 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.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/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java
index c24531b8..076a68a9 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.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.