summaryrefslogtreecommitdiffstats
path: root/authz-cass
diff options
context:
space:
mode:
Diffstat (limited to 'authz-cass')
-rw-r--r--authz-cass/.gitignore5
-rw-r--r--authz-cass/pom.xml3
-rw-r--r--authz-cass/src/main/java/com/att/dao/AbsCassDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/Bytification.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/CIDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/Cacheable.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/Cached.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/CachedDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/CassAccess.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/CassDAOImpl.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/DAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/DAOException.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/DAO_RO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/Loader.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/Streamer.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/Touchable.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCertDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cached/CachedCredDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cached/CachedNSDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cached/CachedPermDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cached/CachedRoleDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cached/CachedUserRoleDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/ApprovalDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/ArtiDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/CacheInfoDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/CacheableData.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/CertDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/CredDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/DelegateDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/FutureDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/HistoryDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/Namespace.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/NsDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/NsSplit.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/NsType.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/PermDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/RoleDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/Status.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/cass/UserRoleDAO.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/hl/CassExecutor.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/hl/Function.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/hl/PermLookup.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/aaf/hl/Question.java3
-rw-r--r--authz-cass/src/main/java/com/att/dao/session/SessionFilter.java3
-rw-r--r--authz-cass/src/test/java/com/att/authz/cass/hl/JU_Question.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/JU_Cached.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/JU_CachedDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/JU_CassAccess.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/JU_CassDAOImpl.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/JU_DAOException.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/AbsJUCass.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_ApprovalDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_ArtiDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_Bytification.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_CacheInfoDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_CertDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_CredDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_DelegateDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_FastCalling.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_HistoryDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_NsType.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_PermDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/JU_RoleDAO.java3
-rw-r--r--authz-cass/src/test/java/com/att/dao/aaf/test/NS_ChildUpdate.java3
-rw-r--r--authz-cass/src/test/resources/cadi.properties3
66 files changed, 65 insertions, 135 deletions
diff --git a/authz-cass/.gitignore b/authz-cass/.gitignore
deleted file mode 100644
index f99ab6a2..00000000
--- 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 266485a5..baea96ac 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 2ea4e6ec..987a3f23 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 b563be98..1bb16c4a 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 ee5e611a..d1a8d621 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 71b48962..20fa1561 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 2cdd2b21..302d4f46 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 bcfccbd1..a490f207 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 a935aff2..00802c98 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 84d35323..82ae8b1f 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 e2144162..f1a59de1 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 8c9a701e..652ae7d3 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 2b6173c5..ceea722a 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 6b09df96..fb364aca 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 385877ea..6bc482ae 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 4f8b7f6e..c3fab887 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 611aa4eb..76230690 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 b9f20c24..2d0f91e5 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 0008dff1..0ffc705b 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 e900f691..659bde80 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 b7836449..a0f375fa 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 45e61bd9..2478759e 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 f2f25e7d..f7f4eedd 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 397a8834..d24d4fab 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 ef8201ab..da18caa6 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 2afefb1b..5b434db3 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 6952841b..bae6a241 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 9d403fe4..94c43d2e 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 7cebc88d..6d6534eb 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 5db689d7..f4a8c2db 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 4a9d105d..adaf0d81 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 fa61372e..d3b11819 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 39a52af9..ed30dc0e 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 ad896fc5..2d9d8a1a 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 442e26e3..6b61ba63 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 b54b6fc7..f02f3352 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 84290ef7..f25a2f68 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 d275f3d7..ff71b3a9 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 d3fffe8c..d55a95cb 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 6f62acec..4dc22e1d 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 d1db39da..6d04b1d4 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 f2564fc0..522db0ad 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 ce868fbc..b9bb9ee1 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 6f835194..cbc05c76 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 941c86e2..eadd9580 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 4e6bf7d7..b48a0f17 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 4cd38f26..35acbd72 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 b9c55a28..d6aaff50 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 6abf1987..65925561 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..637b951c 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 0f1994c8..f26a37ce 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 3a884b43..0c93beb0 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 219d302a..7ae692b4 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 34bfc3e6..76f9077f 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 2a41a707..4847e3f9 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 52238ef3..172eb243 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 5cd6d4cb..918e0bd3 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 cb71fafe..ea829bcf 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 120b6f02..ff77c9b1 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 605b1327..8d444950 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 562694ce..55f990a2 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 c2508628..64023aad 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 7022a816..d045a0ea 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 d797cfb9..d625adc0 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 dc3f13e8..bc044d51 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 4f38cf54..8f1209a9 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.