summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'core/src')
-rw-r--r--core/src/assemble/cadi.xml3
-rw-r--r--core/src/assemble/poll.xml3
-rw-r--r--core/src/main/java/com/att/cadi/AES.java3
-rw-r--r--core/src/main/java/com/att/cadi/AbsCachedPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/AbsUserCache.java3
-rw-r--r--core/src/main/java/com/att/cadi/Access.java3
-rw-r--r--core/src/main/java/com/att/cadi/BasicCred.java3
-rw-r--r--core/src/main/java/com/att/cadi/BufferedCadiWrap.java3
-rw-r--r--core/src/main/java/com/att/cadi/BufferedServletInputStream.java3
-rw-r--r--core/src/main/java/com/att/cadi/CachedPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/CachingLur.java3
-rw-r--r--core/src/main/java/com/att/cadi/CadiException.java3
-rw-r--r--core/src/main/java/com/att/cadi/CadiWrap.java3
-rw-r--r--core/src/main/java/com/att/cadi/Capacitor.java3
-rw-r--r--core/src/main/java/com/att/cadi/CmdLine.java3
-rw-r--r--core/src/main/java/com/att/cadi/Connector.java3
-rw-r--r--core/src/main/java/com/att/cadi/CredVal.java3
-rw-r--r--core/src/main/java/com/att/cadi/GetCred.java3
-rw-r--r--core/src/main/java/com/att/cadi/Hash.java3
-rw-r--r--core/src/main/java/com/att/cadi/Locator.java3
-rw-r--r--core/src/main/java/com/att/cadi/LocatorException.java3
-rw-r--r--core/src/main/java/com/att/cadi/Lur.java3
-rw-r--r--core/src/main/java/com/att/cadi/Permission.java3
-rw-r--r--core/src/main/java/com/att/cadi/PropAccess.java3
-rw-r--r--core/src/main/java/com/att/cadi/Revalidator.java3
-rw-r--r--core/src/main/java/com/att/cadi/SLF4JAccess.java3
-rw-r--r--core/src/main/java/com/att/cadi/SecuritySetter.java3
-rw-r--r--core/src/main/java/com/att/cadi/ServletContextAccess.java3
-rw-r--r--core/src/main/java/com/att/cadi/StrLur.java3
-rw-r--r--core/src/main/java/com/att/cadi/Symm.java3
-rw-r--r--core/src/main/java/com/att/cadi/Taf.java3
-rw-r--r--core/src/main/java/com/att/cadi/Transmutate.java3
-rw-r--r--core/src/main/java/com/att/cadi/TrustChecker.java3
-rw-r--r--core/src/main/java/com/att/cadi/User.java3
-rw-r--r--core/src/main/java/com/att/cadi/UserChain.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/Config.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/Get.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/GetAccess.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/MultiGet.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/SecurityInfo.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/SecurityInfoC.java3
-rw-r--r--core/src/main/java/com/att/cadi/config/UsersDump.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/AUTHZ.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/AUTHZServlet.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/AccessGetter.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/CadiAccess.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/CadiFilter.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/FCGet.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/MapPermConverter.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/NullPermConverter.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/PathFilter.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/PermConverter.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/RolesAllowed.java3
-rw-r--r--core/src/main/java/com/att/cadi/filter/ServletImpl.java3
-rw-r--r--core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/lur/EpiLur.java3
-rw-r--r--core/src/main/java/com/att/cadi/lur/LocalLur.java3
-rw-r--r--core/src/main/java/com/att/cadi/lur/LocalPermission.java3
-rw-r--r--core/src/main/java/com/att/cadi/lur/NullLur.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/BasicPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/BearerPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/TrustPrincipal.java3
-rw-r--r--core/src/main/java/com/att/cadi/principal/X509Principal.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/AbsTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/EpiTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/HttpTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/NullTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/NullTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/PuntTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/Redirectable.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/TafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/TrustTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/cert/X509Taf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java3
-rw-r--r--core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/Chmod.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/JsonOutputStream.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/MaskFormatException.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/MyConsole.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/NetMask.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/Split.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/SubStandardConsole.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/TheConsole.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/UserChainManip.java3
-rw-r--r--core/src/main/java/com/att/cadi/util/Vars.java3
-rw-r--r--core/src/main/java/com/att/cadi/wsse/Action.java3
-rw-r--r--core/src/main/java/com/att/cadi/wsse/Match.java3
-rw-r--r--core/src/main/java/com/att/cadi/wsse/WSSEParser.java3
-rw-r--r--core/src/main/java/com/att/cadi/wsse/XEvent.java3
-rw-r--r--core/src/main/java/com/att/cadi/wsse/XReader.java3
-rw-r--r--core/src/test/java/com/att/cadi/JU_AES.java3
-rw-r--r--core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java3
-rw-r--r--core/src/test/java/com/att/cadi/lur/test/TestAccess.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_Base64.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_Capacitor.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_Hash.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_Passcode.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_UserChainManip.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/JU_Vars.java3
-rw-r--r--core/src/test/java/com/att/cadi/test/Test.java3
-rw-r--r--core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java3
-rw-r--r--core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java3
117 files changed, 117 insertions, 234 deletions
diff --git a/core/src/assemble/cadi.xml b/core/src/assemble/cadi.xml
index 0bbb8e8..16394a0 100644
--- a/core/src/assemble/cadi.xml
+++ b/core/src/assemble/cadi.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/core/src/assemble/poll.xml b/core/src/assemble/poll.xml
index c33dd83..c5735d6 100644
--- a/core/src/assemble/poll.xml
+++ b/core/src/assemble/poll.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/core/src/main/java/com/att/cadi/AES.java b/core/src/main/java/com/att/cadi/AES.java
index 4041ae5..7304932 100644
--- a/core/src/main/java/com/att/cadi/AES.java
+++ b/core/src/main/java/com/att/cadi/AES.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java b/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
index bb76e3d..f244d09 100644
--- a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
+++ b/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/AbsUserCache.java b/core/src/main/java/com/att/cadi/AbsUserCache.java
index 0229a71..d374faa 100644
--- a/core/src/main/java/com/att/cadi/AbsUserCache.java
+++ b/core/src/main/java/com/att/cadi/AbsUserCache.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Access.java b/core/src/main/java/com/att/cadi/Access.java
index 34ae9d4..4c238ee 100644
--- a/core/src/main/java/com/att/cadi/Access.java
+++ b/core/src/main/java/com/att/cadi/Access.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/BasicCred.java b/core/src/main/java/com/att/cadi/BasicCred.java
index f2411c4..6f0aff5 100644
--- a/core/src/main/java/com/att/cadi/BasicCred.java
+++ b/core/src/main/java/com/att/cadi/BasicCred.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java b/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
index cc9b40d..74dd126 100644
--- a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
+++ b/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java b/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
index 88114b2..10e7b1f 100644
--- a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
+++ b/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/CachedPrincipal.java b/core/src/main/java/com/att/cadi/CachedPrincipal.java
index 741d579..3968f1b 100644
--- a/core/src/main/java/com/att/cadi/CachedPrincipal.java
+++ b/core/src/main/java/com/att/cadi/CachedPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/CachingLur.java b/core/src/main/java/com/att/cadi/CachingLur.java
index b7a194f..ee87431 100644
--- a/core/src/main/java/com/att/cadi/CachingLur.java
+++ b/core/src/main/java/com/att/cadi/CachingLur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/CadiException.java b/core/src/main/java/com/att/cadi/CadiException.java
index 123b394..66b7b5b 100644
--- a/core/src/main/java/com/att/cadi/CadiException.java
+++ b/core/src/main/java/com/att/cadi/CadiException.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/CadiWrap.java b/core/src/main/java/com/att/cadi/CadiWrap.java
index 1961c6e..64c565f 100644
--- a/core/src/main/java/com/att/cadi/CadiWrap.java
+++ b/core/src/main/java/com/att/cadi/CadiWrap.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Capacitor.java b/core/src/main/java/com/att/cadi/Capacitor.java
index 0745875..73fd83c 100644
--- a/core/src/main/java/com/att/cadi/Capacitor.java
+++ b/core/src/main/java/com/att/cadi/Capacitor.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/CmdLine.java b/core/src/main/java/com/att/cadi/CmdLine.java
index 2d19234..89685e2 100644
--- a/core/src/main/java/com/att/cadi/CmdLine.java
+++ b/core/src/main/java/com/att/cadi/CmdLine.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Connector.java b/core/src/main/java/com/att/cadi/Connector.java
index 4f5576d..ab96010 100644
--- a/core/src/main/java/com/att/cadi/Connector.java
+++ b/core/src/main/java/com/att/cadi/Connector.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/CredVal.java b/core/src/main/java/com/att/cadi/CredVal.java
index 040781d..4fe0a28 100644
--- a/core/src/main/java/com/att/cadi/CredVal.java
+++ b/core/src/main/java/com/att/cadi/CredVal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/GetCred.java b/core/src/main/java/com/att/cadi/GetCred.java
index f5289f0..d2c99f2 100644
--- a/core/src/main/java/com/att/cadi/GetCred.java
+++ b/core/src/main/java/com/att/cadi/GetCred.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Hash.java b/core/src/main/java/com/att/cadi/Hash.java
index 190049f..b4e114f 100644
--- a/core/src/main/java/com/att/cadi/Hash.java
+++ b/core/src/main/java/com/att/cadi/Hash.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Locator.java b/core/src/main/java/com/att/cadi/Locator.java
index a1593bb..ab1a7f9 100644
--- a/core/src/main/java/com/att/cadi/Locator.java
+++ b/core/src/main/java/com/att/cadi/Locator.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/LocatorException.java b/core/src/main/java/com/att/cadi/LocatorException.java
index b9260b9..9c3b804 100644
--- a/core/src/main/java/com/att/cadi/LocatorException.java
+++ b/core/src/main/java/com/att/cadi/LocatorException.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Lur.java b/core/src/main/java/com/att/cadi/Lur.java
index 7ca94c9..d8ae6a3 100644
--- a/core/src/main/java/com/att/cadi/Lur.java
+++ b/core/src/main/java/com/att/cadi/Lur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Permission.java b/core/src/main/java/com/att/cadi/Permission.java
index b8cd56e..adb80a1 100644
--- a/core/src/main/java/com/att/cadi/Permission.java
+++ b/core/src/main/java/com/att/cadi/Permission.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/PropAccess.java b/core/src/main/java/com/att/cadi/PropAccess.java
index 25573a0..d7c9d99 100644
--- a/core/src/main/java/com/att/cadi/PropAccess.java
+++ b/core/src/main/java/com/att/cadi/PropAccess.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Revalidator.java b/core/src/main/java/com/att/cadi/Revalidator.java
index ded7b2d..5d492aa 100644
--- a/core/src/main/java/com/att/cadi/Revalidator.java
+++ b/core/src/main/java/com/att/cadi/Revalidator.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/SLF4JAccess.java b/core/src/main/java/com/att/cadi/SLF4JAccess.java
index e3d8451..b222e35 100644
--- a/core/src/main/java/com/att/cadi/SLF4JAccess.java
+++ b/core/src/main/java/com/att/cadi/SLF4JAccess.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/SecuritySetter.java b/core/src/main/java/com/att/cadi/SecuritySetter.java
index dadbd06..295148f 100644
--- a/core/src/main/java/com/att/cadi/SecuritySetter.java
+++ b/core/src/main/java/com/att/cadi/SecuritySetter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/ServletContextAccess.java b/core/src/main/java/com/att/cadi/ServletContextAccess.java
index 896f824..2d1cfa1 100644
--- a/core/src/main/java/com/att/cadi/ServletContextAccess.java
+++ b/core/src/main/java/com/att/cadi/ServletContextAccess.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/StrLur.java b/core/src/main/java/com/att/cadi/StrLur.java
index dc4c992..f191203 100644
--- a/core/src/main/java/com/att/cadi/StrLur.java
+++ b/core/src/main/java/com/att/cadi/StrLur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Symm.java b/core/src/main/java/com/att/cadi/Symm.java
index 0b34b58..1504c2d 100644
--- a/core/src/main/java/com/att/cadi/Symm.java
+++ b/core/src/main/java/com/att/cadi/Symm.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Taf.java b/core/src/main/java/com/att/cadi/Taf.java
index 7ba6fb4..4017866 100644
--- a/core/src/main/java/com/att/cadi/Taf.java
+++ b/core/src/main/java/com/att/cadi/Taf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/Transmutate.java b/core/src/main/java/com/att/cadi/Transmutate.java
index e392e86..1d6ff6f 100644
--- a/core/src/main/java/com/att/cadi/Transmutate.java
+++ b/core/src/main/java/com/att/cadi/Transmutate.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/TrustChecker.java b/core/src/main/java/com/att/cadi/TrustChecker.java
index 2cf2203..60b9a17 100644
--- a/core/src/main/java/com/att/cadi/TrustChecker.java
+++ b/core/src/main/java/com/att/cadi/TrustChecker.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/User.java b/core/src/main/java/com/att/cadi/User.java
index 6903cb3..bde3488 100644
--- a/core/src/main/java/com/att/cadi/User.java
+++ b/core/src/main/java/com/att/cadi/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/core/src/main/java/com/att/cadi/UserChain.java b/core/src/main/java/com/att/cadi/UserChain.java
index 90c47c1..df493c5 100644
--- a/core/src/main/java/com/att/cadi/UserChain.java
+++ b/core/src/main/java/com/att/cadi/UserChain.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/Config.java b/core/src/main/java/com/att/cadi/config/Config.java
index dd8e56d..ada6117 100644
--- a/core/src/main/java/com/att/cadi/config/Config.java
+++ b/core/src/main/java/com/att/cadi/config/Config.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/Get.java b/core/src/main/java/com/att/cadi/config/Get.java
index d6bb35b..7a2eab5 100644
--- a/core/src/main/java/com/att/cadi/config/Get.java
+++ b/core/src/main/java/com/att/cadi/config/Get.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/GetAccess.java b/core/src/main/java/com/att/cadi/config/GetAccess.java
index bdd6afd..1df9b0e 100644
--- a/core/src/main/java/com/att/cadi/config/GetAccess.java
+++ b/core/src/main/java/com/att/cadi/config/GetAccess.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/MultiGet.java b/core/src/main/java/com/att/cadi/config/MultiGet.java
index a304319..83cd21d 100644
--- a/core/src/main/java/com/att/cadi/config/MultiGet.java
+++ b/core/src/main/java/com/att/cadi/config/MultiGet.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/SecurityInfo.java b/core/src/main/java/com/att/cadi/config/SecurityInfo.java
index a1ef35b..6d0f3c2 100644
--- a/core/src/main/java/com/att/cadi/config/SecurityInfo.java
+++ b/core/src/main/java/com/att/cadi/config/SecurityInfo.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java b/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
index 5e2fd54..2b0ec43 100644
--- a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
+++ b/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/config/UsersDump.java b/core/src/main/java/com/att/cadi/config/UsersDump.java
index 7d47b7e..992b365 100644
--- a/core/src/main/java/com/att/cadi/config/UsersDump.java
+++ b/core/src/main/java/com/att/cadi/config/UsersDump.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/AUTHZ.java b/core/src/main/java/com/att/cadi/filter/AUTHZ.java
index 8f33105..ab32a98 100644
--- a/core/src/main/java/com/att/cadi/filter/AUTHZ.java
+++ b/core/src/main/java/com/att/cadi/filter/AUTHZ.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java b/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
index dab6b47..c1ad627 100644
--- a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
+++ b/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/AccessGetter.java b/core/src/main/java/com/att/cadi/filter/AccessGetter.java
index a36b7c7..37d2c04 100644
--- a/core/src/main/java/com/att/cadi/filter/AccessGetter.java
+++ b/core/src/main/java/com/att/cadi/filter/AccessGetter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/CadiAccess.java b/core/src/main/java/com/att/cadi/filter/CadiAccess.java
index c7a9250..e9bc5a8 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiAccess.java
+++ b/core/src/main/java/com/att/cadi/filter/CadiAccess.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/CadiFilter.java b/core/src/main/java/com/att/cadi/filter/CadiFilter.java
index 578cbba..da24f44 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiFilter.java
+++ b/core/src/main/java/com/att/cadi/filter/CadiFilter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java b/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
index 821dae9..6969b8c 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
+++ b/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/FCGet.java b/core/src/main/java/com/att/cadi/filter/FCGet.java
index 97840d4..b8f95da 100644
--- a/core/src/main/java/com/att/cadi/filter/FCGet.java
+++ b/core/src/main/java/com/att/cadi/filter/FCGet.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java b/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
index 19aeb18..09b6f93 100644
--- a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
+++ b/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java b/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
index 07c565d..d73008e 100644
--- a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
+++ b/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/PathFilter.java b/core/src/main/java/com/att/cadi/filter/PathFilter.java
index 3ea6536..328977d 100644
--- a/core/src/main/java/com/att/cadi/filter/PathFilter.java
+++ b/core/src/main/java/com/att/cadi/filter/PathFilter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/PermConverter.java b/core/src/main/java/com/att/cadi/filter/PermConverter.java
index e5bfcb7..ba098c4 100644
--- a/core/src/main/java/com/att/cadi/filter/PermConverter.java
+++ b/core/src/main/java/com/att/cadi/filter/PermConverter.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java b/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
index ec350fd..97a8f54 100644
--- a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
+++ b/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/filter/ServletImpl.java b/core/src/main/java/com/att/cadi/filter/ServletImpl.java
index 3db6d4e..13a251c 100644
--- a/core/src/main/java/com/att/cadi/filter/ServletImpl.java
+++ b/core/src/main/java/com/att/cadi/filter/ServletImpl.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java b/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
index 03a7961..443d7e7 100644
--- a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
+++ b/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/lur/EpiLur.java b/core/src/main/java/com/att/cadi/lur/EpiLur.java
index de6c057..1eff70e 100644
--- a/core/src/main/java/com/att/cadi/lur/EpiLur.java
+++ b/core/src/main/java/com/att/cadi/lur/EpiLur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/lur/LocalLur.java b/core/src/main/java/com/att/cadi/lur/LocalLur.java
index 80b302a..5980769 100644
--- a/core/src/main/java/com/att/cadi/lur/LocalLur.java
+++ b/core/src/main/java/com/att/cadi/lur/LocalLur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/lur/LocalPermission.java b/core/src/main/java/com/att/cadi/lur/LocalPermission.java
index 8fdaec2..b44f840 100644
--- a/core/src/main/java/com/att/cadi/lur/LocalPermission.java
+++ b/core/src/main/java/com/att/cadi/lur/LocalPermission.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/lur/NullLur.java b/core/src/main/java/com/att/cadi/lur/NullLur.java
index 91fb7bb..7b01f5a 100644
--- a/core/src/main/java/com/att/cadi/lur/NullLur.java
+++ b/core/src/main/java/com/att/cadi/lur/NullLur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java b/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
index 58f7d71..800628d 100644
--- a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java b/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
index 11bc22a..0d215a5 100644
--- a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java b/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
index 36c75b8..e3ccb42 100644
--- a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
+++ b/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java b/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
index 37c6a83..de1ebaf 100644
--- a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
index aa610d3..e2a6400 100644
--- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
index 97907ac..cfd8564 100644
--- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
+++ b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java b/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
index 67b76c6..744560f 100644
--- a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/principal/X509Principal.java b/core/src/main/java/com/att/cadi/principal/X509Principal.java
index 8e17033..89a8dc2 100644
--- a/core/src/main/java/com/att/cadi/principal/X509Principal.java
+++ b/core/src/main/java/com/att/cadi/principal/X509Principal.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java b/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
index 94d2e5d..f57b975 100644
--- a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/EpiTaf.java b/core/src/main/java/com/att/cadi/taf/EpiTaf.java
index d3f5493..613f317 100644
--- a/core/src/main/java/com/att/cadi/taf/EpiTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/EpiTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java b/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
index 7f6d9af..3036f07 100644
--- a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/HttpTaf.java b/core/src/main/java/com/att/cadi/taf/HttpTaf.java
index 4270a81..ad22872 100644
--- a/core/src/main/java/com/att/cadi/taf/HttpTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/HttpTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java b/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
index d9da3fa..8a6acad 100644
--- a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/NullTaf.java b/core/src/main/java/com/att/cadi/taf/NullTaf.java
index ec4a15b..0a6f4bb 100644
--- a/core/src/main/java/com/att/cadi/taf/NullTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/NullTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/NullTafResp.java b/core/src/main/java/com/att/cadi/taf/NullTafResp.java
index c95b195..8dcfc1e 100644
--- a/core/src/main/java/com/att/cadi/taf/NullTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/NullTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java b/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
index d9f9b67..8951145 100644
--- a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/Redirectable.java b/core/src/main/java/com/att/cadi/taf/Redirectable.java
index e83e7ce..4ef31bc 100644
--- a/core/src/main/java/com/att/cadi/taf/Redirectable.java
+++ b/core/src/main/java/com/att/cadi/taf/Redirectable.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/TafResp.java b/core/src/main/java/com/att/cadi/taf/TafResp.java
index 3a1a6f4..140ac13 100644
--- a/core/src/main/java/com/att/cadi/taf/TafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/TafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java b/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
index 127450c..29a299f 100644
--- a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java b/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
index 27c6034..25c665b 100644
--- a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
index 672c463..f954a00 100644
--- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
index c768587..1d43054 100644
--- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java b/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
index 6e46481..5d9624a 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
+++ b/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java b/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
index 3435d52..8148a4e 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java b/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
index cb93046..6bef245 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
+++ b/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
index 88a6721..6bb9252 100644
--- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
index 7cbbf73..1b4efed 100644
--- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
index 89500a6..67754a9 100644
--- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
index 29ddf92..2a074d1 100644
--- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/Chmod.java b/core/src/main/java/com/att/cadi/util/Chmod.java
index 9991616..ddde50b 100644
--- a/core/src/main/java/com/att/cadi/util/Chmod.java
+++ b/core/src/main/java/com/att/cadi/util/Chmod.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java b/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
index f85efa4..33deed0 100644
--- a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
+++ b/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/MaskFormatException.java b/core/src/main/java/com/att/cadi/util/MaskFormatException.java
index 7a8c773..fa3f220 100644
--- a/core/src/main/java/com/att/cadi/util/MaskFormatException.java
+++ b/core/src/main/java/com/att/cadi/util/MaskFormatException.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/MyConsole.java b/core/src/main/java/com/att/cadi/util/MyConsole.java
index eb148ee..4083dea 100644
--- a/core/src/main/java/com/att/cadi/util/MyConsole.java
+++ b/core/src/main/java/com/att/cadi/util/MyConsole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/NetMask.java b/core/src/main/java/com/att/cadi/util/NetMask.java
index befed88..9707047 100644
--- a/core/src/main/java/com/att/cadi/util/NetMask.java
+++ b/core/src/main/java/com/att/cadi/util/NetMask.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/Split.java b/core/src/main/java/com/att/cadi/util/Split.java
index 4a695fb..07332dd 100644
--- a/core/src/main/java/com/att/cadi/util/Split.java
+++ b/core/src/main/java/com/att/cadi/util/Split.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java b/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
index 3d57332..8a44568 100644
--- a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
+++ b/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/TheConsole.java b/core/src/main/java/com/att/cadi/util/TheConsole.java
index 60f3f79..05fcd9b 100644
--- a/core/src/main/java/com/att/cadi/util/TheConsole.java
+++ b/core/src/main/java/com/att/cadi/util/TheConsole.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/UserChainManip.java b/core/src/main/java/com/att/cadi/util/UserChainManip.java
index 89851aa..9f6eeec 100644
--- a/core/src/main/java/com/att/cadi/util/UserChainManip.java
+++ b/core/src/main/java/com/att/cadi/util/UserChainManip.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/util/Vars.java b/core/src/main/java/com/att/cadi/util/Vars.java
index b712e31..8d0b27e 100644
--- a/core/src/main/java/com/att/cadi/util/Vars.java
+++ b/core/src/main/java/com/att/cadi/util/Vars.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/wsse/Action.java b/core/src/main/java/com/att/cadi/wsse/Action.java
index a9b171c..0ed99c0 100644
--- a/core/src/main/java/com/att/cadi/wsse/Action.java
+++ b/core/src/main/java/com/att/cadi/wsse/Action.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/wsse/Match.java b/core/src/main/java/com/att/cadi/wsse/Match.java
index 657976a..e1c1078 100644
--- a/core/src/main/java/com/att/cadi/wsse/Match.java
+++ b/core/src/main/java/com/att/cadi/wsse/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/core/src/main/java/com/att/cadi/wsse/WSSEParser.java b/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
index dd8af4d..4c7ba90 100644
--- a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
+++ b/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/wsse/XEvent.java b/core/src/main/java/com/att/cadi/wsse/XEvent.java
index d023519..51a2734 100644
--- a/core/src/main/java/com/att/cadi/wsse/XEvent.java
+++ b/core/src/main/java/com/att/cadi/wsse/XEvent.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/com/att/cadi/wsse/XReader.java b/core/src/main/java/com/att/cadi/wsse/XReader.java
index 135b28c..833eb60 100644
--- a/core/src/main/java/com/att/cadi/wsse/XReader.java
+++ b/core/src/main/java/com/att/cadi/wsse/XReader.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/JU_AES.java b/core/src/test/java/com/att/cadi/JU_AES.java
index 2143e5b..fb2482a 100644
--- a/core/src/test/java/com/att/cadi/JU_AES.java
+++ b/core/src/test/java/com/att/cadi/JU_AES.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java b/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
index a4ada86..f11c74d 100644
--- a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
+++ b/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java b/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
index f8e911c..81d5092 100644
--- a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
+++ b/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_Base64.java b/core/src/test/java/com/att/cadi/test/JU_Base64.java
index fdafb84..1a82298 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Base64.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Base64.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java b/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
index c30d944..5f299bb 100644
--- a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
+++ b/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java b/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
index c3f6d77..5584911 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_Hash.java b/core/src/test/java/com/att/cadi/test/JU_Hash.java
index 85e4209..e5d2d6b 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Hash.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Hash.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_Passcode.java b/core/src/test/java/com/att/cadi/test/JU_Passcode.java
index 68c7dc8..122ecf7 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Passcode.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Passcode.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java b/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
index 40b9266..65f5ebd 100644
--- a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
+++ b/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/JU_Vars.java b/core/src/test/java/com/att/cadi/test/JU_Vars.java
index daf2c0f..e681622 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Vars.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Vars.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/test/Test.java b/core/src/test/java/com/att/cadi/test/Test.java
index 53729b4..4fe9111 100644
--- a/core/src/test/java/com/att/cadi/test/Test.java
+++ b/core/src/test/java/com/att/cadi/test/Test.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java b/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
index a262780..65338ae 100644
--- a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
+++ b/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java b/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
index 7f38d94..ee69561 100644
--- a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
+++ b/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
@@ -1,9 +1,8 @@
/*******************************************************************************
* ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
* * ===========================================================================
* * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
* * ===========================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.