11 files changed, 80 insertions, 83 deletions
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java
index d5f92c1..69c9688 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,16 +35,15 @@ import java.util.Properties;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.aaf.v2_0.AAFTaf;
-import com.att.cadi.config.Config;
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.principal.CachedBasicPrincipal;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.aaf.v2_0.AAFTaf;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;
 
 import junit.framework.Assert;
 
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
index f85a4e2..bd4e162 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -50,21 +50,20 @@ import javax.servlet.http.Part;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-
-import com.att.cadi.CadiException;
-import com.att.cadi.Lur;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Symm;
-import com.att.cadi.Taf.LifeForm;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.aaf.v2_0.AAFTaf;
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.lur.ConfigPrincipal;
-import com.att.cadi.lur.LocalPermission;
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.CadiException;
+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.Taf.LifeForm;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.aaf.v2_0.AAFTaf;
+import org.onap.aaf.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.lur.ConfigPrincipal;
+import org.onap.aaf.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.taf.TafResp;
 
 public class JU_Lur2_0Call {
 	private static AAFConHttp aaf;
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java
index 8dee6cf..d60eedb 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java
@@ -20,14 +20,13 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
 
 import static org.junit.Assert.*;
 
 import org.junit.AfterClass;
 import org.junit.Test;
-
-import com.att.cadi.aaf.PermEval;
+import org.onap.aaf.cadi.aaf.PermEval;
 
 public class JU_PermEval {
 
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java
index c4f5f7c..ef9dc36 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java
@@ -20,21 +20,21 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
 
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.att.cadi.Access;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.config.Config;
-import com.att.cadi.locator.PropertyLocator;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.locator.PropertyLocator;
 
 public class MultiThreadPermHit {
 	public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java
index 7d83625..2af452d 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java
@@ -20,16 +20,16 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 
-import com.att.cadi.Access;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.config.Config;
 
 public class TestAccess implements Access {
 	private Symm symm;
diff --git a/aaf/src/test/java/com/att/aaf/content/JU_Content.java b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java
index 80215c9..6691f84 100644
--- a/aaf/src/test/java/com/att/aaf/content/JU_Content.java
+++ b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.content;
+package org.onap.aaf.content;
 
 import java.io.StringReader;
 
@@ -30,9 +30,9 @@ import org.junit.Test;
 
 import aaf.v2_0.Error;
 
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaData;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaData;
+import org.onap.aaf.rosetta.env.RosettaEnv;
 
 public class JU_Content {
 
diff --git a/aaf/src/test/java/com/att/aaf/example/CadiTest.java b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java
index f50d6ac..34ed858 100644
--- a/aaf/src/test/java/com/att/aaf/example/CadiTest.java
+++ b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java
@@ -20,17 +20,17 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
 
 import java.net.HttpURLConnection;
 import java.net.URI;
 
-import com.att.cadi.Access;
-import com.att.cadi.PropAccess;
-import com.att.cadi.client.Future;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.http.HClient;
-import com.att.cadi.http.HX509SS;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.http.HClient;
+import org.onap.aaf.cadi.http.HX509SS;
 
 public class CadiTest {
 	public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java
index 53f8c8e..65972cd 100644
--- a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java
+++ b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java
@@ -20,12 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
 
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.locator.DNSLocator;
 
 public class ExampleAuthCheck {
 	public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java
index 5f6179e..f83b15b 100644
--- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java
+++ b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java
@@ -20,19 +20,19 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
 
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.aaf.v2_0.AAFConDME2;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+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.AAFConDME2;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
 
 public class ExamplePerm2_0 {
 	public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java
index 5ebbe9f..f6024a5 100644
--- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java
+++ b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java
@@ -20,19 +20,19 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
 
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.locator.DNSLocator;
 
 public class ExamplePerm2_0_DME2 {
 	public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/X509Test.java b/aaf/src/test/java/org/onap/aaf/example/X509Test.java
index 517393f..ad5d4b2 100644
--- a/aaf/src/test/java/com/att/aaf/example/X509Test.java
+++ b/aaf/src/test/java/org/onap/aaf/example/X509Test.java
@@ -20,16 +20,16 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * *
  ******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
 
 import java.security.Principal;
 
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.client.Future;
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.lur.LocalPermission;
 
 public class X509Test {
 	public static void main(String args[]) {