Update project structure for aaf/cadi

Update project structure from com.att to org.onap and add distribution management and staging plugin. Issue-id: AAF-22 Change-Id: Idf2b591139e38921ad28782a51486714a05dee92 Signed-off-by: sg481n <sg481n@att.com>
author: sg481n <sg481n@att.com> 2017-08-25 01:57:24 -0400
committer: sg481n <sg481n@att.com> 2017-08-25 01:57:37 -0400
commit: 62c4eb45e157d502463d797c1353802ca8e1e307 (patch)
tree: f79566b55c2535fd4be51b52cb4e5cb258391114 /core/src
parent: a623b7658783e9a66f6131821de9447d58951cfe (diff)
115 files changed, 346 insertions, 352 deletions
diff --git a/core/src/main/java/com/att/cadi/AES.java b/core/src/main/java/org/onap/aaf/cadi/AES.java
index 7304932..515fc27 100644
--- a/core/src/main/java/com/att/cadi/AES.java
+++ b/core/src/main/java/org/onap/aaf/cadi/AES.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -41,7 +41,7 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
 
-import com.att.cadi.util.Chmod;
+import org.onap.aaf.cadi.util.Chmod;
 
 public class AES {
 	public static final String AES = AES.class.getSimpleName();
diff --git a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java
index f244d09..ceb6ca3 100644
--- a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 
 public abstract class AbsCachedPrincipal<TAF> implements CachedPrincipal {
diff --git a/core/src/main/java/com/att/cadi/AbsUserCache.java b/core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java
index d374faa..1846793 100644
--- a/core/src/main/java/com/att/cadi/AbsUserCache.java
+++ b/core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 
 import java.security.Principal;
@@ -32,8 +32,8 @@ import java.util.TimerTask;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
 
 /**
  * Implement Fast lookup and Cache for Local User Info
diff --git a/core/src/main/java/com/att/cadi/Access.java b/core/src/main/java/org/onap/aaf/cadi/Access.java
index 4c238ee..a8eeda1 100644
--- a/core/src/main/java/com/att/cadi/Access.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Access.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/main/java/com/att/cadi/BasicCred.java b/core/src/main/java/org/onap/aaf/cadi/BasicCred.java
index 6f0aff5..a645b83 100644
--- a/core/src/main/java/com/att/cadi/BasicCred.java
+++ b/core/src/main/java/org/onap/aaf/cadi/BasicCred.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 /**
  * An Interface for testing on Requests to see if we can get a User and Password
diff --git a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java b/core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java
index 74dd126..56d72aa 100644
--- a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
+++ b/core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java b/core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java
index 10e7b1f..345db91 100644
--- a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
+++ b/core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core/src/main/java/com/att/cadi/CachedPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java
index 3968f1b..de90b74 100644
--- a/core/src/main/java/com/att/cadi/CachedPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/com/att/cadi/CachingLur.java b/core/src/main/java/org/onap/aaf/cadi/CachingLur.java
index ee87431..f57a567 100644
--- a/core/src/main/java/com/att/cadi/CachingLur.java
+++ b/core/src/main/java/org/onap/aaf/cadi/CachingLur.java
@@ -20,11 +20,11 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.security.Principal;
 
-import com.att.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
 
 
 public interface CachingLur<PERM extends Permission> extends Lur {
diff --git a/core/src/main/java/com/att/cadi/CadiException.java b/core/src/main/java/org/onap/aaf/cadi/CadiException.java
index 66b7b5b..f8b06ce 100644
--- a/core/src/main/java/com/att/cadi/CadiException.java
+++ b/core/src/main/java/org/onap/aaf/cadi/CadiException.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 /**
  * CADI Specific Exception
diff --git a/core/src/main/java/com/att/cadi/CadiWrap.java b/core/src/main/java/org/onap/aaf/cadi/CadiWrap.java
index 64c565f..6cf5694 100644
--- a/core/src/main/java/com/att/cadi/CadiWrap.java
+++ b/core/src/main/java/org/onap/aaf/cadi/CadiWrap.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.security.Principal;
 import java.util.ArrayList;
@@ -29,11 +29,11 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
-import com.att.cadi.Access.Level;
-import com.att.cadi.filter.NullPermConverter;
-import com.att.cadi.filter.PermConverter;
-import com.att.cadi.lur.EpiLur;
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.filter.NullPermConverter;
+import org.onap.aaf.cadi.filter.PermConverter;
+import org.onap.aaf.cadi.lur.EpiLur;
+import org.onap.aaf.cadi.taf.TafResp;
 
 
 
diff --git a/core/src/main/java/com/att/cadi/Capacitor.java b/core/src/main/java/org/onap/aaf/cadi/Capacitor.java
index 73fd83c..a7aa4f6 100644
--- a/core/src/main/java/com/att/cadi/Capacitor.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Capacitor.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
diff --git a/core/src/main/java/com/att/cadi/CmdLine.java b/core/src/main/java/org/onap/aaf/cadi/CmdLine.java
index 89685e2..b387c7a 100644
--- a/core/src/main/java/com/att/cadi/CmdLine.java
+++ b/core/src/main/java/org/onap/aaf/cadi/CmdLine.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -33,8 +33,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.NoSuchAlgorithmException;
 
-import com.att.cadi.util.Chmod;
-import com.att.cadi.util.JsonOutputStream;
+import org.onap.aaf.cadi.util.Chmod;
+import org.onap.aaf.cadi.util.JsonOutputStream;
 
 
 
diff --git a/core/src/main/java/com/att/cadi/Connector.java b/core/src/main/java/org/onap/aaf/cadi/Connector.java
index ab96010..0a55b0d 100644
--- a/core/src/main/java/com/att/cadi/Connector.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Connector.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 public interface Connector {
 	public Lur newLur() throws CadiException;
diff --git a/core/src/main/java/com/att/cadi/CredVal.java b/core/src/main/java/org/onap/aaf/cadi/CredVal.java
index 4fe0a28..324746b 100644
--- a/core/src/main/java/com/att/cadi/CredVal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/CredVal.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/GetCred.java b/core/src/main/java/org/onap/aaf/cadi/GetCred.java
index d2c99f2..c0917a5 100644
--- a/core/src/main/java/com/att/cadi/GetCred.java
+++ b/core/src/main/java/org/onap/aaf/cadi/GetCred.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 public interface GetCred {
 	byte[] getCred();
diff --git a/core/src/main/java/com/att/cadi/Hash.java b/core/src/main/java/org/onap/aaf/cadi/Hash.java
index b4e114f..9d8719a 100644
--- a/core/src/main/java/com/att/cadi/Hash.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Hash.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
diff --git a/core/src/main/java/com/att/cadi/Locator.java b/core/src/main/java/org/onap/aaf/cadi/Locator.java
index ab1a7f9..05b6442 100644
--- a/core/src/main/java/com/att/cadi/Locator.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Locator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 public interface Locator<T> {
 	public T get(Locator.Item item) throws LocatorException;
diff --git a/core/src/main/java/com/att/cadi/LocatorException.java b/core/src/main/java/org/onap/aaf/cadi/LocatorException.java
index 9c3b804..43127ec 100644
--- a/core/src/main/java/com/att/cadi/LocatorException.java
+++ b/core/src/main/java/org/onap/aaf/cadi/LocatorException.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 public class LocatorException extends Exception {
 	/**
diff --git a/core/src/main/java/com/att/cadi/Lur.java b/core/src/main/java/org/onap/aaf/cadi/Lur.java
index d8ae6a3..afbf2dd 100644
--- a/core/src/main/java/com/att/cadi/Lur.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Lur.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.security.Principal;
 import java.util.List;
diff --git a/core/src/main/java/com/att/cadi/Permission.java b/core/src/main/java/org/onap/aaf/cadi/Permission.java
index adb80a1..ac0ec46 100644
--- a/core/src/main/java/com/att/cadi/Permission.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Permission.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 public interface Permission {
 	public String permType();
diff --git a/core/src/main/java/com/att/cadi/PropAccess.java b/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
index d7c9d99..d866e85 100644
--- a/core/src/main/java/com/att/cadi/PropAccess.java
+++ b/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,10 +32,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Properties;
 
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfo;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfo;
+
+import java.util.Properties;
 
 public class PropAccess implements Access {
 	private static final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
diff --git a/core/src/main/java/com/att/cadi/Revalidator.java b/core/src/main/java/org/onap/aaf/cadi/Revalidator.java
index 5d492aa..68b2661 100644
--- a/core/src/main/java/com/att/cadi/Revalidator.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Revalidator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 
 public interface Revalidator<TRANS> {
diff --git a/core/src/main/java/com/att/cadi/SLF4JAccess.java b/core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java
index b222e35..33b7050 100644
--- a/core/src/main/java/com/att/cadi/SLF4JAccess.java
+++ b/core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.util.Properties;
 
diff --git a/core/src/main/java/com/att/cadi/SecuritySetter.java b/core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java
index 295148f..88c45b0 100644
--- a/core/src/main/java/com/att/cadi/SecuritySetter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/ServletContextAccess.java b/core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java
index 2d1cfa1..6c288d5 100644
--- a/core/src/main/java/com/att/cadi/ServletContextAccess.java
+++ b/core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 import java.util.Enumeration;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
 
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.config.Config;
 
 public class ServletContextAccess extends PropAccess {
 
diff --git a/core/src/main/java/com/att/cadi/StrLur.java b/core/src/main/java/org/onap/aaf/cadi/StrLur.java
index f191203..1a86c8e 100644
--- a/core/src/main/java/com/att/cadi/StrLur.java
+++ b/core/src/main/java/org/onap/aaf/cadi/StrLur.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/att/cadi/Symm.java b/core/src/main/java/org/onap/aaf/cadi/Symm.java
index 1504c2d..beb0c40 100644
--- a/core/src/main/java/com/att/cadi/Symm.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Symm.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -38,8 +38,8 @@ import java.util.Random;
 import javax.crypto.CipherInputStream;
 import javax.crypto.CipherOutputStream;
 
-import com.att.cadi.Access.Level;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
 
 /**
  * Key Conversion, primarily "Base64"
diff --git a/core/src/main/java/com/att/cadi/Taf.java b/core/src/main/java/org/onap/aaf/cadi/Taf.java
index 4017866..d4b2211 100644
--- a/core/src/main/java/com/att/cadi/Taf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Taf.java
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/Transmutate.java b/core/src/main/java/org/onap/aaf/cadi/Transmutate.java
index 1d6ff6f..950f28f 100644
--- a/core/src/main/java/com/att/cadi/Transmutate.java
+++ b/core/src/main/java/org/onap/aaf/cadi/Transmutate.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/com/att/cadi/TrustChecker.java b/core/src/main/java/org/onap/aaf/cadi/TrustChecker.java
index 60b9a17..feade74 100644
--- a/core/src/main/java/com/att/cadi/TrustChecker.java
+++ b/core/src/main/java/org/onap/aaf/cadi/TrustChecker.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp;
 
 /**
  * Change to another Principal based on Trust of caller and User Chain (if desired)
diff --git a/core/src/main/java/com/att/cadi/User.java b/core/src/main/java/org/onap/aaf/cadi/User.java
index bde3488..372e9bc 100644
--- a/core/src/main/java/com/att/cadi/User.java
+++ b/core/src/main/java/org/onap/aaf/cadi/User.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.security.Principal;
 import java.util.HashMap;
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.att.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.lur.LocalPermission;
 
 /**
  * Class to hold info from the User Perspective.
diff --git a/core/src/main/java/com/att/cadi/UserChain.java b/core/src/main/java/org/onap/aaf/cadi/UserChain.java
index df493c5..ac04792 100644
--- a/core/src/main/java/com/att/cadi/UserChain.java
+++ b/core/src/main/java/org/onap/aaf/cadi/UserChain.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 /**
  * Interface to add a User Chain String to Principal
diff --git a/core/src/main/java/com/att/cadi/config/Config.java b/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index ada6117..4128665 100644
--- a/core/src/main/java/com/att/cadi/config/Config.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -34,29 +34,30 @@ import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
+
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachingLur;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CredVal;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.TrustChecker;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.lur.EpiLur;
+import org.onap.aaf.cadi.lur.LocalLur;
+import org.onap.aaf.cadi.lur.NullLur;
+import org.onap.aaf.cadi.taf.HttpEpiTaf;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.basic.BasicHttpTaf;
+import org.onap.aaf.cadi.taf.cert.X509Taf;
+import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf;
+
 import java.util.Properties;
 import java.util.TimerTask;
 
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachingLur;
-import com.att.cadi.CadiException;
-import com.att.cadi.CredVal;
-import com.att.cadi.Locator;
-import com.att.cadi.Lur;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Symm;
-import com.att.cadi.TrustChecker;
-import com.att.cadi.lur.EpiLur;
-import com.att.cadi.lur.LocalLur;
-import com.att.cadi.lur.NullLur;
-import com.att.cadi.taf.HttpEpiTaf;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.basic.BasicHttpTaf;
-import com.att.cadi.taf.cert.X509Taf;
-import com.att.cadi.taf.dos.DenialOfServiceTaf;
-
 /**
  * Create a Consistent Configuration mechanism, even when configuration styles are as vastly different as
  * Properties vs JavaBeans vs FilterConfigs...
diff --git a/core/src/main/java/com/att/cadi/config/Get.java b/core/src/main/java/org/onap/aaf/cadi/config/Get.java
index 7a2eab5..ea06c87 100644
--- a/core/src/main/java/com/att/cadi/config/Get.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/Get.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
 import java.lang.reflect.Method;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
 
 public interface Get {
 	public String get(String name, String def, boolean print);
diff --git a/core/src/main/java/com/att/cadi/config/GetAccess.java b/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
index 1df9b0e..dc5e4ef 100644
--- a/core/src/main/java/com/att/cadi/config/GetAccess.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
-import com.att.cadi.PropAccess;
+import org.onap.aaf.cadi.PropAccess;
 
 public class GetAccess extends PropAccess {
 	private final Get getter;
diff --git a/core/src/main/java/com/att/cadi/config/MultiGet.java b/core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java
index 83cd21d..551018c 100644
--- a/core/src/main/java/com/att/cadi/config/MultiGet.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
 public class MultiGet implements Get {
     private Get[] getters;
diff --git a/core/src/main/java/com/att/cadi/config/SecurityInfo.java b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java
index 6d0f3c2..4301d53 100644
--- a/core/src/main/java/com/att/cadi/config/SecurityInfo.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -46,10 +46,10 @@ import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.util.MaskFormatException;
-import com.att.cadi.util.NetMask;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.util.MaskFormatException;
+import org.onap.aaf.cadi.util.NetMask;
 
 public class SecurityInfo {
 	private static final String SECURITY_ALGO = "RSA";
diff --git a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
index 2b0ec43..e631928 100644
--- a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
-import com.att.cadi.Access;
-import com.att.cadi.SecuritySetter;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.SecuritySetter;
 
 
 public class SecurityInfoC<CLIENT> extends SecurityInfo {
diff --git a/core/src/main/java/com/att/cadi/config/UsersDump.java b/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
index 992b365..e0893e6 100644
--- a/core/src/main/java/com/att/cadi/config/UsersDump.java
+++ b/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.config;
+package org.onap.aaf.cadi.config;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -32,8 +32,8 @@ import java.io.PrintStream;
 import java.util.Date;
 import java.util.HashSet;
 
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.lur.LocalLur;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.lur.LocalLur;
 
 public class UsersDump {
 
diff --git a/core/src/main/java/com/att/cadi/filter/AUTHZ.java b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java
index ab32a98..49a1634 100644
--- a/core/src/main/java/com/att/cadi/filter/AUTHZ.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java
index c1ad627..871dee3 100644
--- a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/com/att/cadi/filter/AccessGetter.java b/core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java
index 37d2c04..596afd2 100644
--- a/core/src/main/java/com/att/cadi/filter/AccessGetter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java
@@ -20,10 +20,10 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
-import com.att.cadi.Access;
-import com.att.cadi.config.Get;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.config.Get;
 
 public class AccessGetter implements Get {
 	private final Access access;
diff --git a/core/src/main/java/com/att/cadi/filter/CadiAccess.java b/core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java
index e9bc5a8..2ccd29a 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiAccess.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -31,10 +31,10 @@ import java.util.Properties;
 
 import javax.servlet.ServletContext;
 
-import com.att.cadi.Access;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.Get;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.Get;
 
 public class CadiAccess implements Access {
 	// constants for a couple of very commonly used strings.
diff --git a/core/src/main/java/com/att/cadi/filter/CadiFilter.java b/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
index da24f44..0b8bb8f 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiFilter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -36,18 +36,18 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CadiException;
-import com.att.cadi.CadiWrap;
-import com.att.cadi.Lur;
-import com.att.cadi.PropAccess;
-import com.att.cadi.ServletContextAccess;
-import com.att.cadi.TrustChecker;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.Get;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CadiWrap;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.ServletContextAccess;
+import org.onap.aaf.cadi.TrustChecker;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.Get;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
 
 /**
  * CadiFilter
diff --git a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java b/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
index 6969b8c..a3df1c0 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,20 +29,20 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CadiException;
-import com.att.cadi.CadiWrap;
-import com.att.cadi.Connector;
-import com.att.cadi.CredVal;
-import com.att.cadi.Lur;
-import com.att.cadi.Taf;
-import com.att.cadi.TrustChecker;
-import com.att.cadi.config.Config;
-import com.att.cadi.lur.EpiLur;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.util.UserChainManip;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CadiWrap;
+import org.onap.aaf.cadi.Connector;
+import org.onap.aaf.cadi.CredVal;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.Taf;
+import org.onap.aaf.cadi.TrustChecker;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.lur.EpiLur;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.util.UserChainManip;
 
 /**
  * Encapsulate common HTTP Manipulation Behavior.  It will appropriately set
diff --git a/core/src/main/java/com/att/cadi/filter/FCGet.java b/core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java
index b8f95da..e6912e7 100644
--- a/core/src/main/java/com/att/cadi/filter/FCGet.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java
@@ -20,14 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.config.Get;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Get;
 
 /*
  * A private method to query the Filter config and if not exists, return the default.  This
diff --git a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java b/core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java
index 09b6f93..933e6f9 100644
--- a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java b/core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java
index d73008e..223e1a4 100644
--- a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/filter/PathFilter.java b/core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java
index 328977d..87e3c78 100644
--- a/core/src/main/java/com/att/cadi/filter/PathFilter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 import java.io.IOException;
 
@@ -34,9 +34,9 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
 
 /**
  * PathFilter
diff --git a/core/src/main/java/com/att/cadi/filter/PermConverter.java b/core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java
index ba098c4..8f71e29 100644
--- a/core/src/main/java/com/att/cadi/filter/PermConverter.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 
 /**
  * Convert a simplistic, single string Permission into an Enterprise Scoped Perm
diff --git a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java b/core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java
index 97a8f54..0a5873e 100644
--- a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java
@@ -31,7 +31,7 @@
  * POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation
  * 
  */
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
diff --git a/core/src/main/java/com/att/cadi/filter/ServletImpl.java b/core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java
index 13a251c..f581c5f 100644
--- a/core/src/main/java/com/att/cadi/filter/ServletImpl.java
+++ b/core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java
@@ -31,7 +31,7 @@
  * POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation
  * 
  */
-package com.att.cadi.filter;
+package org.onap.aaf.cadi.filter;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
diff --git a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java
index 443d7e7..32e4816 100644
--- a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur;
+package org.onap.aaf.cadi.lur;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.GetCred;
-import com.att.cadi.Symm;
+import org.onap.aaf.cadi.GetCred;
+import org.onap.aaf.cadi.Symm;
 
 public class ConfigPrincipal implements Principal, GetCred {
 	private String name;
diff --git a/core/src/main/java/com/att/cadi/lur/EpiLur.java b/core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java
index 1eff70e..0e612e9 100644
--- a/core/src/main/java/com/att/cadi/lur/EpiLur.java
+++ b/core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java
@@ -20,16 +20,16 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur;
+package org.onap.aaf.cadi.lur;
 
 import java.security.Principal;
 import java.util.List;
 
-import com.att.cadi.CachingLur;
-import com.att.cadi.CadiException;
-import com.att.cadi.CredVal;
-import com.att.cadi.Lur;
-import com.att.cadi.Permission;
+import org.onap.aaf.cadi.CachingLur;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CredVal;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.Permission;
 
 /**
  * EpiLUR
diff --git a/core/src/main/java/com/att/cadi/lur/LocalLur.java b/core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java
index 5980769..4086b51 100644
--- a/core/src/main/java/com/att/cadi/lur/LocalLur.java
+++ b/core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur;
+package org.onap.aaf.cadi.lur;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -29,15 +29,15 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CredVal;
-import com.att.cadi.Hash;
-import com.att.cadi.Permission;
-import com.att.cadi.StrLur;
-import com.att.cadi.User;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CredVal;
+import org.onap.aaf.cadi.Hash;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.StrLur;
+import org.onap.aaf.cadi.User;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/lur/LocalPermission.java b/core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java
index b44f840..cccb74c 100644
--- a/core/src/main/java/com/att/cadi/lur/LocalPermission.java
+++ b/core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur;
+package org.onap.aaf.cadi.lur;
 
-import com.att.cadi.Permission;
+import org.onap.aaf.cadi.Permission;
 
 public class LocalPermission implements Permission {
 	private String key;
diff --git a/core/src/main/java/com/att/cadi/lur/NullLur.java b/core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java
index 7b01f5a..94080df 100644
--- a/core/src/main/java/com/att/cadi/lur/NullLur.java
+++ b/core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur;
+package org.onap.aaf.cadi.lur;
 
 import java.security.Principal;
 import java.util.List;
 
-import com.att.cadi.Lur;
-import com.att.cadi.Permission;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.Permission;
 
 public class NullLur implements Lur {
 	private static final Permission NULL = new Permission() {
diff --git a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java
index 800628d..e84caeb 100644
--- a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,9 +28,9 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Date;
 
-import com.att.cadi.BasicCred;
-import com.att.cadi.GetCred;
-import com.att.cadi.Symm;
+import org.onap.aaf.cadi.BasicCred;
+import org.onap.aaf.cadi.GetCred;
+import org.onap.aaf.cadi.Symm;
 
 public class BasicPrincipal extends BearerPrincipal implements GetCred {
 	private static byte[] basic = "Basic ".getBytes();
diff --git a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java
index 0d215a5..08793c5 100644
--- a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java b/core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java
index e3ccb42..3694584 100644
--- a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java
index de1ebaf..9a33dc6 100644
--- a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.io.IOException;
 
-import com.att.cadi.BasicCred;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.BasicCred;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.taf.HttpTaf;
 
 /**
  * Cached Principals need to be able to revalidate in the Background
diff --git a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java
index e2a6400..b55f86a 100644
--- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 public class TGuardPrincipal extends BearerPrincipal {
 
diff --git a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java
index cfd8564..235c74c 100644
--- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.security.Principal;
 
diff --git a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java
index 744560f..4add242 100644
--- a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java
@@ -20,11 +20,11 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.security.Principal;
 
-import com.att.cadi.UserChain;
+import org.onap.aaf.cadi.UserChain;
 
 public class TrustPrincipal extends BearerPrincipal implements UserChain {
 	private final String name;
diff --git a/core/src/main/java/com/att/cadi/principal/X509Principal.java b/core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java
index 89a8dc2..2f3fd28 100644
--- a/core/src/main/java/com/att/cadi/principal/X509Principal.java
+++ b/core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java
@@ -20,14 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.principal;
+package org.onap.aaf.cadi.principal;
 
 import java.io.IOException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.regex.Pattern;
 
-import com.att.cadi.GetCred;
+import org.onap.aaf.cadi.GetCred;
 
 public class X509Principal extends BearerPrincipal implements GetCred {
 	private static final Pattern pattern = Pattern.compile("[a-zA-Z0-9]*\\@[a-zA-Z0-9.]*");
diff --git a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java
index f57b975..6a7f15e 100644
--- a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java
@@ -20,11 +20,11 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.security.Principal;
 
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.Access;
 
 /**
  * AbsTafResp
diff --git a/core/src/main/java/com/att/cadi/taf/EpiTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java
index 613f317..7cb40ed 100644
--- a/core/src/main/java/com/att/cadi/taf/EpiTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java
@@ -20,10 +20,10 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
-import com.att.cadi.CadiException;
-import com.att.cadi.Taf;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Taf;
 
 /**
  * EpiTAF
diff --git a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
index 3036f07..05832f7 100644
--- a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.net.URI;
 import java.security.Principal;
@@ -30,13 +30,13 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.CadiException;
-import com.att.cadi.Locator;
-import com.att.cadi.Taf.LifeForm;
-import com.att.cadi.TrustChecker;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.TrustChecker;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.Taf.LifeForm;
 
 /**
  * HttpEpiTaf
diff --git a/core/src/main/java/com/att/cadi/taf/HttpTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java
index ad22872..325de6a 100644
--- a/core/src/main/java/com/att/cadi/taf/HttpTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.Taf.LifeForm;
 
 /**
  * A TAF which is in a specific HTTP environment in which the engine implements 
diff --git a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
index 8a6acad..b6bb385 100644
--- a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.io.IOException;
 import java.net.URI;
@@ -28,10 +28,10 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.Locator;
-import com.att.cadi.Locator.Item;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.Locator.Item;
 
 public class LoginPageTafResp extends AbsTafResp {
 	private final HttpServletResponse httpResp;
diff --git a/core/src/main/java/com/att/cadi/taf/NullTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java
index 0a6f4bb..fb1b930 100644
--- a/core/src/main/java/com/att/cadi/taf/NullTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java
@@ -20,14 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.Taf;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.Taf;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/taf/NullTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java
index 8dcfc1e..97e49e0 100644
--- a/core/src/main/java/com/att/cadi/taf/NullTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.Access;
 
 /**
  * A Null Pattern for setting responses to "Deny" before configuration is setup.
diff --git a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java
index 8951145..10c401a 100644
--- a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.Access;
 
 /**
  * A Punt Resp to make it fast and easy for a Taf to respond that it cannot handle a particular kind of
diff --git a/core/src/main/java/com/att/cadi/taf/Redirectable.java b/core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java
index 4ef31bc..6e20bab 100644
--- a/core/src/main/java/com/att/cadi/taf/Redirectable.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 public interface Redirectable extends TafResp {
 	/**
diff --git a/core/src/main/java/com/att/cadi/taf/TafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java
index 140ac13..cb0915a 100644
--- a/core/src/main/java/com/att/cadi/taf/TafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.Access;
-import com.att.cadi.CadiException;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CadiException;
 
 /**
  * Response from Taf objects, which inform users what has happened and/or what should be done
diff --git a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java
index 29a299f..2ab4a62 100644
--- a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.Access;
 
 public class TrustNotTafResp implements TafResp {
 	private final TafResp delegate;
diff --git a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java
index 25c665b..cd4c92f 100644
--- a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf;
+package org.onap.aaf.cadi.taf;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.Access;
 
 public class TrustTafResp implements TafResp {
 	private final TafResp delegate;
diff --git a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
index f954a00..f6cc3a7 100644
--- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.basic;
+package org.onap.aaf.cadi.taf.basic;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -28,20 +28,20 @@ import java.security.Principal;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.BasicCred;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.CredVal;
-import com.att.cadi.CredVal.Type;
-import com.att.cadi.Taf;
-import com.att.cadi.principal.BasicPrincipal;
-import com.att.cadi.principal.CachedBasicPrincipal;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TafResp.RESP;
-import com.att.cadi.taf.dos.DenialOfServiceTaf;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.BasicCred;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.CredVal;
+import org.onap.aaf.cadi.Taf;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.CredVal.Type;
+import org.onap.aaf.cadi.principal.BasicPrincipal;
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf;
 
 /**
  * BasicHttpTaf
diff --git a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java
index 1d43054..45eab48 100644
--- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java
@@ -20,16 +20,16 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.basic;
+package org.onap.aaf.cadi.taf.basic;
 
 import java.io.IOException;
 import java.security.Principal;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.taf.AbsTafResp;
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.taf.AbsTafResp;
+import org.onap.aaf.cadi.taf.TafResp;
 
 public class BasicHttpTafResp extends AbsTafResp implements TafResp {
 	private HttpServletResponse httpResp;
diff --git a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java b/core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java
index 5d9624a..1d84d67 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.cert;
+package org.onap.aaf.cadi.taf.cert;
 
 import java.security.Principal;
 import java.security.cert.CertificateException;
diff --git a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java
index 8148a4e..f301fc2 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java
@@ -20,14 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.cert;
+package org.onap.aaf.cadi.taf.cert;
 
 import java.io.IOException;
 import java.security.Principal;
 
-import com.att.cadi.Access;
-import com.att.cadi.taf.AbsTafResp;
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.taf.AbsTafResp;
+import org.onap.aaf.cadi.taf.TafResp;
 
 public class X509HttpTafResp extends AbsTafResp implements TafResp {
 	private RESP status;
diff --git a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java
index 6bef245..36217cc 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.cert;
+package org.onap.aaf.cadi.taf.cert;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,24 +39,24 @@ import javax.net.ssl.TrustManagerFactory;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.CadiException;
-import com.att.cadi.Lur;
-import com.att.cadi.Symm;
-import com.att.cadi.Taf.LifeForm;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.config.SecurityInfo;
-import com.att.cadi.lur.LocalPermission;
-import com.att.cadi.principal.TGuardPrincipal;
-import com.att.cadi.principal.X509Principal;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TafResp.RESP;
-import com.att.cadi.util.Split;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfo;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.principal.TGuardPrincipal;
+import org.onap.aaf.cadi.principal.X509Principal;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.util.Split;
 
 public class X509Taf implements HttpTaf {
 	
diff --git a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java
index 6bb9252..c55b7eb 100644
--- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.dos;
+package org.onap.aaf.cadi.taf.dos;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -37,15 +37,15 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.CadiException;
-import com.att.cadi.Taf.LifeForm;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.PuntTafResp;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.PuntTafResp;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
 
 public class DenialOfServiceTaf implements HttpTaf {
 	private static Map<String, Counter> deniedIP=null, deniedID=null;
diff --git a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java
index 1b4efed..ac6c01a 100644
--- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.dos;
+package org.onap.aaf.cadi.taf.dos;
 
 import java.io.IOException;
 
-import com.att.cadi.Access;
-import com.att.cadi.taf.AbsTafResp;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.taf.AbsTafResp;
 
 public class DenialOfServiceTafResp extends AbsTafResp  {
 	private RESP ect;  // Homage to Arethra Franklin
diff --git a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java
index 67754a9..af9554f 100644
--- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.localhost;
+package org.onap.aaf.cadi.taf.localhost;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -32,14 +32,14 @@ import java.util.TreeSet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.Taf;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.Taf;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
 
 /**
  * Implement the ability to utilize LocalHost as a TAF.
diff --git a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java
index 2a074d1..bda5484 100644
--- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
+++ b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.taf.localhost;
+package org.onap.aaf.cadi.taf.localhost;
 
 import java.security.Principal;
 
-import com.att.cadi.Access;
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.taf.TafResp;
 
 public class LocalhostTafResp implements TafResp {
 	private RESP action;
diff --git a/core/src/main/java/com/att/cadi/util/Chmod.java b/core/src/main/java/org/onap/aaf/cadi/util/Chmod.java
index ddde50b..f999a11 100644
--- a/core/src/main/java/com/att/cadi/util/Chmod.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/Chmod.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java b/core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java
index 33deed0..546292e 100644
--- a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/core/src/main/java/com/att/cadi/util/MaskFormatException.java b/core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java
index fa3f220..551eae9 100644
--- a/core/src/main/java/com/att/cadi/util/MaskFormatException.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 @SuppressWarnings("serial")
 public class MaskFormatException extends Exception {
diff --git a/core/src/main/java/com/att/cadi/util/MyConsole.java b/core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java
index 4083dea..de1c882 100644
--- a/core/src/main/java/com/att/cadi/util/MyConsole.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 public interface MyConsole {
 	public String readLine(String fmt, Object ... args);
diff --git a/core/src/main/java/com/att/cadi/util/NetMask.java b/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
index 9707047..b19f150 100644
--- a/core/src/main/java/com/att/cadi/util/NetMask.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 /* 
  * NetMask - a class to quickly validate whether a given IP is part of a mask, as defined by bytes or standard String format.
diff --git a/core/src/main/java/com/att/cadi/util/Split.java b/core/src/main/java/org/onap/aaf/cadi/util/Split.java
index 07332dd..c3b37dc 100644
--- a/core/src/main/java/com/att/cadi/util/Split.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/Split.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 /**
  * Split by Char, optional Trim
diff --git a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java b/core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java
index 8a44568..b2a29e6 100644
--- a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/core/src/main/java/com/att/cadi/util/TheConsole.java b/core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java
index 05fcd9b..3a6b291 100644
--- a/core/src/main/java/com/att/cadi/util/TheConsole.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 public class TheConsole implements MyConsole {
 	@Override
diff --git a/core/src/main/java/com/att/cadi/util/UserChainManip.java b/core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java
index 9f6eeec..5f945f3 100644
--- a/core/src/main/java/com/att/cadi/util/UserChainManip.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java
@@ -20,9 +20,9 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
-import com.att.cadi.UserChain;
+import org.onap.aaf.cadi.UserChain;
 
 public class UserChainManip {
 	/** 
diff --git a/core/src/main/java/com/att/cadi/util/Vars.java b/core/src/main/java/org/onap/aaf/cadi/util/Vars.java
index 8d0b27e..af8cf86 100644
--- a/core/src/main/java/com/att/cadi/util/Vars.java
+++ b/core/src/main/java/org/onap/aaf/cadi/util/Vars.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.util;
+package org.onap.aaf.cadi.util;
 
 import java.util.List;
 
diff --git a/core/src/main/java/com/att/cadi/wsse/Action.java b/core/src/main/java/org/onap/aaf/cadi/wsse/Action.java
index 0ed99c0..e95337f 100644
--- a/core/src/main/java/com/att/cadi/wsse/Action.java
+++ b/core/src/main/java/org/onap/aaf/cadi/wsse/Action.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse;
+package org.onap.aaf.cadi.wsse;
 
 /**
  * Interface to specify an action deep within a parsing tree on a local object
diff --git a/core/src/main/java/com/att/cadi/wsse/Match.java b/core/src/main/java/org/onap/aaf/cadi/wsse/Match.java
index e1c1078..bffe447 100644
--- a/core/src/main/java/com/att/cadi/wsse/Match.java
+++ b/core/src/main/java/org/onap/aaf/cadi/wsse/Match.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse;
+package org.onap.aaf.cadi.wsse;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
diff --git a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java b/core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java
index 4c7ba90..760020a 100644
--- a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
+++ b/core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java
@@ -20,14 +20,14 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse;
+package org.onap.aaf.cadi.wsse;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import javax.xml.stream.XMLStreamException;
 
-import com.att.cadi.BasicCred;
+import org.onap.aaf.cadi.BasicCred;
 
 
 /**
diff --git a/core/src/main/java/com/att/cadi/wsse/XEvent.java b/core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java
index 51a2734..e5af256 100644
--- a/core/src/main/java/com/att/cadi/wsse/XEvent.java
+++ b/core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse;
+package org.onap.aaf.cadi.wsse;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.events.XMLEvent;
diff --git a/core/src/main/java/com/att/cadi/wsse/XReader.java b/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
index 833eb60..8fa8113 100644
--- a/core/src/main/java/com/att/cadi/wsse/XReader.java
+++ b/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse;
+package org.onap.aaf.cadi.wsse;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/core/src/test/java/com/att/cadi/JU_AES.java b/core/src/test/java/org/onap/aaf/cadi/JU_AES.java
index fb2482a..11e40a6 100644
--- a/core/src/test/java/com/att/cadi/JU_AES.java
+++ b/core/src/test/java/org/onap/aaf/cadi/JU_AES.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi;
+package org.onap.aaf.cadi;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,6 +29,8 @@ import javax.crypto.CipherInputStream;
 import javax.crypto.CipherOutputStream;
 
 import org.junit.Test;
+import org.onap.aaf.cadi.AES;
+import org.onap.aaf.cadi.Symm;
 
 import junit.framework.Assert;
 
diff --git a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
index f11c74d..f050a6b 100644
--- a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
+++ b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.test;
+package org.onap.aaf.cadi.lur.test;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
@@ -35,15 +35,14 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.junit.Test;
-
-import com.att.cadi.CredVal.Type;
-import com.att.cadi.Lur;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Symm;
-import com.att.cadi.config.UsersDump;
-import com.att.cadi.lur.LocalLur;
-import com.att.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.CredVal.Type;
+import org.onap.aaf.cadi.config.UsersDump;
+import org.onap.aaf.cadi.lur.LocalLur;
+import org.onap.aaf.cadi.lur.LocalPermission;
 
 public class JU_LocalLur {
 
diff --git a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java b/core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java
index 81d5092..8b1bab6 100644
--- a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
+++ b/core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java
@@ -20,13 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.test;
+package org.onap.aaf.cadi.lur.test;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.att.cadi.Access;
-import com.att.cadi.Symm;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Symm;
 
 public class TestAccess implements Access {
 	private Symm symm;
diff --git a/core/src/test/java/com/att/cadi/test/JU_Base64.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java
index 1a82298..4d49c92 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Base64.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -30,9 +30,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.SecureRandom;
 import org.junit.Test;
-
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.config.Config;
 
 
 public class JU_Base64 {
diff --git a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java
index 5f299bb..e496076 100644
--- a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import static junit.framework.Assert.assertEquals;
 
@@ -29,8 +29,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 
 import org.junit.Test;
-
-import com.att.cadi.BufferedServletInputStream;
+import org.onap.aaf.cadi.BufferedServletInputStream;
 
 public class JU_BufferedServletInputStream {
 
diff --git a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java
index 5584911..9d11fe4 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java
@@ -20,13 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import static junit.framework.Assert.assertEquals;
 
 import org.junit.Test;
-
-import com.att.cadi.Capacitor;
+import org.onap.aaf.cadi.Capacitor;
 
 public class JU_Capacitor {
 	@Test
diff --git a/core/src/test/java/com/att/cadi/test/JU_Hash.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java
index e5d2d6b..92dd297 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Hash.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java
@@ -20,12 +20,11 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import org.junit.Test;
-
-import com.att.cadi.CadiException;
-import com.att.cadi.Hash;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Hash;
 
 import junit.framework.Assert;
 
diff --git a/core/src/test/java/com/att/cadi/test/JU_Passcode.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java
index 122ecf7..40ceaa1 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Passcode.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java
@@ -20,16 +20,15 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 
 import org.junit.Test;
-
-import com.att.cadi.CmdLine;
-import com.att.cadi.Symm;
+import org.onap.aaf.cadi.CmdLine;
+import org.onap.aaf.cadi.Symm;
 
 import junit.framework.Assert;
 
diff --git a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java
index 65f5ebd..397b4b1 100644
--- a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java
@@ -20,13 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-
-import com.att.cadi.util.UserChainManip;
+import org.onap.aaf.cadi.util.UserChainManip;
 
 public class JU_UserChainManip {
 
diff --git a/core/src/test/java/com/att/cadi/test/JU_Vars.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java
index e681622..47209cd 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Vars.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java
@@ -20,14 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.AfterClass;
 import org.junit.Test;
-
-import com.att.cadi.util.Vars;
+import org.onap.aaf.cadi.util.Vars;
 
 public class JU_Vars {
 
diff --git a/core/src/test/java/com/att/cadi/test/Test.java b/core/src/test/java/org/onap/aaf/cadi/test/Test.java
index 4fe9111..ad0c517 100644
--- a/core/src/test/java/com/att/cadi/test/Test.java
+++ b/core/src/test/java/org/onap/aaf/cadi/test/Test.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.test;
+package org.onap.aaf.cadi.test;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
diff --git a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java
index 65338ae..af45f55 100644
--- a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
+++ b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse.test;
+package org.onap.aaf.cadi.wsse.test;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
@@ -33,10 +33,9 @@ import java.io.FileInputStream;
 import javax.xml.stream.XMLStreamException;
 
 import org.junit.Test;
-
-import com.att.cadi.BasicCred;
-import com.att.cadi.BufferedServletInputStream;
-import com.att.cadi.wsse.WSSEParser;
+import org.onap.aaf.cadi.BasicCred;
+import org.onap.aaf.cadi.BufferedServletInputStream;
+import org.onap.aaf.cadi.wsse.WSSEParser;
 
 public class JU_WSSE_Read {
 
diff --git a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java
index ee69561..de8da8a 100644
--- a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
+++ b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java
@@ -20,16 +20,15 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.wsse.test;
+package org.onap.aaf.cadi.wsse.test;
 
 import java.io.FileInputStream;
 
 import javax.xml.stream.events.XMLEvent;
 
 import org.junit.Test;
-
-import com.att.cadi.wsse.XEvent;
-import com.att.cadi.wsse.XReader;
+import org.onap.aaf.cadi.wsse.XEvent;
+import org.onap.aaf.cadi.wsse.XReader;
 
 public class JU_XReader {
 	@Test
author	sg481n <sg481n@att.com>	2017-08-25 01:57:24 -0400
committer	sg481n <sg481n@att.com>	2017-08-25 01:57:37 -0400
commit	62c4eb45e157d502463d797c1353802ca8e1e307 (patch)
tree	f79566b55c2535fd4be51b52cb4e5cb258391114 /core/src
parent	a623b7658783e9a66f6131821de9447d58951cfe (diff)