13 files changed, 40 insertions, 48 deletions
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