From c548cc96e7cf048894686a12dce8d77111378317 Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Wed, 9 Aug 2017 23:25:05 -0400
Subject:  [AAF-21] Updated Copyright Headers for AAF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I07906b48431c94131ec95dad79a42fb9b6399382
Signed-off-by: sg481n <sg481n@att.com>
---
 authz-service/src/main/assemble/swm.xml                                | 3 +--
 authz-service/src/main/config/log4j.properties                         | 3 +--
 authz-service/src/main/config/lrm-authz-service.xml                    | 3 +--
 authz-service/src/main/java/com/att/authz/cadi/DirectAAFLur.java       | 3 +--
 authz-service/src/main/java/com/att/authz/cadi/DirectAAFUserPass.java  | 3 +--
 authz-service/src/main/java/com/att/authz/cadi/DirectCertIdentity.java | 3 +--
 authz-service/src/main/java/com/att/authz/facade/AuthzFacade.java      | 3 +--
 .../src/main/java/com/att/authz/facade/AuthzFacadeFactory.java         | 3 +--
 authz-service/src/main/java/com/att/authz/facade/AuthzFacadeImpl.java  | 3 +--
 authz-service/src/main/java/com/att/authz/facade/AuthzFacade_2_0.java  | 3 +--
 authz-service/src/main/java/com/att/authz/service/AuthAPI.java         | 3 +--
 .../src/main/java/com/att/authz/service/AuthzCassServiceImpl.java      | 3 +--
 authz-service/src/main/java/com/att/authz/service/AuthzService.java    | 3 +--
 authz-service/src/main/java/com/att/authz/service/Code.java            | 3 +--
 authz-service/src/main/java/com/att/authz/service/MayChange.java       | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_Api.java     | 3 +--
 .../src/main/java/com/att/authz/service/api/API_Approval.java          | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_Creds.java   | 3 +--
 .../src/main/java/com/att/authz/service/api/API_Delegate.java          | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_History.java | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_Mgmt.java    | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_NS.java      | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_Perms.java   | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_Roles.java   | 3 +--
 authz-service/src/main/java/com/att/authz/service/api/API_User.java    | 3 +--
 .../src/main/java/com/att/authz/service/api/API_UserRole.java          | 3 +--
 authz-service/src/main/java/com/att/authz/service/mapper/Mapper.java   | 3 +--
 .../src/main/java/com/att/authz/service/mapper/Mapper_2_0.java         | 3 +--
 .../src/main/java/com/att/authz/service/validation/Validator.java      | 3 +--
 authz-service/src/main/resources/docker-compose/docker-compose.yml     | 3 +--
 authz-service/src/main/sample/log4j.properties                         | 3 +--
 authz-service/src/main/swm/descriptor.xml                              | 3 +--
 authz-service/src/main/swm/packageNotes.txt                            | 3 +--
 authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFLur.java    | 3 +--
 .../src/test/java/com/att/authz/cadi/JU_DirectAAFUserPass.java         | 3 +--
 .../src/test/java/com/att/authz/cadi/JU_DirectCertIdentity.java        | 3 +--
 authz-service/src/test/java/com/att/authz/service/JU_AuthAPI.java      | 3 +--
 authz-service/src/test/java/com/att/authz/service/api/JU_API_Api.java  | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_Approval.java       | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_Creds.java          | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_Delegate.java       | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_History.java        | 3 +--
 authz-service/src/test/java/com/att/authz/service/api/JU_API_Mgmt.java | 3 +--
 authz-service/src/test/java/com/att/authz/service/api/JU_API_NS.java   | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_Perms.java          | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_Roles.java          | 3 +--
 authz-service/src/test/java/com/att/authz/service/api/JU_API_User.java | 3 +--
 .../src/test/java/com/att/authz/service/api/JU_API_UserRole.java       | 3 +--
 .../src/test/java/com/att/authz/service/mapper/JU_Mapper_2_0.java      | 3 +--
 .../src/test/java/com/att/authz/service/test/JU_Validator.java         | 3 +--
 .../src/test/java/com/att/authz/service/validation/JU_Validator.java   | 3 +--
 51 files changed, 51 insertions(+), 102 deletions(-)

(limited to 'authz-service/src')

diff --git a/authz-service/src/main/assemble/swm.xml b/authz-service/src/main/assemble/swm.xml
index 20f5adef..561d7b4b 100644
--- a/authz-service/src/main/assemble/swm.xml
+++ b/authz-service/src/main/assemble/swm.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/authz-service/src/main/config/log4j.properties b/authz-service/src/main/config/log4j.properties
index 1b55ee89..75507e7a 100644
--- a/authz-service/src/main/config/log4j.properties
+++ b/authz-service/src/main/config/log4j.properties
@@ -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-service/src/main/config/lrm-authz-service.xml b/authz-service/src/main/config/lrm-authz-service.xml
index d7824cf7..ef14fbdf 100644
--- a/authz-service/src/main/config/lrm-authz-service.xml
+++ b/authz-service/src/main/config/lrm-authz-service.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   ============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-service/src/main/java/com/att/authz/cadi/DirectAAFLur.java b/authz-service/src/main/java/com/att/authz/cadi/DirectAAFLur.java
index 9c7234dd..984d1d52 100644
--- a/authz-service/src/main/java/com/att/authz/cadi/DirectAAFLur.java
+++ b/authz-service/src/main/java/com/att/authz/cadi/DirectAAFLur.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-service/src/main/java/com/att/authz/cadi/DirectAAFUserPass.java b/authz-service/src/main/java/com/att/authz/cadi/DirectAAFUserPass.java
index 78b2922e..dedc1a39 100644
--- a/authz-service/src/main/java/com/att/authz/cadi/DirectAAFUserPass.java
+++ b/authz-service/src/main/java/com/att/authz/cadi/DirectAAFUserPass.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-service/src/main/java/com/att/authz/cadi/DirectCertIdentity.java b/authz-service/src/main/java/com/att/authz/cadi/DirectCertIdentity.java
index 70676467..abc0f10a 100644
--- a/authz-service/src/main/java/com/att/authz/cadi/DirectCertIdentity.java
+++ b/authz-service/src/main/java/com/att/authz/cadi/DirectCertIdentity.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-service/src/main/java/com/att/authz/facade/AuthzFacade.java b/authz-service/src/main/java/com/att/authz/facade/AuthzFacade.java
index f562d627..3bed07a4 100644
--- a/authz-service/src/main/java/com/att/authz/facade/AuthzFacade.java
+++ b/authz-service/src/main/java/com/att/authz/facade/AuthzFacade.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-service/src/main/java/com/att/authz/facade/AuthzFacadeFactory.java b/authz-service/src/main/java/com/att/authz/facade/AuthzFacadeFactory.java
index 98e09bbc..be4d8e73 100644
--- a/authz-service/src/main/java/com/att/authz/facade/AuthzFacadeFactory.java
+++ b/authz-service/src/main/java/com/att/authz/facade/AuthzFacadeFactory.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-service/src/main/java/com/att/authz/facade/AuthzFacadeImpl.java b/authz-service/src/main/java/com/att/authz/facade/AuthzFacadeImpl.java
index 3ba557f7..00b288d2 100644
--- a/authz-service/src/main/java/com/att/authz/facade/AuthzFacadeImpl.java
+++ b/authz-service/src/main/java/com/att/authz/facade/AuthzFacadeImpl.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-service/src/main/java/com/att/authz/facade/AuthzFacade_2_0.java b/authz-service/src/main/java/com/att/authz/facade/AuthzFacade_2_0.java
index 1e0fa641..77910793 100644
--- a/authz-service/src/main/java/com/att/authz/facade/AuthzFacade_2_0.java
+++ b/authz-service/src/main/java/com/att/authz/facade/AuthzFacade_2_0.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-service/src/main/java/com/att/authz/service/AuthAPI.java b/authz-service/src/main/java/com/att/authz/service/AuthAPI.java
index e6e3c823..6a5b0453 100644
--- a/authz-service/src/main/java/com/att/authz/service/AuthAPI.java
+++ b/authz-service/src/main/java/com/att/authz/service/AuthAPI.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-service/src/main/java/com/att/authz/service/AuthzCassServiceImpl.java b/authz-service/src/main/java/com/att/authz/service/AuthzCassServiceImpl.java
index 55f41f5c..dcd02739 100644
--- a/authz-service/src/main/java/com/att/authz/service/AuthzCassServiceImpl.java
+++ b/authz-service/src/main/java/com/att/authz/service/AuthzCassServiceImpl.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-service/src/main/java/com/att/authz/service/AuthzService.java b/authz-service/src/main/java/com/att/authz/service/AuthzService.java
index d3a61e95..f766364a 100644
--- a/authz-service/src/main/java/com/att/authz/service/AuthzService.java
+++ b/authz-service/src/main/java/com/att/authz/service/AuthzService.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-service/src/main/java/com/att/authz/service/Code.java b/authz-service/src/main/java/com/att/authz/service/Code.java
index f948aac0..b70712c3 100644
--- a/authz-service/src/main/java/com/att/authz/service/Code.java
+++ b/authz-service/src/main/java/com/att/authz/service/Code.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-service/src/main/java/com/att/authz/service/MayChange.java b/authz-service/src/main/java/com/att/authz/service/MayChange.java
index 05d5bfc2..651a5172 100644
--- a/authz-service/src/main/java/com/att/authz/service/MayChange.java
+++ b/authz-service/src/main/java/com/att/authz/service/MayChange.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-service/src/main/java/com/att/authz/service/api/API_Api.java b/authz-service/src/main/java/com/att/authz/service/api/API_Api.java
index ee2cd183..d0e67447 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Api.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Api.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-service/src/main/java/com/att/authz/service/api/API_Approval.java b/authz-service/src/main/java/com/att/authz/service/api/API_Approval.java
index d1b00f17..c8eb18ca 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Approval.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Approval.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-service/src/main/java/com/att/authz/service/api/API_Creds.java b/authz-service/src/main/java/com/att/authz/service/api/API_Creds.java
index 4545ffc3..f204f1bb 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Creds.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Creds.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-service/src/main/java/com/att/authz/service/api/API_Delegate.java b/authz-service/src/main/java/com/att/authz/service/api/API_Delegate.java
index 08183a68..15e7eeb3 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Delegate.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Delegate.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-service/src/main/java/com/att/authz/service/api/API_History.java b/authz-service/src/main/java/com/att/authz/service/api/API_History.java
index 3f4c19b7..a4702cf6 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_History.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_History.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-service/src/main/java/com/att/authz/service/api/API_Mgmt.java b/authz-service/src/main/java/com/att/authz/service/api/API_Mgmt.java
index 0fc630a2..6df08454 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Mgmt.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Mgmt.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-service/src/main/java/com/att/authz/service/api/API_NS.java b/authz-service/src/main/java/com/att/authz/service/api/API_NS.java
index 8c8aa130..6b5c2dd8 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_NS.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_NS.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-service/src/main/java/com/att/authz/service/api/API_Perms.java b/authz-service/src/main/java/com/att/authz/service/api/API_Perms.java
index 83915a85..3c45a7a6 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Perms.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Perms.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-service/src/main/java/com/att/authz/service/api/API_Roles.java b/authz-service/src/main/java/com/att/authz/service/api/API_Roles.java
index 9351945a..a8e8a395 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_Roles.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_Roles.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-service/src/main/java/com/att/authz/service/api/API_User.java b/authz-service/src/main/java/com/att/authz/service/api/API_User.java
index 85fc1a10..8d8fea84 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_User.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_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-service/src/main/java/com/att/authz/service/api/API_UserRole.java b/authz-service/src/main/java/com/att/authz/service/api/API_UserRole.java
index 288d3254..96afb799 100644
--- a/authz-service/src/main/java/com/att/authz/service/api/API_UserRole.java
+++ b/authz-service/src/main/java/com/att/authz/service/api/API_UserRole.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-service/src/main/java/com/att/authz/service/mapper/Mapper.java b/authz-service/src/main/java/com/att/authz/service/mapper/Mapper.java
index 88001ba7..626ba4b7 100644
--- a/authz-service/src/main/java/com/att/authz/service/mapper/Mapper.java
+++ b/authz-service/src/main/java/com/att/authz/service/mapper/Mapper.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-service/src/main/java/com/att/authz/service/mapper/Mapper_2_0.java b/authz-service/src/main/java/com/att/authz/service/mapper/Mapper_2_0.java
index 4a7e97b7..67c929e8 100644
--- a/authz-service/src/main/java/com/att/authz/service/mapper/Mapper_2_0.java
+++ b/authz-service/src/main/java/com/att/authz/service/mapper/Mapper_2_0.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-service/src/main/java/com/att/authz/service/validation/Validator.java b/authz-service/src/main/java/com/att/authz/service/validation/Validator.java
index 529a2d35..e11c2688 100644
--- a/authz-service/src/main/java/com/att/authz/service/validation/Validator.java
+++ b/authz-service/src/main/java/com/att/authz/service/validation/Validator.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-service/src/main/resources/docker-compose/docker-compose.yml b/authz-service/src/main/resources/docker-compose/docker-compose.yml
index d04f40db..fce6824d 100644
--- a/authz-service/src/main/resources/docker-compose/docker-compose.yml
+++ b/authz-service/src/main/resources/docker-compose/docker-compose.yml
@@ -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-service/src/main/sample/log4j.properties b/authz-service/src/main/sample/log4j.properties
index 52eff0e0..b1976ed1 100644
--- a/authz-service/src/main/sample/log4j.properties
+++ b/authz-service/src/main/sample/log4j.properties
@@ -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-service/src/main/swm/descriptor.xml b/authz-service/src/main/swm/descriptor.xml
index c3c6d71c..c262524e 100644
--- a/authz-service/src/main/swm/descriptor.xml
+++ b/authz-service/src/main/swm/descriptor.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-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-service/src/main/swm/packageNotes.txt b/authz-service/src/main/swm/packageNotes.txt
index c5668136..cc8c7ee8 100644
--- a/authz-service/src/main/swm/packageNotes.txt
+++ b/authz-service/src/main/swm/packageNotes.txt
@@ -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-service/src/test/java/com/att/authz/cadi/JU_DirectAAFLur.java b/authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFLur.java
index f2e566dd..52560915 100644
--- a/authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFLur.java
+++ b/authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFLur.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-service/src/test/java/com/att/authz/cadi/JU_DirectAAFUserPass.java b/authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFUserPass.java
index bc1eca11..4fc015da 100644
--- a/authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFUserPass.java
+++ b/authz-service/src/test/java/com/att/authz/cadi/JU_DirectAAFUserPass.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-service/src/test/java/com/att/authz/cadi/JU_DirectCertIdentity.java b/authz-service/src/test/java/com/att/authz/cadi/JU_DirectCertIdentity.java
index 441a6f3a..6a3f0ca0 100644
--- a/authz-service/src/test/java/com/att/authz/cadi/JU_DirectCertIdentity.java
+++ b/authz-service/src/test/java/com/att/authz/cadi/JU_DirectCertIdentity.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-service/src/test/java/com/att/authz/service/JU_AuthAPI.java b/authz-service/src/test/java/com/att/authz/service/JU_AuthAPI.java
index de3c1ed5..69738ad1 100644
--- a/authz-service/src/test/java/com/att/authz/service/JU_AuthAPI.java
+++ b/authz-service/src/test/java/com/att/authz/service/JU_AuthAPI.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-service/src/test/java/com/att/authz/service/api/JU_API_Api.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Api.java
index ecd13e68..3d0b7c86 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Api.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Api.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-service/src/test/java/com/att/authz/service/api/JU_API_Approval.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Approval.java
index 8ad520ee..9b4c9eb4 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Approval.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Approval.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-service/src/test/java/com/att/authz/service/api/JU_API_Creds.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Creds.java
index c0105de9..a44d667a 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Creds.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Creds.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-service/src/test/java/com/att/authz/service/api/JU_API_Delegate.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Delegate.java
index 23d09248..af18d0ed 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Delegate.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Delegate.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-service/src/test/java/com/att/authz/service/api/JU_API_History.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_History.java
index 4cbab1cd..714f05b1 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_History.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_History.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-service/src/test/java/com/att/authz/service/api/JU_API_Mgmt.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Mgmt.java
index 474af92c..a7ce97fd 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Mgmt.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Mgmt.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-service/src/test/java/com/att/authz/service/api/JU_API_NS.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_NS.java
index 726a7548..74c56bdc 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_NS.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_NS.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-service/src/test/java/com/att/authz/service/api/JU_API_Perms.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Perms.java
index b0f95e5b..9e4f84f8 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Perms.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Perms.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-service/src/test/java/com/att/authz/service/api/JU_API_Roles.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Roles.java
index 9eed4a27..26f26996 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_Roles.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_Roles.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-service/src/test/java/com/att/authz/service/api/JU_API_User.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_User.java
index b1be0dd3..fef7c75b 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_User.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_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-service/src/test/java/com/att/authz/service/api/JU_API_UserRole.java b/authz-service/src/test/java/com/att/authz/service/api/JU_API_UserRole.java
index 3ac84a49..bc385388 100644
--- a/authz-service/src/test/java/com/att/authz/service/api/JU_API_UserRole.java
+++ b/authz-service/src/test/java/com/att/authz/service/api/JU_API_UserRole.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-service/src/test/java/com/att/authz/service/mapper/JU_Mapper_2_0.java b/authz-service/src/test/java/com/att/authz/service/mapper/JU_Mapper_2_0.java
index aee5d5bd..8896fba7 100644
--- a/authz-service/src/test/java/com/att/authz/service/mapper/JU_Mapper_2_0.java
+++ b/authz-service/src/test/java/com/att/authz/service/mapper/JU_Mapper_2_0.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-service/src/test/java/com/att/authz/service/test/JU_Validator.java b/authz-service/src/test/java/com/att/authz/service/test/JU_Validator.java
index 40ab4517..9de77e72 100644
--- a/authz-service/src/test/java/com/att/authz/service/test/JU_Validator.java
+++ b/authz-service/src/test/java/com/att/authz/service/test/JU_Validator.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-service/src/test/java/com/att/authz/service/validation/JU_Validator.java b/authz-service/src/test/java/com/att/authz/service/validation/JU_Validator.java
index 7c0b2206..df7222b8 100644
--- a/authz-service/src/test/java/com/att/authz/service/validation/JU_Validator.java
+++ b/authz-service/src/test/java/com/att/authz/service/validation/JU_Validator.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.
-- 
cgit 1.2.3-korg