[AAF-21] Updated Copyright Headers for AAF
Change-Id: I07906b48431c94131ec95dad79a42fb9b6399382
Signed-off-by: sg481n <sg481n@att.com>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..cd88bf0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+<!--
+ ============LICENSE_START====================================================
+* org.onap.aaf
+* ===========================================================================
+* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+* ===========================================================================
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+ * http://www.apache.org/licenses/LICENSE-2.0
+*
+ * Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ============LICENSE_END====================================================
+*
+* ECOMP is a trademark and service mark of AT&T Intellectual Property.
+*
+
+-->
\ No newline at end of file
diff --git a/authz-batch/.gitignore b/authz-batch/.gitignore
deleted file mode 100644
index cabe13d..0000000
--- a/authz-batch/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
diff --git a/authz-cass/.gitignore b/authz-cass/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-cass/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-cass/pom.xml b/authz-cass/pom.xml
index 266485a..baea96a 100644
--- a/authz-cass/pom.xml
+++ b/authz-cass/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-cass/src/main/java/com/att/dao/AbsCassDAO.java b/authz-cass/src/main/java/com/att/dao/AbsCassDAO.java
index 2ea4e6e..987a3f2 100644
--- a/authz-cass/src/main/java/com/att/dao/AbsCassDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/AbsCassDAO.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-cass/src/main/java/com/att/dao/Bytification.java b/authz-cass/src/main/java/com/att/dao/Bytification.java
index b563be9..1bb16c4 100644
--- a/authz-cass/src/main/java/com/att/dao/Bytification.java
+++ b/authz-cass/src/main/java/com/att/dao/Bytification.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-cass/src/main/java/com/att/dao/CIDAO.java b/authz-cass/src/main/java/com/att/dao/CIDAO.java
index ee5e611..d1a8d62 100644
--- a/authz-cass/src/main/java/com/att/dao/CIDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/CIDAO.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-cass/src/main/java/com/att/dao/Cacheable.java b/authz-cass/src/main/java/com/att/dao/Cacheable.java
index 71b4896..20fa156 100644
--- a/authz-cass/src/main/java/com/att/dao/Cacheable.java
+++ b/authz-cass/src/main/java/com/att/dao/Cacheable.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-cass/src/main/java/com/att/dao/Cached.java b/authz-cass/src/main/java/com/att/dao/Cached.java
index 2cdd2b2..302d4f4 100644
--- a/authz-cass/src/main/java/com/att/dao/Cached.java
+++ b/authz-cass/src/main/java/com/att/dao/Cached.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-cass/src/main/java/com/att/dao/CachedDAO.java b/authz-cass/src/main/java/com/att/dao/CachedDAO.java
index bcfccbd..a490f20 100644
--- a/authz-cass/src/main/java/com/att/dao/CachedDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/CachedDAO.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-cass/src/main/java/com/att/dao/CassAccess.java b/authz-cass/src/main/java/com/att/dao/CassAccess.java
index a935aff..00802c9 100644
--- a/authz-cass/src/main/java/com/att/dao/CassAccess.java
+++ b/authz-cass/src/main/java/com/att/dao/CassAccess.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-cass/src/main/java/com/att/dao/CassDAOImpl.java b/authz-cass/src/main/java/com/att/dao/CassDAOImpl.java
index 84d3532..82ae8b1 100644
--- a/authz-cass/src/main/java/com/att/dao/CassDAOImpl.java
+++ b/authz-cass/src/main/java/com/att/dao/CassDAOImpl.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-cass/src/main/java/com/att/dao/DAO.java b/authz-cass/src/main/java/com/att/dao/DAO.java
index e214416..f1a59de 100644
--- a/authz-cass/src/main/java/com/att/dao/DAO.java
+++ b/authz-cass/src/main/java/com/att/dao/DAO.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-cass/src/main/java/com/att/dao/DAOException.java b/authz-cass/src/main/java/com/att/dao/DAOException.java
index 8c9a701..652ae7d 100644
--- a/authz-cass/src/main/java/com/att/dao/DAOException.java
+++ b/authz-cass/src/main/java/com/att/dao/DAOException.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-cass/src/main/java/com/att/dao/DAO_RO.java b/authz-cass/src/main/java/com/att/dao/DAO_RO.java
index 2b6173c..ceea722 100644
--- a/authz-cass/src/main/java/com/att/dao/DAO_RO.java
+++ b/authz-cass/src/main/java/com/att/dao/DAO_RO.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-cass/src/main/java/com/att/dao/Loader.java b/authz-cass/src/main/java/com/att/dao/Loader.java
index 6b09df9..fb364ac 100644
--- a/authz-cass/src/main/java/com/att/dao/Loader.java
+++ b/authz-cass/src/main/java/com/att/dao/Loader.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-cass/src/main/java/com/att/dao/Streamer.java b/authz-cass/src/main/java/com/att/dao/Streamer.java
index 385877e..6bc482a 100644
--- a/authz-cass/src/main/java/com/att/dao/Streamer.java
+++ b/authz-cass/src/main/java/com/att/dao/Streamer.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-cass/src/main/java/com/att/dao/Touchable.java b/authz-cass/src/main/java/com/att/dao/Touchable.java
index 4f8b7f6..c3fab88 100644
--- a/authz-cass/src/main/java/com/att/dao/Touchable.java
+++ b/authz-cass/src/main/java/com/att/dao/Touchable.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-cass/src/main/java/com/att/dao/aaf/cached/CachedCertDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCertDAO.java
index 611aa4e..7623069 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCertDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCertDAO.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-cass/src/main/java/com/att/dao/aaf/cached/CachedCredDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCredDAO.java
index b9f20c2..2d0f91e 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCredDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCredDAO.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-cass/src/main/java/com/att/dao/aaf/cached/CachedNSDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedNSDAO.java
index 0008dff..0ffc705 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedNSDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedNSDAO.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-cass/src/main/java/com/att/dao/aaf/cached/CachedPermDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedPermDAO.java
index e900f69..659bde8 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedPermDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedPermDAO.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-cass/src/main/java/com/att/dao/aaf/cached/CachedRoleDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedRoleDAO.java
index b783644..a0f375f 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedRoleDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedRoleDAO.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-cass/src/main/java/com/att/dao/aaf/cached/CachedUserRoleDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedUserRoleDAO.java
index 45e61bd..2478759 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedUserRoleDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cached/CachedUserRoleDAO.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-cass/src/main/java/com/att/dao/aaf/cass/ApprovalDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/ApprovalDAO.java
index f2f25e7..f7f4eed 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/ApprovalDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/ApprovalDAO.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-cass/src/main/java/com/att/dao/aaf/cass/ArtiDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/ArtiDAO.java
index 397a883..d24d4fa 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/ArtiDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/ArtiDAO.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-cass/src/main/java/com/att/dao/aaf/cass/CacheInfoDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/CacheInfoDAO.java
index ef8201a..da18caa 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/CacheInfoDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/CacheInfoDAO.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-cass/src/main/java/com/att/dao/aaf/cass/CacheableData.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/CacheableData.java
index 2afefb1..5b434db 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/CacheableData.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/CacheableData.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-cass/src/main/java/com/att/dao/aaf/cass/CertDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/CertDAO.java
index 6952841..bae6a24 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/CertDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/CertDAO.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-cass/src/main/java/com/att/dao/aaf/cass/CredDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/CredDAO.java
index 9d403fe..94c43d2 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/CredDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/CredDAO.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-cass/src/main/java/com/att/dao/aaf/cass/DelegateDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/DelegateDAO.java
index 7cebc88..6d6534e 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/DelegateDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/DelegateDAO.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-cass/src/main/java/com/att/dao/aaf/cass/FutureDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/FutureDAO.java
index 5db689d..f4a8c2d 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/FutureDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/FutureDAO.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-cass/src/main/java/com/att/dao/aaf/cass/HistoryDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/HistoryDAO.java
index 4a9d105..adaf0d8 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/HistoryDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/HistoryDAO.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-cass/src/main/java/com/att/dao/aaf/cass/Namespace.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/Namespace.java
index fa61372..d3b1181 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/Namespace.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/Namespace.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-cass/src/main/java/com/att/dao/aaf/cass/NsDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/NsDAO.java
index 39a52af..ed30dc0 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/NsDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/NsDAO.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-cass/src/main/java/com/att/dao/aaf/cass/NsSplit.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/NsSplit.java
index ad896fc..2d9d8a1 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/NsSplit.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/NsSplit.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-cass/src/main/java/com/att/dao/aaf/cass/NsType.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/NsType.java
index 442e26e..6b61ba6 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/NsType.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/NsType.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-cass/src/main/java/com/att/dao/aaf/cass/PermDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/PermDAO.java
index b54b6fc..f02f335 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/PermDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/PermDAO.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-cass/src/main/java/com/att/dao/aaf/cass/RoleDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/RoleDAO.java
index 84290ef..f25a2f6 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/RoleDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/RoleDAO.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-cass/src/main/java/com/att/dao/aaf/cass/Status.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/Status.java
index d275f3d..ff71b3a 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/Status.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/Status.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-cass/src/main/java/com/att/dao/aaf/cass/UserRoleDAO.java b/authz-cass/src/main/java/com/att/dao/aaf/cass/UserRoleDAO.java
index d3fffe8..d55a95c 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/cass/UserRoleDAO.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/cass/UserRoleDAO.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-cass/src/main/java/com/att/dao/aaf/hl/CassExecutor.java b/authz-cass/src/main/java/com/att/dao/aaf/hl/CassExecutor.java
index 6f62ace..4dc22e1 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/hl/CassExecutor.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/hl/CassExecutor.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-cass/src/main/java/com/att/dao/aaf/hl/Function.java b/authz-cass/src/main/java/com/att/dao/aaf/hl/Function.java
index d1db39d..6d04b1d 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/hl/Function.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/hl/Function.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-cass/src/main/java/com/att/dao/aaf/hl/PermLookup.java b/authz-cass/src/main/java/com/att/dao/aaf/hl/PermLookup.java
index f2564fc..522db0a 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/hl/PermLookup.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/hl/PermLookup.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-cass/src/main/java/com/att/dao/aaf/hl/Question.java b/authz-cass/src/main/java/com/att/dao/aaf/hl/Question.java
index ce868fb..b9bb9ee 100644
--- a/authz-cass/src/main/java/com/att/dao/aaf/hl/Question.java
+++ b/authz-cass/src/main/java/com/att/dao/aaf/hl/Question.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-cass/src/main/java/com/att/dao/session/SessionFilter.java b/authz-cass/src/main/java/com/att/dao/session/SessionFilter.java
index 6f83519..cbc05c7 100644
--- a/authz-cass/src/main/java/com/att/dao/session/SessionFilter.java
+++ b/authz-cass/src/main/java/com/att/dao/session/SessionFilter.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-cass/src/test/java/com/att/authz/cass/hl/JU_Question.java b/authz-cass/src/test/java/com/att/authz/cass/hl/JU_Question.java
index 941c86e..eadd958 100644
--- a/authz-cass/src/test/java/com/att/authz/cass/hl/JU_Question.java
+++ b/authz-cass/src/test/java/com/att/authz/cass/hl/JU_Question.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-cass/src/test/java/com/att/dao/JU_Cached.java b/authz-cass/src/test/java/com/att/dao/JU_Cached.java
index 4e6bf7d..b48a0f1 100644
--- a/authz-cass/src/test/java/com/att/dao/JU_Cached.java
+++ b/authz-cass/src/test/java/com/att/dao/JU_Cached.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-cass/src/test/java/com/att/dao/JU_CachedDAO.java b/authz-cass/src/test/java/com/att/dao/JU_CachedDAO.java
index 4cd38f2..35acbd7 100644
--- a/authz-cass/src/test/java/com/att/dao/JU_CachedDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/JU_CachedDAO.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-cass/src/test/java/com/att/dao/JU_CassAccess.java b/authz-cass/src/test/java/com/att/dao/JU_CassAccess.java
index b9c55a2..d6aaff5 100644
--- a/authz-cass/src/test/java/com/att/dao/JU_CassAccess.java
+++ b/authz-cass/src/test/java/com/att/dao/JU_CassAccess.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-cass/src/test/java/com/att/dao/JU_CassDAOImpl.java b/authz-cass/src/test/java/com/att/dao/JU_CassDAOImpl.java
index 6abf198..6592556 100644
--- a/authz-cass/src/test/java/com/att/dao/JU_CassDAOImpl.java
+++ b/authz-cass/src/test/java/com/att/dao/JU_CassDAOImpl.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-cass/src/test/java/com/att/dao/JU_DAOException.java b/authz-cass/src/test/java/com/att/dao/JU_DAOException.java
index fb634182..637b951 100644
--- a/authz-cass/src/test/java/com/att/dao/JU_DAOException.java
+++ b/authz-cass/src/test/java/com/att/dao/JU_DAOException.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-cass/src/test/java/com/att/dao/aaf/test/AbsJUCass.java b/authz-cass/src/test/java/com/att/dao/aaf/test/AbsJUCass.java
index 0f1994c..f26a37c 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/AbsJUCass.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/AbsJUCass.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-cass/src/test/java/com/att/dao/aaf/test/JU_ApprovalDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_ApprovalDAO.java
index 3a884b4..0c93beb 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_ApprovalDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_ApprovalDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_ArtiDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_ArtiDAO.java
index 219d302..7ae692b 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_ArtiDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_ArtiDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_Bytification.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_Bytification.java
index 34bfc3e..76f9077 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_Bytification.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_Bytification.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-cass/src/test/java/com/att/dao/aaf/test/JU_CacheInfoDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CacheInfoDAO.java
index 2a41a70..4847e3f 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CacheInfoDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CacheInfoDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_CertDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CertDAO.java
index 52238ef..172eb24 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CertDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CertDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_CredDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CredDAO.java
index 5cd6d4c..918e0bd 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CredDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_CredDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_DelegateDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_DelegateDAO.java
index cb71faf..ea829bc 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_DelegateDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_DelegateDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_FastCalling.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_FastCalling.java
index 120b6f0..ff77c9b 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_FastCalling.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_FastCalling.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-cass/src/test/java/com/att/dao/aaf/test/JU_HistoryDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_HistoryDAO.java
index 605b132..8d44495 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_HistoryDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_HistoryDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_NsDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsDAO.java
index 562694c..55f990a 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_NsType.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsType.java
index c250862..64023aa 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsType.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsType.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-cass/src/test/java/com/att/dao/aaf/test/JU_PermDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_PermDAO.java
index 7022a81..d045a0e 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_PermDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_PermDAO.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-cass/src/test/java/com/att/dao/aaf/test/JU_RoleDAO.java b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_RoleDAO.java
index d797cfb..d625adc 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/JU_RoleDAO.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/JU_RoleDAO.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-cass/src/test/java/com/att/dao/aaf/test/NS_ChildUpdate.java b/authz-cass/src/test/java/com/att/dao/aaf/test/NS_ChildUpdate.java
index dc3f13e..bc044d5 100644
--- a/authz-cass/src/test/java/com/att/dao/aaf/test/NS_ChildUpdate.java
+++ b/authz-cass/src/test/java/com/att/dao/aaf/test/NS_ChildUpdate.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-cass/src/test/resources/cadi.properties b/authz-cass/src/test/resources/cadi.properties
index 4f38cf5..8f1209a 100644
--- a/authz-cass/src/test/resources/cadi.properties
+++ b/authz-cass/src/test/resources/cadi.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-certman/.gitignore b/authz-certman/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-certman/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-certman/pom.xml b/authz-certman/pom.xml
index 53e0781..91b5dae 100644
--- a/authz-certman/pom.xml
+++ b/authz-certman/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-certman/src/main/config/log4j.properties b/authz-certman/src/main/config/log4j.properties
index ad853f5..ed7f1ca 100644
--- a/authz-certman/src/main/config/log4j.properties
+++ b/authz-certman/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-certman/src/main/config/lrm-authz-certman.xml b/authz-certman/src/main/config/lrm-authz-certman.xml
index 689c2db..9fd99a3 100644
--- a/authz-certman/src/main/config/lrm-authz-certman.xml
+++ b/authz-certman/src/main/config/lrm-authz-certman.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-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java b/authz-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java
index be41751..26c8614 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/api/API_Artifact.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-certman/src/main/java/com/att/authz/cm/api/API_Cert.java b/authz-certman/src/main/java/com/att/authz/cm/api/API_Cert.java
index 3a7bbe1..067bedd 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/api/API_Cert.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/api/API_Cert.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-certman/src/main/java/com/att/authz/cm/ca/AppCA.java b/authz-certman/src/main/java/com/att/authz/cm/ca/AppCA.java
index 761867d..485684e 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/ca/AppCA.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/ca/AppCA.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-certman/src/main/java/com/att/authz/cm/ca/CA.java b/authz-certman/src/main/java/com/att/authz/cm/ca/CA.java
index fab8994..b41801d 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/ca/CA.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/ca/CA.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-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java b/authz-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java
index bc999f2..df0b640 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/ca/DevlCA.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-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java b/authz-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java
index 52621e5..53a7c7e 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/cert/BCFactory.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-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java b/authz-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java
index 91168dc..c3a32ea 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.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-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java b/authz-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java
index e9c2457..3092603 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/cert/StandardFields.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-certman/src/main/java/com/att/authz/cm/data/CertDrop.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertDrop.java
index c0a219d..9fe9562 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertDrop.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertDrop.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-certman/src/main/java/com/att/authz/cm/data/CertRenew.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertRenew.java
index 4c13ab4..7a93259 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertRenew.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertRenew.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-certman/src/main/java/com/att/authz/cm/data/CertReq.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertReq.java
index 6806a58..9c24538 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertReq.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertReq.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-certman/src/main/java/com/att/authz/cm/data/CertResp.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertResp.java
index 8257e5c..2c0edc7 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertResp.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertResp.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-certman/src/main/java/com/att/authz/cm/facade/Facade.java b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade.java
index 249f218..36e391a 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/Facade.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade.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-certman/src/main/java/com/att/authz/cm/facade/Facade1_0.java b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade1_0.java
index 6dd012d..8002469 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/Facade1_0.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade1_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-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java
index e9e5d54..af02f13 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.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-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.java b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.java
index 2242144..7fbc8bf 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.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-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java
index 7218b15..47e4872 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/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-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_0.java b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_0.java
index 63c4f6a..9f5a677 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_0.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_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-certman/src/main/java/com/att/authz/cm/service/CMService.java b/authz-certman/src/main/java/com/att/authz/cm/service/CMService.java
index 9e6d5fa..3c60f21 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/service/CMService.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/service/CMService.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-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java b/authz-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java
index fa8ac6f..adf65ed 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/service/CertManAPI.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-certman/src/main/java/com/att/authz/cm/service/Code.java b/authz-certman/src/main/java/com/att/authz/cm/service/Code.java
index c29404e..587d235 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/service/Code.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/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-certman/src/main/java/com/att/authz/cm/validation/Validator.java b/authz-certman/src/main/java/com/att/authz/cm/validation/Validator.java
index 85163f0..d9f360f 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/validation/Validator.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/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-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java
index 73e7160..d48afb6 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.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-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java
index 31465a8..756f0d4 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.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-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java
index 898ddf6..1f0d245 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.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-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java
index c18afe5..b877e48 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.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-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java
index b504f6a..00c83fd 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.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-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java
index 541d5fb..bdae91b 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.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-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java b/authz-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java
index f40268d..7e2f9d0 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.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-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.java b/authz-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.java
index e613e59..126d0f6 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.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-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java b/authz-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java
index e3a428a..3ee0218 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/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.
diff --git a/authz-client/.gitignore b/authz-client/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-client/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-cmd/.gitignore b/authz-cmd/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-cmd/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-cmd/etc/log4j.properties b/authz-cmd/etc/log4j.properties
index 054ad57..fcd9da8 100644
--- a/authz-cmd/etc/log4j.properties
+++ b/authz-cmd/etc/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-cmd/pom.xml b/authz-cmd/pom.xml
index c79adfc..94a6c59 100644
--- a/authz-cmd/pom.xml
+++ b/authz-cmd/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-cmd/src/main/assemble/authz-cmd.xml b/authz-cmd/src/main/assemble/authz-cmd.xml
index 4fa723e..c1f2ad6 100644
--- a/authz-cmd/src/main/assemble/authz-cmd.xml
+++ b/authz-cmd/src/main/assemble/authz-cmd.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-cmd/src/main/assemble/swm.xml b/authz-cmd/src/main/assemble/swm.xml
index 089cfbe..f2e8683 100644
--- a/authz-cmd/src/main/assemble/swm.xml
+++ b/authz-cmd/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-cmd/src/main/config/log4j.properties b/authz-cmd/src/main/config/log4j.properties
index 054ad57..fcd9da8 100644
--- a/authz-cmd/src/main/config/log4j.properties
+++ b/authz-cmd/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-cmd/src/main/java/com/att/cmd/AAFcli.java b/authz-cmd/src/main/java/com/att/cmd/AAFcli.java
index e499aa4..357d312 100644
--- a/authz-cmd/src/main/java/com/att/cmd/AAFcli.java
+++ b/authz-cmd/src/main/java/com/att/cmd/AAFcli.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java b/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java
index 44724dc..8fc6eba 100644
--- a/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java
+++ b/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java b/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java
index 3dce84c..68826c6 100644
--- a/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java
+++ b/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/Cmd.java b/authz-cmd/src/main/java/com/att/cmd/Cmd.java
index 0439eb8..49ffaeb 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Cmd.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Cmd.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/Help.java b/authz-cmd/src/main/java/com/att/cmd/Help.java
index ae3c4c1..a9a9dfc 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Help.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Help.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/MessageException.java b/authz-cmd/src/main/java/com/att/cmd/MessageException.java
index 329f019..c932462 100644
--- a/authz-cmd/src/main/java/com/att/cmd/MessageException.java
+++ b/authz-cmd/src/main/java/com/att/cmd/MessageException.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/Param.java b/authz-cmd/src/main/java/com/att/cmd/Param.java
index a944859..9a5995e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Param.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Param.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/Version.java b/authz-cmd/src/main/java/com/att/cmd/Version.java
index 318d223..7e31a37 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Version.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Version.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java
index 2ef030f..7dcd5a1 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java
index 89a99f9..670beec 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java
index f345cfa..c3ce9d2 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java
index aa10c58..544ed0c 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java
index b428af8..e43bd78 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/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-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java
index 8258422..d2671a1 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java
index fb60f27..73ae923 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java b/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java
index a67ff2e..2406f8e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java b/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java
index ffe9b08..9877580 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/Create.java b/authz-cmd/src/main/java/com/att/cmd/ns/Create.java
index c314a10..8a28741 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Create.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Create.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/Delete.java b/authz-cmd/src/main/java/com/att/cmd/ns/Delete.java
index a957def..ab717eb 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Delete.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Delete.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java b/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java
index 6e57b09..56db604 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/List.java b/authz-cmd/src/main/java/com/att/cmd/ns/List.java
index fe80d62..72ca77a 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/List.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java
index afc041f..f8d87af 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java
index 9e559a9..c8bc07e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java
index 7459c22..c711e28 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java
index 7ad60a7..43b1008 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java
index 3ce9d7d..43b8349 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java
index e77df59..0dc1212 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java
index d4c5a59..3a5f73f 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java
index c8cbe5e..bb41bd1 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/ns/NS.java b/authz-cmd/src/main/java/com/att/cmd/ns/NS.java
index 7ebe3f9..c5557ba 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/NS.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/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-cmd/src/main/java/com/att/cmd/ns/Responsible.java b/authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java
index b7f4406..ddbb752 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/Create.java b/authz-cmd/src/main/java/com/att/cmd/perm/Create.java
index a6bd680..2c6231f 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Create.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Create.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/Delete.java b/authz-cmd/src/main/java/com/att/cmd/perm/Delete.java
index d5c5401..b1f0995 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Delete.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Delete.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java b/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java
index 757c017..3d6646f 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java b/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java
index f9780dd..0b15fbe 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/List.java b/authz-cmd/src/main/java/com/att/cmd/perm/List.java
index d65bfcc..d87c29e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/List.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java
index be653fa..58affb2 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java
index 23b1d42..44eefa3 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java
index d85447c..1a5566d 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java
index ec76137..143c261 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java
index b1c7055..31ce227 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java b/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java
index ecac7ff..0c33154 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java b/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java
index 0553870..7d22a2e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java b/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
index 9f47c61..450682d 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/Describe.java b/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
index 3802cc7..52eaac7 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/List.java b/authz-cmd/src/main/java/com/att/cmd/role/List.java
index 72cf203..8980d72 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/List.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
index 253a537..dd5a0c6 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
index 67c2c50..87edee6 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
index b47db01..912be45 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
index 50dff9b..f57c542 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
index fad9347..c75bdf4 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
index 03db10f..08466a6 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/Role.java b/authz-cmd/src/main/java/com/att/cmd/role/Role.java
index a3336ae..288cd11 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/Role.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/Role.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/role/User.java b/authz-cmd/src/main/java/com/att/cmd/role/User.java
index ea8276c..9768913 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/User.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/User.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/Cred.java b/authz-cmd/src/main/java/com/att/cmd/user/Cred.java
index 1319889..daa68e0 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/Cred.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/Cred.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/Delg.java b/authz-cmd/src/main/java/com/att/cmd/user/Delg.java
index af4095f..f61e66c 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/Delg.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/Delg.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/List.java b/authz-cmd/src/main/java/com/att/cmd/user/List.java
index d88c15d..fc5afec 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/List.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java
index bf384f6..31c0149 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java b/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java
index 85569f4..410085a 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java b/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java
index 779f625..a35191a 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java b/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java
index 8ede118..3ce4ac7 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java b/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java
index fb13bbb..e05813a 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java b/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java
index e2a8990..f2eb855 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/Role.java b/authz-cmd/src/main/java/com/att/cmd/user/Role.java
index 1d660c6..af88437 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/Role.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/Role.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/main/java/com/att/cmd/user/User.java b/authz-cmd/src/main/java/com/att/cmd/user/User.java
index 13f1111..27be777 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/User.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/User.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java b/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java
index f3d721c..9cd76a2 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_AAFCli.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java b/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java
index 3e1eefa..d722020 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_BaseCmd.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java b/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java
index 67a6d22..0096bfb 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_BasicAuth.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/JU_Help.java b/authz-cmd/src/test/java/com/att/cmd/JU_Help.java
index c5af6f9..2856372 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_Help.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_Help.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/JU_Version.java b/authz-cmd/src/test/java/com/att/cmd/JU_Version.java
index f9c5727..988dabc 100644
--- a/authz-cmd/src/test/java/com/att/cmd/JU_Version.java
+++ b/authz-cmd/src/test/java/com/att/cmd/JU_Version.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java
index ce900f7..9ca61ba 100644
--- a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java
+++ b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Clear.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java
index 78b630c..ce760a4 100644
--- a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java
+++ b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_Log.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java
index 1ab0ae0..57e4a9c 100644
--- a/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java
+++ b/authz-cmd/src/test/java/com/att/cmd/mgmt/JU_SessClear.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java
index ab67de3..59391ee 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Admin.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java
index 7bf8403..9a8147a 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Attrib.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java
index fe07b74..4d53601 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Create.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java
index c2ea19c..bc58491 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Delete.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java
index 85b7b22..b5a82be 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Describe.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java
index 93b7e3d..775a80b 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java
index c730069..53b5f36 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListAdminResponsible.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java
index a986ff5..5362d87 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListByName.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java
index b9228b0..253a9c5 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListChildren.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java
index 895693c..263a406 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListNsKeysByAttrib.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java
index 4ef7384..1f80e8f 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersInRole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java
index 78b65da..32a4576 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_ListUsersWithPerm.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java
index 9e291c2..d533550 100644
--- a/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java
+++ b/authz-cmd/src/test/java/com/att/cmd/ns/JU_Responsible.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java
index fa90e5f..cfcbf44 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Create.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java
index c2b6463..1f5dfc9 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Delete.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java
index 5bcd774..1dc317c 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Describe.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java
index fb789ec..51befc3 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Grant.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java
index f4cf7cf..50f35ac 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java
index 228b46a..851667b 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByNS.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java
index b88bc74..9621026 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByName.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java
index 7835f22..5db384e 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByRole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java
index a0b6ccd..fb25ba7 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_ListByUser.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java
index 3fffc9d..a812f0a 100644
--- a/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java
+++ b/authz-cmd/src/test/java/com/att/cmd/perm/JU_Rename.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java
index e64fe93..03708a6 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_CreateDelete.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java
index c0f3ff5..ee1c15d 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_Describe.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java
index f18c20a..66c3914 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java
index c088a6b..f56c4d5 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNS.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java
index ccd687c..92cdf33 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByNameOnly.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java
index 3d5fcad..d015b38 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByPerm.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java
index 750543f..f892a3c 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByRole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java
index 5ef38c3..c53ac19 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_ListByUser.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java b/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java
index 33319a5..90946de 100644
--- a/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java
+++ b/authz-cmd/src/test/java/com/att/cmd/role/JU_User.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java
index 279fe2d..570d79f 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_Cred.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java
index 0f80a81..4abdf59 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_Delg.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java
index e1e2d4b..4676382 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListActivity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java
index cc4f648..622d020 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListApprovals.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java
index e1d9149..c5f9402 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListDelegates.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java
index 5600d5a..bf453d6 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForCreds.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java
index 51e20c1..5ad1a95 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForPermission.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java
index b68e597..f90c834 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_ListForRoles.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java b/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java
index c24531b..076a68a 100644
--- a/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java
+++ b/authz-cmd/src/test/java/com/att/cmd/user/JU_Role.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-core/.gitignore b/authz-core/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-core/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-core/pom.xml b/authz-core/pom.xml
index 7120f35..10a47f2 100644
--- a/authz-core/pom.xml
+++ b/authz-core/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-core/src/main/java/com/att/authz/common/Define.java b/authz-core/src/main/java/com/att/authz/common/Define.java
index 747ab50..58f6d9a 100644
--- a/authz-core/src/main/java/com/att/authz/common/Define.java
+++ b/authz-core/src/main/java/com/att/authz/common/Define.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-core/src/main/java/com/att/authz/env/AuthzEnv.java b/authz-core/src/main/java/com/att/authz/env/AuthzEnv.java
index b5015b0..caae114 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzEnv.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzEnv.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-core/src/main/java/com/att/authz/env/AuthzTrans.java b/authz-core/src/main/java/com/att/authz/env/AuthzTrans.java
index 129dddd..b835d64 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTrans.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTrans.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-core/src/main/java/com/att/authz/env/AuthzTransFilter.java b/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java
index 46bec11..a546af7 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.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-core/src/main/java/com/att/authz/env/AuthzTransImpl.java b/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java
index 77f94a4..6859788 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.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-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java b/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java
index ecc9577..bec9231 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.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-core/src/main/java/com/att/authz/env/NullTrans.java b/authz-core/src/main/java/com/att/authz/env/NullTrans.java
index b65994b..1158ad4 100644
--- a/authz-core/src/main/java/com/att/authz/env/NullTrans.java
+++ b/authz-core/src/main/java/com/att/authz/env/NullTrans.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-core/src/main/java/com/att/authz/layer/FacadeImpl.java b/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java
index 0739445..6e657e5 100644
--- a/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java
+++ b/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.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-core/src/main/java/com/att/authz/layer/Result.java b/authz-core/src/main/java/com/att/authz/layer/Result.java
index 1af9a26..2934491 100644
--- a/authz-core/src/main/java/com/att/authz/layer/Result.java
+++ b/authz-core/src/main/java/com/att/authz/layer/Result.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/local/AbsData.java b/authz-core/src/main/java/com/att/authz/local/AbsData.java
index cc00eff..69d6d69 100644
--- a/authz-core/src/main/java/com/att/authz/local/AbsData.java
+++ b/authz-core/src/main/java/com/att/authz/local/AbsData.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-core/src/main/java/com/att/authz/local/DataFile.java b/authz-core/src/main/java/com/att/authz/local/DataFile.java
index a54e856..1513c58 100644
--- a/authz-core/src/main/java/com/att/authz/local/DataFile.java
+++ b/authz-core/src/main/java/com/att/authz/local/DataFile.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-core/src/main/java/com/att/authz/local/TextIndex.java b/authz-core/src/main/java/com/att/authz/local/TextIndex.java
index a689964..8304329 100644
--- a/authz-core/src/main/java/com/att/authz/local/TextIndex.java
+++ b/authz-core/src/main/java/com/att/authz/local/TextIndex.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-core/src/main/java/com/att/authz/org/EmailWarnings.java b/authz-core/src/main/java/com/att/authz/org/EmailWarnings.java
index 0f87eb2..2073800 100644
--- a/authz-core/src/main/java/com/att/authz/org/EmailWarnings.java
+++ b/authz-core/src/main/java/com/att/authz/org/EmailWarnings.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-core/src/main/java/com/att/authz/org/Executor.java b/authz-core/src/main/java/com/att/authz/org/Executor.java
index dcdf646..c3c0e40 100644
--- a/authz-core/src/main/java/com/att/authz/org/Executor.java
+++ b/authz-core/src/main/java/com/att/authz/org/Executor.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-core/src/main/java/com/att/authz/org/Organization.java b/authz-core/src/main/java/com/att/authz/org/Organization.java
index e8938cd..4163e3c 100644
--- a/authz-core/src/main/java/com/att/authz/org/Organization.java
+++ b/authz-core/src/main/java/com/att/authz/org/Organization.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-core/src/main/java/com/att/authz/org/OrganizationException.java b/authz-core/src/main/java/com/att/authz/org/OrganizationException.java
index a3928fb..14be05b 100644
--- a/authz-core/src/main/java/com/att/authz/org/OrganizationException.java
+++ b/authz-core/src/main/java/com/att/authz/org/OrganizationException.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-core/src/main/java/com/att/authz/org/OrganizationFactory.java b/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java
index c97111e..81f5376 100644
--- a/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java
+++ b/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.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-core/src/main/java/com/att/authz/server/AbsServer.java b/authz-core/src/main/java/com/att/authz/server/AbsServer.java
index aa935d0..75db79b 100644
--- a/authz-core/src/main/java/com/att/authz/server/AbsServer.java
+++ b/authz-core/src/main/java/com/att/authz/server/AbsServer.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-core/src/main/java/com/att/cache/Cache.java b/authz-core/src/main/java/com/att/cache/Cache.java
index 2930e09..74b1577 100644
--- a/authz-core/src/main/java/com/att/cache/Cache.java
+++ b/authz-core/src/main/java/com/att/cache/Cache.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-core/src/main/java/com/att/cssa/rserv/Acceptor.java b/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java
index ea2850a..6b6399d 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.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-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java b/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java
index 80de269..29328fb 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.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-core/src/main/java/com/att/cssa/rserv/CodeSetter.java b/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java
index 01ecf38..f4108bb 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.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-core/src/main/java/com/att/cssa/rserv/Content.java b/authz-core/src/main/java/com/att/cssa/rserv/Content.java
index fd6c8a5..f58cd42 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Content.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Content.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-core/src/main/java/com/att/cssa/rserv/HttpCode.java b/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java
index ca07843..72213f3 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.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-core/src/main/java/com/att/cssa/rserv/HttpMethods.java b/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java
index c247aad..0aa053f 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.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-core/src/main/java/com/att/cssa/rserv/Match.java b/authz-core/src/main/java/com/att/cssa/rserv/Match.java
index 1f5a60f..5c40df5 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Match.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Match.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-core/src/main/java/com/att/cssa/rserv/Pair.java b/authz-core/src/main/java/com/att/cssa/rserv/Pair.java
index 7d3b88c..8291dc7 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Pair.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Pair.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-core/src/main/java/com/att/cssa/rserv/RServlet.java b/authz-core/src/main/java/com/att/cssa/rserv/RServlet.java
index ed116e6..330dffb 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/RServlet.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/RServlet.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-core/src/main/java/com/att/cssa/rserv/Route.java b/authz-core/src/main/java/com/att/cssa/rserv/Route.java
index 0a8cffe..644ee72 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Route.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Route.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-core/src/main/java/com/att/cssa/rserv/RouteReport.java b/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java
index 6dee8d3..7093407 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.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-core/src/main/java/com/att/cssa/rserv/Routes.java b/authz-core/src/main/java/com/att/cssa/rserv/Routes.java
index c2d7fb8..e7d559b 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Routes.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Routes.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-core/src/main/java/com/att/cssa/rserv/TransFilter.java b/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java
index 244609b..8d045be 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.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-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java b/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java
index 1ef5456..c2b37ca 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.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-core/src/main/java/com/att/cssa/rserv/TypedCode.java b/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java
index 6fd7049..5094e08 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.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-core/src/main/java/com/att/cssa/rserv/Version.java b/authz-core/src/main/java/com/att/cssa/rserv/Version.java
index e24c48e..183d3be 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Version.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Version.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java b/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java
index 76e589a..5e254df 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.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-core/src/test/java/com/att/authz/common/JU_Define.java b/authz-core/src/test/java/com/att/authz/common/JU_Define.java
index af0cd26..92da6ea 100644
--- a/authz-core/src/test/java/com/att/authz/common/JU_Define.java
+++ b/authz-core/src/test/java/com/att/authz/common/JU_Define.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-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java
index bda84f0..1c63915 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.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-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java
index c00ff68..b6d0490 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.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-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java
index f9a934e..dbee3fa 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.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-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java
index 640fbdc..f5f33dd 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.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-core/src/test/java/com/att/authz/env/JU_NullTrans.java b/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java
index 7853a20..6cb5645 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.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-core/src/test/java/com/att/authz/layer/JU_Result.java b/authz-core/src/test/java/com/att/authz/layer/JU_Result.java
index 8bebfa7..415aee6 100644
--- a/authz-core/src/test/java/com/att/authz/layer/JU_Result.java
+++ b/authz-core/src/test/java/com/att/authz/layer/JU_Result.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java b/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java
index 27c7ad6..40e0400 100644
--- a/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java
+++ b/authz-core/src/test/java/com/att/authz/local/JU_DataFile.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-core/src/test/java/com/att/authz/local/JU_TextIndex.java b/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java
index be0746b..df6a8d2 100644
--- a/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java
+++ b/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.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-core/src/test/java/com/att/authz/org/JU_OrganizationException.java b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.java
index 91a5412..212a3dc 100644
--- a/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.java
+++ b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.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-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java
index 75f2a52..8876d50 100644
--- a/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java
+++ b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.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-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java
index 3716b19..a82429a 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.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-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java
index d6405c2..b155552 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.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-core/src/test/java/com/att/cssa/rserv/JU_Pair.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java
index 5cc362f..f185958 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.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-core/src/test/java/com/att/cssa/rserv/JU_Routes.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java
index 67328f6..f6b2bba 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.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-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java
index 76d5553..cb1502b 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.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-core/src/test/java/com/att/cssa/rserv/JU_Version.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java
index 47ea35b..12815b2 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java
index 5a82591..b0f270f 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.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-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java
index dd2a33e..7bc51b5 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.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-defOrg/.gitignore b/authz-defOrg/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-defOrg/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-defOrg/pom.xml b/authz-defOrg/pom.xml
index a61aa57..abd5d41 100644
--- a/authz-defOrg/pom.xml
+++ b/authz-defOrg/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-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java
index 5a3abc8..fc25260 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.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-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java
index 5178779..21ea63e 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.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-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java
index cb184e3..3d55ce0 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.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-defOrg/src/main/java/com/osaaf/defOrg/Identities.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.java
index 73c579b..26ac2a9 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.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-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java b/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java
index e8078e6..68fc15f 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.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-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java
index a86ca4e..2ffa1f7 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.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-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java
index 97ae02e..3a51b6f 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.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-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java
index d1c3107..164566d 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.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-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java
index 65c6f1c..2bda77f 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.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-fs/.gitignore b/authz-fs/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-fs/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-fs/pom.xml b/authz-fs/pom.xml
index aa896d6..d4ae503 100644
--- a/authz-fs/pom.xml
+++ b/authz-fs/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-fs/src/main/config/log4j.properties b/authz-fs/src/main/config/log4j.properties
index 38593d6..65a4ca7 100644
--- a/authz-fs/src/main/config/log4j.properties
+++ b/authz-fs/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-fs/src/main/config/lrm-authz-fs.xml b/authz-fs/src/main/config/lrm-authz-fs.xml
index a51db07..b5d1ffd 100644
--- a/authz-fs/src/main/config/lrm-authz-fs.xml
+++ b/authz-fs/src/main/config/lrm-authz-fs.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-fs/src/main/data/test.html b/authz-fs/src/main/data/test.html
index 428a274..7ea7302 100644
--- a/authz-fs/src/main/data/test.html
+++ b/authz-fs/src/main/data/test.html
@@ -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-fs/src/main/java/com/att/authz/fs/FileServer.java b/authz-fs/src/main/java/com/att/authz/fs/FileServer.java
index d7d2995..30ac1a6 100644
--- a/authz-fs/src/main/java/com/att/authz/fs/FileServer.java
+++ b/authz-fs/src/main/java/com/att/authz/fs/FileServer.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-fs/src/test/java/com/att/authz/fs/JU_FileServer.java b/authz-fs/src/test/java/com/att/authz/fs/JU_FileServer.java
index 3ea025a..3417cb0 100644
--- a/authz-fs/src/test/java/com/att/authz/fs/JU_FileServer.java
+++ b/authz-fs/src/test/java/com/att/authz/fs/JU_FileServer.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-gui/.gitignore b/authz-gui/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-gui/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-gw/.gitignore b/authz-gw/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-gw/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-gw/pom.xml b/authz-gw/pom.xml
index c4399f3..29564b5 100644
--- a/authz-gw/pom.xml
+++ b/authz-gw/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-gw/src/main/config/log4j.properties b/authz-gw/src/main/config/log4j.properties
index 963c6f0..fb5f22c 100644
--- a/authz-gw/src/main/config/log4j.properties
+++ b/authz-gw/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-gw/src/main/config/lrm-authz-gw.xml b/authz-gw/src/main/config/lrm-authz-gw.xml
index 7e6c427..f48470d 100644
--- a/authz-gw/src/main/config/lrm-authz-gw.xml
+++ b/authz-gw/src/main/config/lrm-authz-gw.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-gw/src/main/java/com/att/authz/gw/GwAPI.java b/authz-gw/src/main/java/com/att/authz/gw/GwAPI.java
index 9411bcd..959baf3 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/GwAPI.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/GwAPI.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-gw/src/main/java/com/att/authz/gw/GwCode.java b/authz-gw/src/main/java/com/att/authz/gw/GwCode.java
index 07717db..e5a48df 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/GwCode.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/GwCode.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-gw/src/main/java/com/att/authz/gw/api/API_AAFAccess.java b/authz-gw/src/main/java/com/att/authz/gw/api/API_AAFAccess.java
index ffe42e1..31cbd1b 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/api/API_AAFAccess.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/api/API_AAFAccess.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-gw/src/main/java/com/att/authz/gw/api/API_Api.java b/authz-gw/src/main/java/com/att/authz/gw/api/API_Api.java
index a752e67..22b68eb 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/api/API_Api.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/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-gw/src/main/java/com/att/authz/gw/api/API_Find.java b/authz-gw/src/main/java/com/att/authz/gw/api/API_Find.java
index 7705c4a..c6a1e0f 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/api/API_Find.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/api/API_Find.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-gw/src/main/java/com/att/authz/gw/api/API_Proxy.java b/authz-gw/src/main/java/com/att/authz/gw/api/API_Proxy.java
index 14d8c41..0c23455 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/api/API_Proxy.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/api/API_Proxy.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-gw/src/main/java/com/att/authz/gw/api/API_TGuard.java b/authz-gw/src/main/java/com/att/authz/gw/api/API_TGuard.java
index 52dae40..3236106 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/api/API_TGuard.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/api/API_TGuard.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-gw/src/main/java/com/att/authz/gw/facade/GwFacade.java b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacade.java
index e4eb635..daeea34 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacade.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacade.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-gw/src/main/java/com/att/authz/gw/facade/GwFacadeFactory.java b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacadeFactory.java
index 4b79b07..463931d 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacadeFactory.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacadeFactory.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-gw/src/main/java/com/att/authz/gw/facade/GwFacadeImpl.java b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacadeImpl.java
index 9f1c3f1..6045ad4 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacadeImpl.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacadeImpl.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-gw/src/main/java/com/att/authz/gw/facade/GwFacade_1_0.java b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacade_1_0.java
index fbaa91e..7b6e914 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacade_1_0.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/facade/GwFacade_1_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-gw/src/main/java/com/att/authz/gw/mapper/Mapper.java b/authz-gw/src/main/java/com/att/authz/gw/mapper/Mapper.java
index c2f3049..143dcce 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/mapper/Mapper.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/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-gw/src/main/java/com/att/authz/gw/mapper/Mapper_1_0.java b/authz-gw/src/main/java/com/att/authz/gw/mapper/Mapper_1_0.java
index 49f2f84..49ee4b8 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/mapper/Mapper_1_0.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/mapper/Mapper_1_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-gw/src/main/java/com/att/authz/gw/service/GwService.java b/authz-gw/src/main/java/com/att/authz/gw/service/GwService.java
index aaa5489..c1f7e35 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/service/GwService.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/service/GwService.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-gw/src/main/java/com/att/authz/gw/service/GwServiceImpl.java b/authz-gw/src/main/java/com/att/authz/gw/service/GwServiceImpl.java
index 3113d9d..d1b1c33 100644
--- a/authz-gw/src/main/java/com/att/authz/gw/service/GwServiceImpl.java
+++ b/authz-gw/src/main/java/com/att/authz/gw/service/GwServiceImpl.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-gw/src/test/java/com/att/authz/gw/JU_GwAPI.java b/authz-gw/src/test/java/com/att/authz/gw/JU_GwAPI.java
index 2a53c31..80ab0ec 100644
--- a/authz-gw/src/test/java/com/att/authz/gw/JU_GwAPI.java
+++ b/authz-gw/src/test/java/com/att/authz/gw/JU_GwAPI.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/.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.
diff --git a/authz-test/.gitignore b/authz-test/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-test/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-test/TestSuite/Instructions_for_MTCs/MTC_Appr_README.txt b/authz-test/TestSuite/Instructions_for_MTCs/MTC_Appr_README.txt
index 058508a..d7ecee4 100644
--- a/authz-test/TestSuite/Instructions_for_MTCs/MTC_Appr_README.txt
+++ b/authz-test/TestSuite/Instructions_for_MTCs/MTC_Appr_README.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-test/pom.xml b/authz-test/pom.xml
index 21df6d4..6affb59 100644
--- a/authz-test/pom.xml
+++ b/authz-test/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-test/src/main/assemble/swm.xml b/authz-test/src/main/assemble/swm.xml
index 089cfbe..f2e8683 100644
--- a/authz-test/src/main/assemble/swm.xml
+++ b/authz-test/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-test/src/main/config/lrm-authz-service.xml b/authz-test/src/main/config/lrm-authz-service.xml
index ec5e5c5..8cb7c9d 100644
--- a/authz-test/src/main/config/lrm-authz-service.xml
+++ b/authz-test/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-test/src/main/swm/descriptor.xml b/authz-test/src/main/swm/descriptor.xml
index 31f9508..625ed2d 100644
--- a/authz-test/src/main/swm/descriptor.xml
+++ b/authz-test/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-test/src/main/swm/packageNotes.txt b/authz-test/src/main/swm/packageNotes.txt
index c566813..cc8c7ee 100644
--- a/authz-test/src/main/swm/packageNotes.txt
+++ b/authz-test/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.