[AAF-21] Updated Copyright Headers for AAF
Change-Id: I07906b48431c94131ec95dad79a42fb9b6399382
Signed-off-by: sg481n <sg481n@att.com>
diff --git a/authz-service/.gitignore b/authz-service/.gitignore
deleted file mode 100644
index b85845b..0000000
--- a/authz-service/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
-/dme2reg/
-/logs/
diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index 85b9d5d..6abe62d 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.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/assemble/swm.xml b/authz-service/src/main/assemble/swm.xml
index 20f5ade..561d7b4 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 1b55ee8..75507e7 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 d7824cf..ef14fbd 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 9c7234d..984d1d5 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 78b2922..dedc1a3 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 7067646..abc0f10 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 f562d62..3bed07a 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 98e09bb..be4d8e7 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 3ba557f..00b288d 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 1e0fa64..7791079 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 e6e3c82..6a5b045 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 55f41f5..dcd0273 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 d3a61e9..f766364 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 f948aac..b70712c 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 05d5bfc..651a517 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 ee2cd18..d0e6744 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 d1b00f1..c8eb18c 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 4545ffc..f204f1b 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 08183a6..15e7eeb 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 3f4c19b..a4702cf 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 0fc630a..6df0845 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 8c8aa13..6b5c2dd 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 83915a8..3c45a7a 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 9351945..a8e8a39 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 85fc1a1..8d8fea8 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 288d325..96afb79 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 88001ba..626ba4b 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 4a7e97b..67c929e 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 529a2d3..e11c268 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 d04f40d..fce6824 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 52eff0e..b1976ed 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 c3c6d71..c262524 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 c566813..cc8c7ee 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 f2e566d..5256091 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 bc1eca1..4fc015d 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 441a6f3..6a3f0ca 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 de3c1ed..69738ad 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 ecd13e6..3d0b7c8 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 8ad520e..9b4c9eb 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 c0105de..a44d667 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 23d0924..af18d0e 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 4cbab1c..714f05b 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 474af92..a7ce97f 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 726a754..74c56bd 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 b0f95e5..9e4f84f 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 9eed4a2..26f2699 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 b1be0dd..fef7c75 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 3ac84a4..bc38538 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 aee5d5b..8896fba 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 40ab451..9de77e7 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 7c0b220..df7222b 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.