6 files changed, 29 insertions, 35 deletions
diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
index e847bd0..30d979a 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
@@ -20,13 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.aaf.cass;
+package org.onap.aaf.cadi.aaf.cass;
 
 import java.security.Principal;
 
 import org.apache.cassandra.auth.AuthenticatedUser;
-
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.Access;
 
 public class AAFAuthenticatedUser extends AuthenticatedUser implements Principal {
 	private boolean anonymous = false, supr=false, local=false;
diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
index 631a3fa..6b8b29d 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.aaf.cass;
+package org.onap.aaf.cadi.aaf.cass;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -34,11 +34,10 @@ import org.apache.cassandra.auth.ISaslAwareAuthenticator;
 import org.apache.cassandra.exceptions.AuthenticationException;
 import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.apache.cassandra.exceptions.RequestExecutionException;
-
-import com.att.cadi.Access.Level;
-import com.att.cadi.CredVal.Type;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CredVal.Type;
+import org.onap.aaf.cadi.config.Config;
 
 public class AAFAuthenticator extends AAFBase implements ISaslAwareAuthenticator  {
 
diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
index 650e570..bea0e86 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.aaf.cass;
+package org.onap.aaf.cadi.aaf.cass;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -33,10 +33,9 @@ import org.apache.cassandra.auth.Permission;
 import org.apache.cassandra.auth.PermissionDetails;
 import org.apache.cassandra.exceptions.RequestExecutionException;
 import org.apache.cassandra.exceptions.RequestValidationException;
-
-import com.att.cadi.Access.Level;
-import com.att.cadi.aaf.v2_0.AbsAAFLur;
-import com.att.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;
+import org.onap.aaf.cadi.lur.LocalPermission;
 
 public class AAFAuthorizer extends AAFBase implements IAuthorizer {
 	// Returns every permission on the resource granted to the user.
diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
index 4d82a6b..e422234 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.aaf.cass;
+package org.onap.aaf.cadi.aaf.cass;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,18 +34,17 @@ import org.apache.cassandra.auth.DataResource;
 import org.apache.cassandra.auth.IAuthenticator;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.exceptions.ConfigurationException;
-
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.Lur;
-import com.att.cadi.SLF4JAccess;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.aaf.v2_0.AbsAAFLur;
-import com.att.cadi.config.Config;
-import com.att.cadi.lur.EpiLur;
-import com.att.cadi.lur.LocalLur;
-import com.att.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.SLF4JAccess;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.lur.EpiLur;
+import org.onap.aaf.cadi.lur.LocalLur;
 
 public abstract class AAFBase {
 	protected static final Set<IAuthenticator.Option> options;
diff --git a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
index 0eb95be..bedfa25 100644
--- a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
+++ b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.aaf.cass.test;
+package org.onap.aaf.cadi.aaf.cass.test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,9 +33,8 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
-import com.att.cadi.aaf.cass.AAFAuthenticator;
-import com.att.cadi.aaf.cass.AAFAuthorizer;
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;
+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;
 
 public class JU_CASS {
 
diff --git a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
index 9eca242..f5ee310 100644
--- a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java
+++ b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.cass;
+package org.onap.aaf.cass;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,9 +33,8 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
-import com.att.cadi.aaf.cass.AAFAuthenticator;
-import com.att.cadi.aaf.cass.AAFAuthorizer;
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;
+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;
 
 public class JU_CASS {