-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Hash;\r
-import com.att.cadi.aaf.v2_0.AAFCon;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.principal.X509Principal;\r
-import com.att.cadi.taf.cert.CertIdentity;\r
-import com.att.cadi.taf.cert.X509Taf;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.util.Chrono;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Hash;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.principal.X509Principal;\r
+import org.onap.aaf.cadi.taf.cert.CertIdentity;\r
+import org.onap.aaf.cadi.taf.cert.X509Taf;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
+import org.onap.aaf.inno.env.util.Split;\r