-->\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>com.att.cadi</groupId>\r
+               <groupId>org.onap.aaf.cadi</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
        <url>https://github.com/att/AAF</url>\r
        <description>CADI</description>\r
        <artifactId>cadi-aaf</artifactId>\r
+       <properties>\r
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+               <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+       </properties>\r
+       \r
        <dependencies>\r
                <dependency>\r
-                       <groupId>com.att.authz</groupId>\r
+                       <groupId>org.onap.aaf.authz</groupId>\r
                        <artifactId>authz-client</artifactId>\r
-               </dependency>\r
+               </dependency> \r
 \r
                  <dependency>\r
-                       <groupId>com.att.cadi</groupId>\r
+                       <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-client</artifactId>\r
                </dependency> \r
 \r
                <dependency>\r
-                       <groupId>com.att.cadi</groupId>\r
+                       <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-client</artifactId>\r
                </dependency>\r
                \r
                                        <classifier>tests</classifier>\r
                                        <archive>\r
                                                <manifest>\r
-                                                       <mainClass>com.att.cadi.cm.CmAgent</mainClass>\r
+                                                       <mainClass>org.onap.aaf.cadi.cm.CmAgent</mainClass>\r
                                                </manifest>\r
 \r
                                                <manifestEntries>\r
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
-               \r
+                 <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin> \r
                </plugins>\r
        </build>\r
+               <distributionManagement>\r
+               <repository>\r
+                       <id>ecomp-releases</id>\r
+                       <name>AAF Release Repository</name>\r
+                       <url>${nexusproxy}${releaseNexusPath}</url>\r
+               </repository>\r
+               <snapshotRepository>\r
+                       <id>ecomp-snapshots</id>\r
+                       <name>AAF Snapshot Repository</name>\r
+                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
+               </snapshotRepository>\r
+               <site>\r
+                       <id>ecomp-site</id>\r
+                       <url>dav:${nexusproxy}${sitePath}</url>\r
+               </site>\r
+       </distributionManagement>\r
+<pluginRepositories>\r
+        <pluginRepository>\r
+            <id>onap-plugin-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+       \r
+       <repositories>\r
+               <repository>\r
+                       <id>central</id>\r
+                       <name>Maven 2 repository 2</name>\r
+                       <url>http://repo2.maven.org/maven2/</url>\r
+               </repository>\r
+               <repository>\r
+            <id>onap-jar-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+        </repository>\r
+               <repository>\r
+                       <id>spring-repo</id>\r
+                       <name>Spring repo</name>\r
+                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+               </repository>\r
+               <repository>\r
+                       <id>repository.jboss.org-public</id>\r
+                       <name>JBoss.org Maven repository</name>\r
+                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+               </repository>\r
+       </repositories>\r
 </project>\r
 
+++ /dev/null
-/*******************************************************************************\r
- * ============LICENSE_START====================================================\r
- * * org.onap.aaf\r
- * * ===========================================================================\r
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
- * * ===========================================================================\r
- * * Licensed under the Apache License, Version 2.0 (the "License");\r
- * * you may not use this file except in compliance with the License.\r
- * * You may obtain a copy of the License at\r
- * * \r
- *  *      http://www.apache.org/licenses/LICENSE-2.0\r
- * * \r
- *  * Unless required by applicable law or agreed to in writing, software\r
- * * distributed under the License is distributed on an "AS IS" BASIS,\r
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * * See the License for the specific language governing permissions and\r
- * * limitations under the License.\r
- * * ============LICENSE_END====================================================\r
- * *\r
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
- * *\r
- ******************************************************************************/\r
-import com.att.rosetta.env.RosettaEnv;\r
-\r
-public class Examples {\r
-       public static void main(String[] args) {\r
-               if(args.length<1) {\r
-                       System.out.println("Usage: Examples <name> [\"optional\" - will show optional fields]");\r
-               } else {\r
-                       boolean options = args.length>1&&"optional".equals(args[1]);\r
-                       try {\r
-                               RosettaEnv env = new RosettaEnv();\r
-                               System.out.println(com.att.cadi.aaf.client.Examples.print(env, args[0], options));\r
-                       } catch (Exception e) {\r
-                               System.out.println(e.getMessage());\r
-                       }\r
-               }\r
-       }\r
-       \r
-\r
-}\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf;\r
+package org.onap.aaf.cadi.aaf;\r
 \r
-import com.att.cadi.Permission;\r
+import org.onap.aaf.cadi.Permission;\r
 \r
 /**\r
  * A Class that understands the AAF format of Permission (name/type/action)\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf;\r
+package org.onap.aaf.cadi.aaf;\r
 \r
 import java.security.Principal;\r
 import java.util.regex.Pattern;\r
 \r
-import com.att.cadi.Transmutate;\r
-import com.att.cadi.lur.ConfigPrincipal;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.cadi.principal.CSPPrincipal_T;\r
+import org.onap.aaf.cadi.Transmutate;\r
+import org.onap.aaf.cadi.lur.ConfigPrincipal;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+import org.onap.aaf.cadi.principal.CSPPrincipal_T;\r
 \r
 /**\r
  * AAFTransmutate\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf;\r
+package org.onap.aaf.cadi.aaf;\r
 \r
 import java.io.IOException;\r
 import java.io.PrintStream;\r
 import java.net.UnknownHostException;\r
 import java.util.Date;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.http.HBasicAuthSS;\r
+import org.onap.aaf.cadi.http.HClient;\r
+import org.onap.aaf.cadi.http.HX509SS;\r
+import org.onap.aaf.cadi.locator.DME2Locator;\r
+import org.onap.aaf.cadi.locator.PropertyLocator;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.TrustChecker;\r
-import com.att.cadi.aaf.v2_0.AAFCon;\r
-import com.att.cadi.aaf.v2_0.AAFConDME2;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.http.HBasicAuthSS;\r
-import com.att.cadi.http.HClient;\r
-import com.att.cadi.http.HX509SS;\r
-import com.att.cadi.locator.DME2Locator;\r
-import com.att.cadi.locator.PropertyLocator;\r
-import com.att.inno.env.APIException;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 import aaf.v2_0.Perms;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf;\r
+package org.onap.aaf.cadi.aaf;\r
 \r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 \r
 public class PermEval {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.cert;\r
+package org.onap.aaf.cadi.aaf.cert;\r
 \r
 \r
 import java.security.Principal;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.xml.datatype.XMLGregorianCalendar;\r
 \r
-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
 \r
 import aaf.v2_0.Certs;\r
 import aaf.v2_0.Certs.Cert;\r
                                        userLookup.add(s);\r
                                }\r
                                for(String authMech : authMechanisms) {\r
-                                       Future<Users> fusr = aafcon.client(AAF_VERSION).read("/authz/users/perm/com.att.aaf.trust/"+authMech+"/authenticate", Users.class, aafcon.usersDF);\r
+                                       Future<Users> fusr = aafcon.client(AAF_VERSION).read("/authz/users/perm/org.onap.aaf.trust/"+authMech+"/authenticate", Users.class, aafcon.usersDF);\r
                                        if(fusr.get(5000)) {\r
                                                List<User> users = fusr.value.getUser();\r
                                                if(users.isEmpty()) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.client;\r
+package org.onap.aaf.cadi.aaf.client;\r
 \r
 import java.io.PrintStream;\r
 \r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.util.Vars;\r
+\r
 import aaf.v2_0.Error;\r
 \r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.util.Vars;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 public class ErrMessage {\r
        private RosettaDF<Error> errDF;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.client;\r
+package org.onap.aaf.cadi.aaf.client;\r
 \r
 \r
 import java.lang.reflect.InvocationTargetException;\r
 import aaf.v2_0.Users;\r
 import aaf.v2_0.Users.User;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.util.Chrono;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 public class Examples {\r
        public static <C> String print(RosettaEnv env, String nameOrContentType, boolean optional) throws APIException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.marshal;\r
+package org.onap.aaf.cadi.aaf.marshal;\r
 \r
 import javax.xml.datatype.XMLGregorianCalendar;\r
 \r
 import aaf.v2_0.Certs.Cert;\r
 \r
-import com.att.rosetta.marshal.FieldDateTime;\r
-import com.att.rosetta.marshal.FieldHexBinary;\r
-import com.att.rosetta.marshal.FieldString;\r
-import com.att.rosetta.marshal.ObjMarshal;\r
+import org.onap.aaf.rosetta.marshal.FieldDateTime;\r
+import org.onap.aaf.rosetta.marshal.FieldHexBinary;\r
+import org.onap.aaf.rosetta.marshal.FieldString;\r
+import org.onap.aaf.rosetta.marshal.ObjMarshal;\r
 \r
 public class CertMarshal extends ObjMarshal<Cert> {\r
        public CertMarshal() {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.marshal;\r
+package org.onap.aaf.cadi.aaf.marshal;\r
 \r
 import java.util.List;\r
 \r
 import aaf.v2_0.Certs;\r
 import aaf.v2_0.Certs.Cert;\r
 \r
-import com.att.rosetta.marshal.ObjArray;\r
-import com.att.rosetta.marshal.ObjMarshal;\r
+import org.onap.aaf.rosetta.marshal.ObjArray;\r
+import org.onap.aaf.rosetta.marshal.ObjMarshal;\r
 \r
 public class CertsMarshal extends ObjMarshal<Certs> {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.io.IOException;\r
 \r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.GetCred;\r
+import org.onap.aaf.cadi.Hash;\r
+import org.onap.aaf.cadi.User;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.lur.ConfigPrincipal;\r
+\r
 import com.att.aft.dme2.api.DME2Exception;\r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.GetCred;\r
-import com.att.cadi.Hash;\r
-import com.att.cadi.User;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.lur.ConfigPrincipal;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {\r
        private AAFCon<CLIENT> con;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.net.URI;\r
 import java.security.Principal;\r
 import javax.servlet.ServletRequest;\r
 import javax.servlet.http.HttpServletRequest;\r
 \r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.CadiWrap;\r
-import com.att.cadi.Connector;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.aaf.marshal.CertsMarshal;\r
-import com.att.cadi.client.AbsBasicAuth;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.client.Retryable;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.lur.EpiLur;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.cadi.util.Vars;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.util.Split;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.CadiWrap;\r
+import org.onap.aaf.cadi.Connector;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.marshal.CertsMarshal;\r
+import org.onap.aaf.cadi.client.AbsBasicAuth;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.client.Retryable;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.lur.EpiLur;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+import org.onap.aaf.cadi.util.Vars;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.util.Split;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 import aaf.v2_0.Certs;\r
 import aaf.v2_0.Error;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.io.IOException;\r
 import java.net.ConnectException;\r
 import java.security.Principal;\r
 import java.util.Properties;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.client.Retryable;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.dme2.DME2BasicAuth;\r
+import org.onap.aaf.cadi.dme2.DME2TransferSS;\r
+import org.onap.aaf.cadi.dme2.DME2x509SS;\r
+import org.onap.aaf.cadi.dme2.DRcli;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
 import com.att.aft.dme2.api.DME2Exception;\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.client.Retryable;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.dme2.DME2BasicAuth;\r
-import com.att.cadi.dme2.DME2TransferSS;\r
-import com.att.cadi.dme2.DME2x509SS;\r
-import com.att.cadi.dme2.DRcli;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 public class AAFConDME2 extends AAFCon<DME2Client>{\r
        private DME2Manager manager;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.io.IOException;\r
 import java.net.HttpURLConnection;\r
 import java.security.GeneralSecurityException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.AbsTransferSS;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.client.Retryable;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.http.HBasicAuthSS;\r
-import com.att.cadi.http.HMangr;\r
-import com.att.cadi.http.HRcli;\r
-import com.att.cadi.http.HTransferSS;\r
-import com.att.cadi.http.HX509SS;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.client.AbsTransferSS;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.client.Retryable;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.http.HBasicAuthSS;\r
+import org.onap.aaf.cadi.http.HMangr;\r
+import org.onap.aaf.cadi.http.HRcli;\r
+import org.onap.aaf.cadi.http.HTransferSS;\r
+import org.onap.aaf.cadi.http.HX509SS;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 public class AAFConHttp extends AAFCon<HttpURLConnection> {\r
        private final HMangr hman;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.net.ConnectException;\r
 import java.net.URISyntaxException;\r
 import java.security.Principal;\r
 import java.util.Map;\r
 \r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.User;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.client.Retryable;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
+\r
 import com.att.aft.dme2.api.DME2Exception;\r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.User;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.client.Retryable;\r
-import com.att.cadi.lur.LocalPermission;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 import aaf.v2_0.Perm;\r
 import aaf.v2_0.Perms;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.GetCred;\r
-import com.att.cadi.Hash;\r
-import com.att.cadi.Taf.LifeForm;\r
-import com.att.cadi.User;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.cadi.principal.CachedBasicPrincipal;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TafResp.RESP;\r
-import com.att.cadi.taf.basic.BasicHttpTafResp;\r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.GetCred;\r
+import org.onap.aaf.cadi.Hash;\r
+import org.onap.aaf.cadi.User;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.Taf.LifeForm;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp.RESP;\r
+import org.onap.aaf.cadi.taf.basic.BasicHttpTafResp;\r
 \r
 public class AAFTaf<CLIENT> extends AbsUserCache<AAFPermission> implements HttpTaf {\r
 //     private static final String INVALID_AUTH_TOKEN = "Invalid Auth Token";\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import javax.servlet.http.HttpServletRequest ;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.TrustChecker;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.principal.TrustPrincipal;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TrustNotTafResp;\r
-import com.att.cadi.taf.TrustTafResp;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.principal.TrustPrincipal;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TrustNotTafResp;\r
+import org.onap.aaf.cadi.taf.TrustTafResp;\r
+\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 public class AAFTrustChecker implements TrustChecker {\r
        private final String tag, id;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.v2_0;\r
+package org.onap.aaf.cadi.aaf.v2_0;\r
 \r
 import java.net.URISyntaxException;\r
 import java.security.Principal;\r
 import java.util.Date;\r
 import java.util.List;\r
 \r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.CachingLur;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.StrLur;\r
+import org.onap.aaf.cadi.Transmutate;\r
+import org.onap.aaf.cadi.User;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.AAFTransmutate;\r
+import org.onap.aaf.cadi.config.Config;\r
+\r
 import com.att.aft.dme2.api.DME2Exception;\r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachingLur;\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.StrLur;\r
-import com.att.cadi.Transmutate;\r
-import com.att.cadi.User;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.aaf.AAFTransmutate;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 public abstract class AbsAAFLur<PERM extends Permission> extends AbsUserCache<PERM> implements StrLur, CachingLur<PERM> {\r
        protected static final byte[] BLANK_PASSWORD = new byte[0];\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.File;\r
 import java.io.FileOutputStream;\r
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.util.Chmod;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.util.Chrono;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.util.Chmod;\r
+\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
 \r
 import certman.v1_0.Artifacts.Artifact;\r
 import certman.v1_0.CertInfo;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 public class CertException extends Exception {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.util.Iterator;\r
 import java.util.Map;\r
 import java.util.Map.Entry;\r
+\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.aaf.client.ErrMessage;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.http.HBasicAuthSS;\r
+import org.onap.aaf.cadi.sso.AAFSSO;\r
+\r
 import java.util.Properties;\r
 \r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.aaf.client.ErrMessage;\r
-import com.att.cadi.aaf.v2_0.AAFCon;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.http.HBasicAuthSS;\r
-import com.att.cadi.sso.AAFSSO;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.util.Chrono;\r
-import com.att.inno.env.util.Split;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
+import org.onap.aaf.inno.env.util.Split;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 import certman.v1_0.Artifacts;\r
 import certman.v1_0.Artifacts.Artifact;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.ByteArrayInputStream;\r
 import javax.crypto.Cipher;\r
 import javax.crypto.NoSuchPaddingException;\r
 \r
-import com.att.cadi.Symm;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.TimeTaken;\r
-import com.att.inno.env.Trans;\r
+import org.onap.aaf.cadi.Symm;\r
+\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.TimeTaken;\r
+import org.onap.aaf.inno.env.Trans;\r
 \r
 public class Factory {\r
        private static final String PRIVATE_KEY_HEADER = "PRIVATE KEY";\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import certman.v1_0.Artifacts.Artifact;\r
 import certman.v1_0.CertInfo;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.inno.env.Trans;\r
+import org.onap.aaf.cadi.CadiException;\r
+\r
+import org.onap.aaf.inno.env.Trans;\r
 \r
 public interface PlaceArtifact {\r
        public boolean place(Trans trans, CertInfo cert, Artifact arti) throws CadiException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.File;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.util.Chmod;\r
+\r
 import certman.v1_0.Artifacts.Artifact;\r
 import certman.v1_0.CertInfo;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.util.Chmod;\r
-import com.att.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Trans;\r
 \r
 public class PlaceArtifactInFiles extends ArtifactDir {\r
        @Override\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.File;\r
 import java.security.KeyStore;\r
 import java.security.cert.X509Certificate;\r
 import java.util.Collection;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.util.Chmod;\r
-import com.att.inno.env.Trans;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.util.Chmod;\r
+\r
+import org.onap.aaf.inno.env.Trans;\r
 \r
 import certman.v1_0.Artifacts.Artifact;\r
 import certman.v1_0.CertInfo;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.PrintStream;\r
 \r
 import certman.v1_0.Artifacts.Artifact;\r
 import certman.v1_0.CertInfo;\r
 \r
-import com.att.inno.env.Trans;\r
+import org.onap.aaf.inno.env.Trans;\r
 \r
 public class PlaceArtifactOnStream implements PlaceArtifact {\r
        private PrintStream out;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.cm;\r
+package org.onap.aaf.cadi.cm;\r
 \r
 import java.io.File;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.util.Chmod;\r
-import com.att.inno.env.Trans;\r
-import com.att.inno.env.util.Chrono;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.util.Chmod;\r
+\r
+import org.onap.aaf.inno.env.Trans;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 import certman.v1_0.Artifacts.Artifact;\r
 import certman.v1_0.CertInfo;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.sso;\r
+package org.onap.aaf.cadi.sso;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.util.List;\r
 import java.util.Properties;\r
 \r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.util.MyConsole;\r
-import com.att.cadi.util.SubStandardConsole;\r
-import com.att.cadi.util.TheConsole;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.util.MyConsole;\r
+import org.onap.aaf.cadi.util.SubStandardConsole;\r
+import org.onap.aaf.cadi.util.TheConsole;\r
 \r
 \r
 public class AAFSSO {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.aaf.test;\r
+package org.onap.aaf.cadi.lur.aaf.test;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
 \r
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.aaf.v2_0.AAFAuthn;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.aaf.v2_0.AAFLurPerm;\r
-import com.att.cadi.aaf.v2_0.AAFTaf;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.locator.DNSLocator;\r
-import com.att.cadi.principal.CachedBasicPrincipal;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFTaf;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.locator.DNSLocator;\r
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;\r
 \r
 import junit.framework.Assert;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.aaf.test;\r
+package org.onap.aaf.cadi.lur.aaf.test;\r
 \r
 import static org.junit.Assert.assertEquals;\r
 \r
 \r
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.Taf.LifeForm;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.aaf.v2_0.AAFLurPerm;\r
-import com.att.cadi.aaf.v2_0.AAFTaf;\r
-import com.att.cadi.locator.DNSLocator;\r
-import com.att.cadi.lur.ConfigPrincipal;\r
-import com.att.cadi.lur.LocalPermission;\r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.Taf.LifeForm;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFTaf;\r
+import org.onap.aaf.cadi.locator.DNSLocator;\r
+import org.onap.aaf.cadi.lur.ConfigPrincipal;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 public class JU_Lur2_0Call {\r
        private static AAFConHttp aaf;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.aaf.test;\r
+package org.onap.aaf.cadi.lur.aaf.test;\r
 \r
 import static org.junit.Assert.*;\r
 \r
 import org.junit.AfterClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.aaf.PermEval;\r
+import org.onap.aaf.cadi.aaf.PermEval;\r
 \r
 public class JU_PermEval {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.aaf.test;\r
+package org.onap.aaf.cadi.lur.aaf.test;\r
 \r
 import java.security.Principal;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.aaf.v2_0.AAFAuthn;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.aaf.v2_0.AAFLurPerm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.locator.PropertyLocator;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.locator.PropertyLocator;\r
 \r
 public class MultiThreadPermHit {\r
        public static void main(String args[]) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.aaf.test;\r
+package org.onap.aaf.cadi.lur.aaf.test;\r
 \r
 import java.io.FileInputStream;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.io.PrintStream;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 public class TestAccess implements Access {\r
        private Symm symm;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.content;\r
+package org.onap.aaf.content;\r
 \r
 import java.io.StringReader;\r
 \r
 \r
 import aaf.v2_0.Error;\r
 \r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaData;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaData;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 public class JU_Content {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.example;\r
+package org.onap.aaf.example;\r
 \r
 import java.net.HttpURLConnection;\r
 import java.net.URI;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.http.HClient;\r
-import com.att.cadi.http.HX509SS;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.http.HClient;\r
+import org.onap.aaf.cadi.http.HX509SS;\r
 \r
 public class CadiTest {\r
        public static void main(String args[]) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.example;\r
+package org.onap.aaf.example;\r
 \r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.aaf.v2_0.AAFAuthn;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.locator.DNSLocator;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.locator.DNSLocator;\r
 \r
 public class ExampleAuthCheck {\r
        public static void main(String args[]) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.example;\r
+package org.onap.aaf.example;\r
 \r
 import java.security.Principal;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import com.att.cadi.Permission;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.aaf.v2_0.AAFAuthn;\r
-import com.att.cadi.aaf.v2_0.AAFCon;\r
-import com.att.cadi.aaf.v2_0.AAFConDME2;\r
-import com.att.cadi.aaf.v2_0.AAFLurPerm;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;\r
 \r
 public class ExamplePerm2_0 {\r
        public static void main(String args[]) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.example;\r
+package org.onap.aaf.example;\r
 \r
 import java.security.Principal;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import com.att.cadi.Permission;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.aaf.AAFPermission;\r
-import com.att.cadi.aaf.v2_0.AAFAuthn;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.aaf.v2_0.AAFLurPerm;\r
-import com.att.cadi.locator.DNSLocator;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;\r
+import org.onap.aaf.cadi.locator.DNSLocator;\r
 \r
 public class ExamplePerm2_0_DME2 {\r
        public static void main(String args[]) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.example;\r
+package org.onap.aaf.example;\r
 \r
 import java.security.Principal;\r
 \r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.aaf.v2_0.AAFConHttp;\r
-import com.att.cadi.aaf.v2_0.AAFLurPerm;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.locator.DNSLocator;\r
-import com.att.cadi.lur.LocalPermission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.locator.DNSLocator;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
 \r
 public class X509Test {\r
        public static void main(String args[]) {\r
 
 -->\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>com.att.cadi</groupId>\r
+               <groupId>org.onap.aaf.cadi</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
        <url>https://github.com/att/AAF</url>\r
        <description>CADI</description>\r
        <artifactId>cadi-cass</artifactId>\r
-\r
+<properties>\r
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+               <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+       </properties>\r
        <dependencies>\r
                <dependency>\r
-                       <groupId>com.att.cadi</groupId>\r
+                       <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-aaf</artifactId>\r
                </dependency>\r
                \r
                        </execution>\r
                      </executions>\r
                    </plugin>\r
-\r
-                       \r
-               <plugin>\r
-                       <groupId>org.sonatype.plugins</groupId>\r
-                       <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                       <version>1.6.7</version>\r
-                       <extensions>true</extensions>\r
-                       <configuration>\r
-                       <serverId>ossrhdme</serverId>\r
-                       <nexusUrl>https://oss.sonatype.org/</nexusUrl>\r
-                       <autoReleaseAfterClose>true</autoReleaseAfterClose>\r
-                       </configuration>\r
-               </plugin>\r
+  <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin> \r
                </plugins>\r
-       </build>        \r
+       </build>\r
+               <distributionManagement>\r
+               <repository>\r
+                       <id>ecomp-releases</id>\r
+                       <name>AAF Release Repository</name>\r
+                       <url>${nexusproxy}${releaseNexusPath}</url>\r
+               </repository>\r
+               <snapshotRepository>\r
+                       <id>ecomp-snapshots</id>\r
+                       <name>AAF Snapshot Repository</name>\r
+                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
+               </snapshotRepository>\r
+               <site>\r
+                       <id>ecomp-site</id>\r
+                       <url>dav:${nexusproxy}${sitePath}</url>\r
+               </site>\r
+       </distributionManagement>\r
+<pluginRepositories>\r
+        <pluginRepository>\r
+            <id>onap-plugin-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+       \r
+       <repositories>\r
+               <repository>\r
+                       <id>central</id>\r
+                       <name>Maven 2 repository 2</name>\r
+                       <url>http://repo2.maven.org/maven2/</url>\r
+               </repository>\r
+               <repository>\r
+            <id>onap-jar-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+        </repository>\r
+               <repository>\r
+                       <id>spring-repo</id>\r
+                       <name>Spring repo</name>\r
+                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+               </repository>\r
+               <repository>\r
+                       <id>repository.jboss.org-public</id>\r
+                       <name>JBoss.org Maven repository</name>\r
+                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+               </repository>\r
+       </repositories> \r
 </project>\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.cass;\r
+package org.onap.aaf.cadi.aaf.cass;\r
 \r
 import java.security.Principal;\r
 \r
 import org.apache.cassandra.auth.AuthenticatedUser;\r
-\r
-import com.att.cadi.Access;\r
+import org.onap.aaf.cadi.Access;\r
 \r
 public class AAFAuthenticatedUser extends AuthenticatedUser implements Principal {\r
        private boolean anonymous = false, supr=false, local=false;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.cass;\r
+package org.onap.aaf.cadi.aaf.cass;\r
 \r
 import java.io.IOException;\r
 import java.io.UnsupportedEncodingException;\r
 import org.apache.cassandra.exceptions.AuthenticationException;\r
 import org.apache.cassandra.exceptions.InvalidRequestException;\r
 import org.apache.cassandra.exceptions.RequestExecutionException;\r
-\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CredVal.Type;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CredVal.Type;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 public class AAFAuthenticator extends AAFBase implements ISaslAwareAuthenticator  {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.cass;\r
+package org.onap.aaf.cadi.aaf.cass;\r
 \r
 import java.util.ArrayList;\r
 import java.util.HashSet;\r
 import org.apache.cassandra.auth.PermissionDetails;\r
 import org.apache.cassandra.exceptions.RequestExecutionException;\r
 import org.apache.cassandra.exceptions.RequestValidationException;\r
-\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.aaf.v2_0.AbsAAFLur;\r
-import com.att.cadi.lur.LocalPermission;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
 \r
 public class AAFAuthorizer extends AAFBase implements IAuthorizer {\r
        // Returns every permission on the resource granted to the user.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.cass;\r
+package org.onap.aaf.cadi.aaf.cass;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import org.apache.cassandra.auth.IAuthenticator;\r
 import org.apache.cassandra.config.DatabaseDescriptor;\r
 import org.apache.cassandra.exceptions.ConfigurationException;\r
-\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.SLF4JAccess;\r
-import com.att.cadi.aaf.v2_0.AAFAuthn;\r
-import com.att.cadi.aaf.v2_0.AAFCon;\r
-import com.att.cadi.aaf.v2_0.AbsAAFLur;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.lur.EpiLur;\r
-import com.att.cadi.lur.LocalLur;\r
-import com.att.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.SLF4JAccess;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.aaf.AAFPermission;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;\r
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;\r
+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.lur.EpiLur;\r
+import org.onap.aaf.cadi.lur.LocalLur;\r
 \r
 public abstract class AAFBase {\r
        protected static final Set<IAuthenticator.Option> options;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.aaf.cass.test;\r
+package org.onap.aaf.cadi.aaf.cass.test;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.junit.Assert;\r
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.aaf.cass.AAFAuthenticator;\r
-import com.att.cadi.aaf.cass.AAFAuthorizer;\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;\r
 \r
 public class JU_CASS {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.aaf.cass;\r
+package org.onap.aaf.cass;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import org.junit.Assert;\r
 import org.junit.BeforeClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.aaf.cass.AAFAuthenticator;\r
-import com.att.cadi.aaf.cass.AAFAuthorizer;\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;\r
 \r
 public class JU_CASS {\r
 \r
 
 -->\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
 <parent>\r
-               <groupId>com.att.cadi</groupId>\r
+               <groupId>org.onap.aaf.cadi</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.0-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
        <url>https://github.com/att/AAF</url>\r
        <description>CADI</description>\r
        <modelVersion>4.0.0</modelVersion>\r
-\r
+<properties>\r
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+               <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+       </properties>\r
        <dependencies>\r
                <dependency>\r
-                       <groupId>com.att.inno</groupId>\r
+                       <groupId>org.onap.aaf.inno</groupId>\r
                        <artifactId>rosetta</artifactId>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>com.att.cadi</groupId>\r
+                       <groupId>org.onap.aaf.cadi</groupId>\r
                        <artifactId>cadi-core</artifactId>\r
                </dependency>\r
                <dependency>\r
                      </executions>\r
                    </plugin>\r
        \r
- \r
-               <plugin>\r
-                       <groupId>org.sonatype.plugins</groupId>\r
-                       <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                       <version>1.6.7</version>\r
-                       <extensions>true</extensions>\r
-                       <configuration>\r
-                       <serverId>ossrhdme</serverId>\r
-                       <nexusUrl>https://oss.sonatype.org/</nexusUrl>\r
-                       <autoReleaseAfterClose>true</autoReleaseAfterClose>\r
-                       </configuration>\r
-               </plugin>\r
+  <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin> \r
                </plugins>\r
        </build>\r
+               <distributionManagement>\r
+               <repository>\r
+                       <id>ecomp-releases</id>\r
+                       <name>AAF Release Repository</name>\r
+                       <url>${nexusproxy}${releaseNexusPath}</url>\r
+               </repository>\r
+               <snapshotRepository>\r
+                       <id>ecomp-snapshots</id>\r
+                       <name>AAF Snapshot Repository</name>\r
+                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
+               </snapshotRepository>\r
+               <site>\r
+                       <id>ecomp-site</id>\r
+                       <url>dav:${nexusproxy}${sitePath}</url>\r
+               </site>\r
+       </distributionManagement>\r
+<pluginRepositories>\r
+        <pluginRepository>\r
+            <id>onap-plugin-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
        \r
+       <repositories>\r
+               <repository>\r
+                       <id>central</id>\r
+                       <name>Maven 2 repository 2</name>\r
+                       <url>http://repo2.maven.org/maven2/</url>\r
+               </repository>\r
+               <repository>\r
+            <id>onap-jar-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+        </repository>\r
+               <repository>\r
+                       <id>spring-repo</id>\r
+                       <name>Spring repo</name>\r
+                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+               </repository>\r
+               <repository>\r
+                       <id>repository.jboss.org-public</id>\r
+                       <name>JBoss.org Maven repository</name>\r
+                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+               </repository>\r
+       </repositories>\r
 </project>\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.net.HttpURLConnection;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.http.HBasicAuthSS;\r
+import org.onap.aaf.cadi.http.HMangr;\r
+import org.onap.aaf.cadi.locator.DME2Locator;\r
+\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.http.HBasicAuthSS;\r
-import com.att.cadi.http.HMangr;\r
-import com.att.cadi.locator.DME2Locator;\r
-import com.att.inno.env.APIException;\r
-import com.att.rosetta.env.RosettaDF;\r
-import com.att.rosetta.env.RosettaEnv;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
 \r
 public class AAFClient {\r
        private RosettaEnv env;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.io.IOException;\r
 \r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
 \r
 public abstract class AbsBasicAuth<CLIENT> implements SecuritySetter<CLIENT> {\r
                protected static final String REPEAT_OFFENDER="This call is aborted because of repeated usage of invalid Passwords";\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.security.Principal;\r
 \r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.cadi.principal.TGuardPrincipal;\r
-import com.att.cadi.principal.TrustPrincipal;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+import org.onap.aaf.cadi.principal.TGuardPrincipal;\r
+import org.onap.aaf.cadi.principal.TrustPrincipal;\r
 \r
 public abstract class AbsTransferSS<CLIENT> implements SecuritySetter<CLIENT> {\r
        protected String value;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.inno.env.APIException;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.cadi.CadiException;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 public class Delete<T> extends AAFClient.Call<T> {\r
        public Delete(AAFClient ac, RosettaDF<T> df) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
 \r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 \r
 public interface EClient<CT> {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.util.Map.Entry;\r
+\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Symm;\r
+\r
 import java.util.Properties;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Symm;\r
-import com.att.inno.env.Decryptor;\r
-import com.att.inno.env.Env;\r
-import com.att.inno.env.impl.BasicEnv;\r
+import org.onap.aaf.inno.env.Decryptor;\r
+import org.onap.aaf.inno.env.Env;\r
+import org.onap.aaf.inno.env.impl.BasicEnv;\r
 \r
 public class EnvAccess implements Access {\r
        private Env env;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
-import com.att.cadi.CadiException;\r
+import org.onap.aaf.cadi.CadiException;\r
 \r
 public abstract class Future<T> {\r
        public T value;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.inno.env.APIException;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.cadi.CadiException;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 public class Get<T> extends AAFClient.Call<T> {\r
        public Get(AAFClient ac, RosettaDF<T> df) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 /**\r
  * Use to set Variables outside of Anonymous classes.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.LocatorException;\r
-import com.att.inno.env.APIException;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.LocatorException;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 public class Post<T> extends AAFClient.Call<T> {\r
        public Post(AAFClient ac, RosettaDF<T> df) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 import java.util.Random;\r
 \r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
 \r
 public class PropertyLocator implements Locator {\r
        private final URI [] orig;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.inno.env.APIException;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.cadi.CadiException;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 public class Put<T> extends AAFClient.Call<T> {\r
        public Put(AAFClient ac, RosettaDF<T> df) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.io.PrintStream;\r
 import java.net.URI;\r
 \r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
 \r
 public abstract class RawClient {\r
        protected static String aafid, aafpass, aafurl;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.util.Pool;\r
-import com.att.inno.env.util.Pool.Pooled;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.util.Pool;\r
+import org.onap.aaf.inno.env.util.Pool.Pooled;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 public abstract class Rcli<CT> {\r
        public static final String BLANK = "";\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 public class Result<T> {\r
        public final int code;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.client;\r
+package org.onap.aaf.cadi.client;\r
 \r
 import java.net.ConnectException;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Locator;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Locator;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 /**\r
  * \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.io.IOException;\r
 \r
 import javax.servlet.http.HttpServletResponse;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.client.EClient;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
 import com.att.aft.dme2.api.DME2Exception;\r
 import com.att.aft.dme2.api.DME2Manager;\r
 import com.att.aft.dme2.handler.DME2RestfulHandler;\r
 import com.att.aft.dme2.handler.DME2RestfulHandler.ResponseInfo;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.EClient;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 public class DEClient implements EClient<DME2Client> {\r
        private DME2Client client;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 import java.io.IOException;\r
 import java.security.GeneralSecurityException;\r
 \r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.client.AbsBasicAuth;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.client.AbsBasicAuth;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.principal.BasicPrincipal;\r
 \r
 public class DME2BasicAuth extends AbsBasicAuth<DME2Client> {\r
        public DME2BasicAuth(String user, String pass, SecurityInfoC<DME2Client> si) throws IOException {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 import java.io.IOException;\r
 \r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Access.Level;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.SecuritySetter;\r
 \r
 public class DME2ClientSS implements SecuritySetter<DME2Client> {\r
        private Access access;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 \r
 import java.net.InetAddress;\r
 import java.util.Comparator;\r
 import java.util.Random;\r
 \r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Access.Level;\r
+\r
 //\r
 import com.att.aft.dme2.api.DME2Exception;\r
 import com.att.aft.dme2.api.DME2Manager;\r
 import com.att.aft.dme2.api.DME2Server;\r
 import com.att.aft.dme2.manager.registry.DME2Endpoint;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
 \r
 public class DME2Locator implements Locator {\r
        private DME2Manager dm;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.client.AbsTransferSS;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.client.AbsTransferSS;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
 \r
 public class DME2TransferSS extends AbsTransferSS<DME2Client> {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 import java.io.IOException;\r
 import java.security.cert.CertificateEncodingException;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 \r
 public class DME2x509SS implements SecuritySetter<DME2Client> {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dme2;\r
+package org.onap.aaf.cadi.dme2;\r
 \r
 import java.net.MalformedURLException;\r
 import java.net.URI;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.client.EClient;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
 import com.att.aft.dme2.api.DME2Exception;\r
 import com.att.aft.dme2.api.DME2Manager;\r
 import com.att.aft.dme2.manager.registry.DME2Endpoint;\r
 import com.att.aft.dme2.request.DmeUniformResource;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.EClient;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
 \r
 /**\r
  * DME2 Rosetta Client\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.dnsloc;\r
+package org.onap.aaf.cadi.dnsloc;\r
 \r
 import java.io.IOException;\r
 import java.net.InetAddress;\r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Access.Level;\r
 \r
 public class DNSLocator implements Locator {\r
        private static enum Status {UNTRIED, OK, INVALID, SLOW};\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.http;\r
+package org.onap.aaf.cadi.http;\r
 \r
 import java.io.IOException;\r
 import java.net.HttpURLConnection;\r
 \r
 import javax.net.ssl.HttpsURLConnection;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.client.AbsBasicAuth;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.principal.BasicPrincipal;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.client.AbsBasicAuth;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
 \r
 public class HBasicAuthSS extends AbsBasicAuth<HttpURLConnection> {\r
        public HBasicAuthSS(Access access, SecurityInfoC<HttpURLConnection> si) throws IOException {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.http;\r
+package org.onap.aaf.cadi.http;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 \r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.EClient;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data;\r
-import com.att.inno.env.Data.TYPE;\r
-import com.att.inno.env.util.Pool.Pooled;\r
-import com.att.rosetta.env.RosettaDF;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.client.EClient;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.util.Pool.Pooled;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
 \r
 /**\r
  * Low Level Http Client Mechanism. Chances are, you want the high level "HRcli"\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.http;\r
+package org.onap.aaf.cadi.http;\r
 \r
 import java.net.ConnectException;\r
 import java.net.HttpURLConnection;\r
 \r
 import javax.net.ssl.SSLHandshakeException;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.client.Retryable;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.client.Retryable;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 public class HMangr {\r
        private String apiVersion;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.http;\r
+package org.onap.aaf.cadi.http;\r
 \r
 import java.net.HttpURLConnection;\r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.client.EClient;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+\r
 import com.att.aft.dme2.api.DME2Exception;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.client.EClient;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.Data.TYPE;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
 \r
 /**\r
  * DME2 Rosetta Client\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.http;\r
+package org.onap.aaf.cadi.http;\r
 \r
 import java.io.IOException;\r
 import java.net.HttpURLConnection;\r
 \r
 import javax.net.ssl.HttpsURLConnection;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.client.AbsTransferSS;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.client.AbsTransferSS;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
 \r
 \r
 public class HTransferSS extends AbsTransferSS<HttpURLConnection> {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.http;\r
+package org.onap.aaf.cadi.http;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.ByteArrayOutputStream;\r
 import javax.net.ssl.HttpsURLConnection;\r
 import javax.net.ssl.X509KeyManager;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.inno.env.APIException;\r
-import com.att.inno.env.util.Chrono;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.util.Chrono;\r
 \r
 \r
 public class HX509SS implements SecuritySetter<HttpURLConnection> {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.locator;\r
+package org.onap.aaf.cadi.locator;\r
 \r
 \r
 import java.net.InetAddress;\r
 import java.util.Comparator;\r
 import java.util.Properties;\r
 import java.util.Random;\r
+\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Access.Level;\r
+\r
 import java.security.SecureRandom;\r
 \r
 //import com.att.aft.dme2.api.DME2Endpoint;\r
 import com.att.aft.dme2.api.DME2Manager;\r
 import com.att.aft.dme2.api.DME2Server;\r
 import com.att.aft.dme2.manager.registry.DME2Endpoint;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.PropAccess;\r
 \r
 public class DME2Locator implements Locator<URI> {\r
        private DME2Manager dm;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.locator;\r
+package org.onap.aaf.cadi.locator;\r
 \r
 import java.io.IOException;\r
 import java.net.InetAddress;\r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.Access.Level;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Access.Level;\r
 \r
 public class DNSLocator implements Locator<URI> {\r
        private static enum Status {UNTRIED, OK, INVALID, SLOW};\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.locator;\r
+package org.onap.aaf.cadi.locator;\r
 \r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.http.HClient;\r
-import com.att.cadi.http.HX509SS;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.http.HClient;\r
+import org.onap.aaf.cadi.http.HX509SS;\r
 \r
 public class HClientHotPeerLocator extends HotPeerLocator<HClient> {\r
        private final HX509SS ss;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.locator;\r
+package org.onap.aaf.cadi.locator;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
-import com.att.cadi.routing.GreatCircle;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.routing.GreatCircle;\r
+\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 /**\r
  * This Locator is to handle Hot Peer load protection, when the Servers are \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.locator;\r
+package org.onap.aaf.cadi.locator;\r
 \r
 import java.io.IOException;\r
 import java.net.InetAddress;\r
 import java.util.Timer;\r
 import java.util.TimerTask;\r
 \r
-import com.att.cadi.Locator;\r
-import com.att.cadi.LocatorException;\r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.LocatorException;\r
+\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 public class PropertyLocator implements Locator<URI> {\r
        private final URI [] orig;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.routing;\r
+package org.onap.aaf.cadi.routing;\r
 \r
-import com.att.inno.env.util.Split;\r
+import org.onap.aaf.inno.env.util.Split;\r
 \r
 public class GreatCircle {\r
        // Note: multiplying by this constant is faster than calling Math equivalent function \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.net.URI;\r
 import java.util.Properties;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.net.URI;\r
 import java.net.URL;\r
 \r
 import org.junit.AfterClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.locator.DNSLocator;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.locator.DNSLocator;\r
 \r
 public class JU_DNSLocator {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.net.URI;\r
 \r
 import org.junit.AfterClass;\r
 import org.junit.Test;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.locator.PropertyLocator;\r
 \r
 import static org.junit.Assert.*;\r
 \r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.locator.PropertyLocator;\r
-\r
 public class JU_PropertyLocator {\r
 \r
        @AfterClass\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.net.URI;\r
 import java.util.Properties;\r
 \r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.dme2.DME2Locator;\r
+\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.dme2.DME2Locator;\r
 \r
 public class PaulUzee {\r
        public static void main(String[] args) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Symm;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Symm;\r
 \r
 public class TestAccess implements Access {\r
        private Symm symm;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.io.FileInputStream;\r
 import java.net.URI;\r
 import java.util.Properties;\r
 \r
+import org.onap.aaf.cadi.Symm;\r
+\r
 import com.att.aft.dme2.api.DME2Client;\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.Symm;\r
 \r
 public class TestDME2Client {\r
        public static void main(String[] args) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.net.URI;\r
 import java.util.Properties;\r
 \r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.dme2.DME2ClientSS;\r
+import org.onap.aaf.cadi.dme2.DRcli;\r
+\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.dme2.DME2ClientSS;\r
-import com.att.cadi.dme2.DRcli;\r
 \r
 public class TestDME2RcliClient {\r
        public static void main(String[] args) {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.client.test;\r
+package org.onap.aaf.client.test;\r
 \r
 import java.net.HttpURLConnection;\r
 import java.net.URI;\r
 import java.util.Properties;\r
 \r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.cadi.client.Rcli;\r
+import org.onap.aaf.cadi.client.Retryable;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.http.HBasicAuthSS;\r
+import org.onap.aaf.cadi.http.HMangr;\r
+import org.onap.aaf.cadi.locator.DME2Locator;\r
+\r
 import com.att.aft.dme2.api.DME2Manager;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Locator.Item;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.SecuritySetter;\r
-import com.att.cadi.client.Future;\r
-import com.att.cadi.client.Rcli;\r
-import com.att.cadi.client.Retryable;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.http.HBasicAuthSS;\r
-import com.att.cadi.http.HMangr;\r
-import com.att.cadi.locator.DME2Locator;\r
-import com.att.inno.env.APIException;\r
+import org.onap.aaf.inno.env.APIException;\r
 \r
 public class TestHClient {\r
        public static void main(String[] args) {\r
 
 -->\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
        <parent>\r
-               <groupId>com.att.cadi</groupId>\r
+               <groupId>org.onap.aaf.cadi</groupId>\r
                <artifactId>parent</artifactId>\r
                <relativePath>..</relativePath>\r
                <version>1.0.0-SNAPSHOT</version>\r
        <packaging>jar</packaging>\r
        <url>https://github.com/att/AAF</url>\r
        <description>CADI</description>\r
-       \r
+       <properties>\r
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+               <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+       </properties>\r
        <dependencies>\r
 \r
                <dependency>\r
                        </execution>\r
                      </executions>\r
                    </plugin>\r
-       \r
-               <plugin>\r
-                       <groupId>org.sonatype.plugins</groupId>\r
-                       <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                       <version>1.6.7</version>\r
-                       <extensions>true</extensions>\r
-                       <configuration>\r
-                       <serverId>ossrhdme</serverId>\r
-                       <nexusUrl>https://oss.sonatype.org/</nexusUrl>\r
-                       <autoReleaseAfterClose>true</autoReleaseAfterClose>\r
-                       </configuration>\r
-               </plugin>\r
+  <plugin>\r
+                               <groupId>org.sonatype.plugins</groupId>\r
+                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                               <version>1.6.7</version>\r
+                               <extensions>true</extensions>\r
+                               <configuration>\r
+                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                                       <serverId>ecomp-staging</serverId>\r
+                               </configuration>\r
+                       </plugin> \r
                </plugins>\r
        </build>\r
-\r
+       <distributionManagement>\r
+               <repository>\r
+                       <id>ecomp-releases</id>\r
+                       <name>AAF Release Repository</name>\r
+                       <url>${nexusproxy}${releaseNexusPath}</url>\r
+               </repository>\r
+               <snapshotRepository>\r
+                       <id>ecomp-snapshots</id>\r
+                       <name>AAF Snapshot Repository</name>\r
+                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
+               </snapshotRepository>\r
+               <site>\r
+                       <id>ecomp-site</id>\r
+                       <url>dav:${nexusproxy}${sitePath}</url>\r
+               </site>\r
+       </distributionManagement>\r
+<pluginRepositories>\r
+        <pluginRepository>\r
+            <id>onap-plugin-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+       \r
+       <repositories>\r
+               <repository>\r
+                       <id>central</id>\r
+                       <name>Maven 2 repository 2</name>\r
+                       <url>http://repo2.maven.org/maven2/</url>\r
+               </repository>\r
+               <repository>\r
+            <id>onap-jar-snapshots</id>\r
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
+        </repository>\r
+               <repository>\r
+                       <id>spring-repo</id>\r
+                       <name>Spring repo</name>\r
+                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
+               </repository>\r
+               <repository>\r
+                       <id>repository.jboss.org-public</id>\r
+                       <name>JBoss.org Maven repository</name>\r
+                       <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
+               </repository>\r
+       </repositories>\r
 </project>\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import javax.crypto.SecretKey;\r
 import javax.crypto.spec.SecretKeySpec;\r
 \r
-import com.att.cadi.util.Chmod;\r
+import org.onap.aaf.cadi.util.Chmod;\r
 \r
 public class AES {\r
        public static final String AES = AES.class.getSimpleName();\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 \r
 public abstract class AbsCachedPrincipal<TAF> implements CachedPrincipal {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 \r
 import java.security.Principal;\r
 import java.util.TreeMap;\r
 import java.util.concurrent.ConcurrentHashMap;\r
 \r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
 \r
 /**\r
  * Implement Fast lookup and Cache for Local User Info\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 /**\r
  * An Interface for testing on Requests to see if we can get a User and Password\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.IOException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.security.Principal;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.security.Principal;\r
 \r
-import com.att.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
 \r
 \r
 public interface CachingLur<PERM extends Permission> extends Lur {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 /**\r
  * CADI Specific Exception\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.security.Principal;\r
 import java.util.ArrayList;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletRequestWrapper;\r
 \r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.filter.NullPermConverter;\r
-import com.att.cadi.filter.PermConverter;\r
-import com.att.cadi.lur.EpiLur;\r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.filter.NullPermConverter;\r
+import org.onap.aaf.cadi.filter.PermConverter;\r
+import org.onap.aaf.cadi.lur.EpiLur;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 \r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.nio.ByteBuffer;\r
 import java.util.ArrayList;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
 import java.net.UnknownHostException;\r
 import java.security.NoSuchAlgorithmException;\r
 \r
-import com.att.cadi.util.Chmod;\r
-import com.att.cadi.util.JsonOutputStream;\r
+import org.onap.aaf.cadi.util.Chmod;\r
+import org.onap.aaf.cadi.util.JsonOutputStream;\r
 \r
 \r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 public interface Connector {\r
        public Lur newLur() throws CadiException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 public interface GetCred {\r
        byte[] getCred();\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.nio.ByteBuffer;\r
 import java.security.MessageDigest;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 public interface Locator<T> {\r
        public T get(Locator.Item item) throws LocatorException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 public class LocatorException extends Exception {\r
        /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.security.Principal;\r
 import java.util.List;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 public interface Permission {\r
        public String permType();\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import java.util.Date;\r
 import java.util.List;\r
 import java.util.Map.Entry;\r
-import java.util.Properties;\r
 \r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfo;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfo;\r
+\r
+import java.util.Properties;\r
 \r
 public class PropAccess implements Access {\r
        private static final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 \r
 public interface Revalidator<TRANS> {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.util.Properties;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 import java.util.Enumeration;\r
 import javax.servlet.FilterConfig;\r
 import javax.servlet.ServletContext;\r
 \r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 public class ServletContextAccess extends PropAccess {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.util.List;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.ByteArrayOutputStream;\r
 import javax.crypto.CipherInputStream;\r
 import javax.crypto.CipherOutputStream;\r
 \r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 /**\r
  * Key Conversion, primarily "Base64"\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.security.Principal;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 \r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 /**\r
  * Change to another Principal based on Trust of caller and User Chain (if desired)\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.security.Principal;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 import java.util.concurrent.ConcurrentHashMap;\r
 \r
-import com.att.cadi.lur.LocalPermission;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
 \r
 /**\r
  * Class to hold info from the User Perspective.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 /**\r
  * Interface to add a User Chain String to Principal\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
 import java.io.IOException;\r
 import java.lang.reflect.Constructor;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Map.Entry;\r
+\r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CachingLur;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.CredVal;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.lur.EpiLur;\r
+import org.onap.aaf.cadi.lur.LocalLur;\r
+import org.onap.aaf.cadi.lur.NullLur;\r
+import org.onap.aaf.cadi.taf.HttpEpiTaf;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.basic.BasicHttpTaf;\r
+import org.onap.aaf.cadi.taf.cert.X509Taf;\r
+import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf;\r
+\r
 import java.util.Properties;\r
 import java.util.TimerTask;\r
 \r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachingLur;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.CredVal;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.TrustChecker;\r
-import com.att.cadi.lur.EpiLur;\r
-import com.att.cadi.lur.LocalLur;\r
-import com.att.cadi.lur.NullLur;\r
-import com.att.cadi.taf.HttpEpiTaf;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.basic.BasicHttpTaf;\r
-import com.att.cadi.taf.cert.X509Taf;\r
-import com.att.cadi.taf.dos.DenialOfServiceTaf;\r
-\r
 /**\r
  * Create a Consistent Configuration mechanism, even when configuration styles are as vastly different as\r
  * Properties vs JavaBeans vs FilterConfigs...\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
 import java.lang.reflect.Method;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Access.Level;\r
 \r
 public interface Get {\r
        public String get(String name, String def, boolean print);\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
-import com.att.cadi.PropAccess;\r
+import org.onap.aaf.cadi.PropAccess;\r
 \r
 public class GetAccess extends PropAccess {\r
        private final Get getter;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
 public class MultiGet implements Get {\r
     private Get[] getters;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 import javax.net.ssl.X509KeyManager;\r
 import javax.net.ssl.X509TrustManager;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.util.MaskFormatException;\r
-import com.att.cadi.util.NetMask;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.util.MaskFormatException;\r
+import org.onap.aaf.cadi.util.NetMask;\r
 \r
 public class SecurityInfo {\r
        private static final String SECURITY_ALGO = "RSA";\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
 import java.io.IOException;\r
 import java.security.GeneralSecurityException;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.SecuritySetter;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.SecuritySetter;\r
 \r
 \r
 public class SecurityInfoC<CLIENT> extends SecurityInfo {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.config;\r
+package org.onap.aaf.cadi.config;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.io.File;\r
 import java.util.Date;\r
 import java.util.HashSet;\r
 \r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.lur.LocalLur;\r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.lur.LocalLur;\r
 \r
 public class UsersDump {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import static java.lang.annotation.ElementType.TYPE;\r
 import static java.lang.annotation.RetentionPolicy.RUNTIME;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import java.io.IOException;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.config.Get;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.config.Get;\r
 \r
 public class AccessGetter implements Get {\r
        private final Access access;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import java.io.FileInputStream;\r
 import java.io.IOException;\r
 \r
 import javax.servlet.ServletContext;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.Get;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.Get;\r
 \r
 public class CadiAccess implements Access {\r
        // constants for a couple of very commonly used strings.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import java.io.IOException;\r
 import java.lang.reflect.Constructor;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.CadiWrap;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.ServletContextAccess;\r
-import com.att.cadi.TrustChecker;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.Get;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TafResp.RESP;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.CadiWrap;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.ServletContextAccess;\r
+import org.onap.aaf.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.Get;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp.RESP;\r
 \r
 /**\r
  * CadiFilter\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import java.io.IOException;\r
 import java.util.ArrayList;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.CadiWrap;\r
-import com.att.cadi.Connector;\r
-import com.att.cadi.CredVal;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.Taf;\r
-import com.att.cadi.TrustChecker;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.lur.EpiLur;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.util.UserChainManip;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.CadiWrap;\r
+import org.onap.aaf.cadi.Connector;\r
+import org.onap.aaf.cadi.CredVal;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.Taf;\r
+import org.onap.aaf.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.lur.EpiLur;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.util.UserChainManip;\r
 \r
 /**\r
  * Encapsulate common HTTP Manipulation Behavior.  It will appropriately set\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import javax.servlet.FilterConfig;\r
 import javax.servlet.ServletContext;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.config.Get;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Get;\r
 \r
 /*\r
  * A private method to query the Filter config and if not exists, return the default.  This\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 import java.io.IOException;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 /**\r
  * PathFilter\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 \r
 /**\r
  * Convert a simplistic, single string Permission into an Enterprise Scoped Perm\r
 
  * POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation\r
  * \r
  */\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 import static java.lang.annotation.ElementType.TYPE;\r
 import static java.lang.annotation.RetentionPolicy.RUNTIME;\r
 \r
 
  * POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation\r
  * \r
  */\r
-package com.att.cadi.filter;\r
+package org.onap.aaf.cadi.filter;\r
 import static java.lang.annotation.ElementType.TYPE;\r
 import static java.lang.annotation.RetentionPolicy.RUNTIME;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur;\r
+package org.onap.aaf.cadi.lur;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.GetCred;\r
-import com.att.cadi.Symm;\r
+import org.onap.aaf.cadi.GetCred;\r
+import org.onap.aaf.cadi.Symm;\r
 \r
 public class ConfigPrincipal implements Principal, GetCred {\r
        private String name;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur;\r
+package org.onap.aaf.cadi.lur;\r
 \r
 import java.security.Principal;\r
 import java.util.List;\r
 \r
-import com.att.cadi.CachingLur;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.CredVal;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.Permission;\r
+import org.onap.aaf.cadi.CachingLur;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.CredVal;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.Permission;\r
 \r
 /**\r
  * EpiLUR\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur;\r
+package org.onap.aaf.cadi.lur;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 import java.util.Set;\r
 import java.util.TreeSet;\r
 \r
-import com.att.cadi.AbsUserCache;\r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CredVal;\r
-import com.att.cadi.Hash;\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.StrLur;\r
-import com.att.cadi.User;\r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.AbsUserCache;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CredVal;\r
+import org.onap.aaf.cadi.Hash;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.StrLur;\r
+import org.onap.aaf.cadi.User;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur;\r
+package org.onap.aaf.cadi.lur;\r
 \r
-import com.att.cadi.Permission;\r
+import org.onap.aaf.cadi.Permission;\r
 \r
 public class LocalPermission implements Permission {\r
        private String key;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur;\r
+package org.onap.aaf.cadi.lur;\r
 \r
 import java.security.Principal;\r
 import java.util.List;\r
 \r
-import com.att.cadi.Lur;\r
-import com.att.cadi.Permission;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.Permission;\r
 \r
 public class NullLur implements Lur {\r
        private static final Permission NULL = new Permission() {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.ByteArrayOutputStream;\r
 import java.io.OutputStream;\r
 import java.util.Date;\r
 \r
-import com.att.cadi.BasicCred;\r
-import com.att.cadi.GetCred;\r
-import com.att.cadi.Symm;\r
+import org.onap.aaf.cadi.BasicCred;\r
+import org.onap.aaf.cadi.GetCred;\r
+import org.onap.aaf.cadi.Symm;\r
 \r
 public class BasicPrincipal extends BearerPrincipal implements GetCred {\r
        private static byte[] basic = "Basic ".getBytes();\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.security.Principal;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.security.Principal;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.io.IOException;\r
 \r
-import com.att.cadi.BasicCred;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.BasicCred;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
 \r
 /**\r
  * Cached Principals need to be able to revalidate in the Background\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 public class TGuardPrincipal extends BearerPrincipal {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.security.Principal;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.security.Principal;\r
 \r
-import com.att.cadi.UserChain;\r
+import org.onap.aaf.cadi.UserChain;\r
 \r
 public class TrustPrincipal extends BearerPrincipal implements UserChain {\r
        private final String name;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.principal;\r
+package org.onap.aaf.cadi.principal;\r
 \r
 import java.io.IOException;\r
 import java.security.cert.CertificateEncodingException;\r
 import java.security.cert.X509Certificate;\r
 import java.util.regex.Pattern;\r
 \r
-import com.att.cadi.GetCred;\r
+import org.onap.aaf.cadi.GetCred;\r
 \r
 public class X509Principal extends BearerPrincipal implements GetCred {\r
        private static final Pattern pattern = Pattern.compile("[a-zA-Z0-9]*\\@[a-zA-Z0-9.]*");\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
+import org.onap.aaf.cadi.Access;\r
 \r
 /**\r
  * AbsTafResp\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Taf;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Taf;\r
 \r
 /**\r
  * EpiTAF\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.net.URI;\r
 import java.security.Principal;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Taf.LifeForm;\r
-import com.att.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.TrustChecker;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.Taf.LifeForm;\r
 \r
 /**\r
  * HttpEpiTaf\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.Taf.LifeForm;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.Taf.LifeForm;\r
 \r
 /**\r
  * A TAF which is in a specific HTTP environment in which the engine implements \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.io.IOException;\r
 import java.net.URI;\r
 \r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.Locator;\r
-import com.att.cadi.Locator.Item;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Locator;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.Locator.Item;\r
 \r
 public class LoginPageTafResp extends AbsTafResp {\r
        private final HttpServletResponse httpResp;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.Taf;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.Taf;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
+import org.onap.aaf.cadi.Access;\r
 \r
 /**\r
  * A Null Pattern for setting responses to "Deny" before configuration is setup.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
+import org.onap.aaf.cadi.Access;\r
 \r
 /**\r
  * A Punt Resp to make it fast and easy for a Taf to respond that it cannot handle a particular kind of\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 public interface Redirectable extends TafResp {\r
        /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.CadiException;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CadiException;\r
 \r
 /**\r
  * Response from Taf objects, which inform users what has happened and/or what should be done\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
+import org.onap.aaf.cadi.Access;\r
 \r
 public class TrustNotTafResp implements TafResp {\r
        private final TafResp delegate;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf;\r
+package org.onap.aaf.cadi.taf;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
+import org.onap.aaf.cadi.Access;\r
 \r
 public class TrustTafResp implements TafResp {\r
        private final TafResp delegate;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.basic;\r
+package org.onap.aaf.cadi.taf.basic;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.BasicCred;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.CredVal;\r
-import com.att.cadi.CredVal.Type;\r
-import com.att.cadi.Taf;\r
-import com.att.cadi.principal.BasicPrincipal;\r
-import com.att.cadi.principal.CachedBasicPrincipal;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TafResp.RESP;\r
-import com.att.cadi.taf.dos.DenialOfServiceTaf;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.BasicCred;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.CredVal;\r
+import org.onap.aaf.cadi.Taf;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.CredVal.Type;\r
+import org.onap.aaf.cadi.principal.BasicPrincipal;\r
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp.RESP;\r
+import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf;\r
 \r
 /**\r
  * BasicHttpTaf\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.basic;\r
+package org.onap.aaf.cadi.taf.basic;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.taf.AbsTafResp;\r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.taf.AbsTafResp;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 public class BasicHttpTafResp extends AbsTafResp implements TafResp {\r
        private HttpServletResponse httpResp;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.cert;\r
+package org.onap.aaf.cadi.taf.cert;\r
 \r
 import java.security.Principal;\r
 import java.security.cert.CertificateException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.cert;\r
+package org.onap.aaf.cadi.taf.cert;\r
 \r
 import java.io.IOException;\r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.taf.AbsTafResp;\r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.taf.AbsTafResp;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 public class X509HttpTafResp extends AbsTafResp implements TafResp {\r
        private RESP status;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.cert;\r
+package org.onap.aaf.cadi.taf.cert;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.ByteArrayOutputStream;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.Taf.LifeForm;\r
-import com.att.cadi.config.Config;\r
-import com.att.cadi.config.SecurityInfoC;\r
-import com.att.cadi.config.SecurityInfo;\r
-import com.att.cadi.lur.LocalPermission;\r
-import com.att.cadi.principal.TGuardPrincipal;\r
-import com.att.cadi.principal.X509Principal;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TafResp.RESP;\r
-import com.att.cadi.util.Split;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.Taf.LifeForm;\r
+import org.onap.aaf.cadi.config.Config;\r
+import org.onap.aaf.cadi.config.SecurityInfo;\r
+import org.onap.aaf.cadi.config.SecurityInfoC;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
+import org.onap.aaf.cadi.principal.TGuardPrincipal;\r
+import org.onap.aaf.cadi.principal.X509Principal;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp.RESP;\r
+import org.onap.aaf.cadi.util.Split;\r
 \r
 public class X509Taf implements HttpTaf {\r
        \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.dos;\r
+package org.onap.aaf.cadi.taf.dos;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Taf.LifeForm;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.PuntTafResp;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TafResp.RESP;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.Taf.LifeForm;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.PuntTafResp;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp.RESP;\r
 \r
 public class DenialOfServiceTaf implements HttpTaf {\r
        private static Map<String, Counter> deniedIP=null, deniedID=null;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.dos;\r
+package org.onap.aaf.cadi.taf.dos;\r
 \r
 import java.io.IOException;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.taf.AbsTafResp;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.taf.AbsTafResp;\r
 \r
 public class DenialOfServiceTafResp extends AbsTafResp  {\r
        private RESP ect;  // Homage to Arethra Franklin\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.localhost;\r
+package org.onap.aaf.cadi.taf.localhost;\r
 \r
 import java.net.InetAddress;\r
 import java.net.NetworkInterface;\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Access.Level;\r
-import com.att.cadi.CachedPrincipal;\r
-import com.att.cadi.CachedPrincipal.Resp;\r
-import com.att.cadi.Taf;\r
-import com.att.cadi.taf.HttpTaf;\r
-import com.att.cadi.taf.TafResp;\r
-import com.att.cadi.taf.TafResp.RESP;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.CachedPrincipal;\r
+import org.onap.aaf.cadi.Taf;\r
+import org.onap.aaf.cadi.Access.Level;\r
+import org.onap.aaf.cadi.CachedPrincipal.Resp;\r
+import org.onap.aaf.cadi.taf.HttpTaf;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.taf.TafResp.RESP;\r
 \r
 /**\r
  * Implement the ability to utilize LocalHost as a TAF.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.taf.localhost;\r
+package org.onap.aaf.cadi.taf.localhost;\r
 \r
 import java.security.Principal;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.taf.TafResp;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.taf.TafResp;\r
 \r
 public class LocalhostTafResp implements TafResp {\r
        private RESP action;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 import java.io.File;\r
 import java.io.IOException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 import java.io.IOException;\r
 import java.io.OutputStream;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 @SuppressWarnings("serial")\r
 public class MaskFormatException extends Exception {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 public interface MyConsole {\r
        public String readLine(String fmt, Object ... args);\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 /* \r
  * NetMask - a class to quickly validate whether a given IP is part of a mask, as defined by bytes or standard String format.\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 /**\r
  * Split by Char, optional Trim\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.IOException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 public class TheConsole implements MyConsole {\r
        @Override\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
-import com.att.cadi.UserChain;\r
+import org.onap.aaf.cadi.UserChain;\r
 \r
 public class UserChainManip {\r
        /** \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.util;\r
+package org.onap.aaf.cadi.util;\r
 \r
 import java.util.List;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse;\r
+package org.onap.aaf.cadi.wsse;\r
 \r
 /**\r
  * Interface to specify an action deep within a parsing tree on a local object\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse;\r
+package org.onap.aaf.cadi.wsse;\r
 \r
 import javax.xml.namespace.QName;\r
 import javax.xml.stream.XMLStreamException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse;\r
+package org.onap.aaf.cadi.wsse;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 \r
 import javax.xml.stream.XMLStreamException;\r
 \r
-import com.att.cadi.BasicCred;\r
+import org.onap.aaf.cadi.BasicCred;\r
 \r
 \r
 /**\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse;\r
+package org.onap.aaf.cadi.wsse;\r
 \r
 import javax.xml.namespace.QName;\r
 import javax.xml.stream.events.XMLEvent;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse;\r
+package org.onap.aaf.cadi.wsse;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.io.IOException;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi;\r
+package org.onap.aaf.cadi;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.ByteArrayOutputStream;\r
 import javax.crypto.CipherOutputStream;\r
 \r
 import org.junit.Test;\r
+import org.onap.aaf.cadi.AES;\r
+import org.onap.aaf.cadi.Symm;\r
 \r
 import junit.framework.Assert;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.test;\r
+package org.onap.aaf.cadi.lur.test;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
 import static junit.framework.Assert.assertFalse;\r
 import java.util.TreeSet;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.CredVal.Type;\r
-import com.att.cadi.Lur;\r
-import com.att.cadi.Permission;\r
-import com.att.cadi.PropAccess;\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.UsersDump;\r
-import com.att.cadi.lur.LocalLur;\r
-import com.att.cadi.lur.LocalPermission;\r
+import org.onap.aaf.cadi.Lur;\r
+import org.onap.aaf.cadi.Permission;\r
+import org.onap.aaf.cadi.PropAccess;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.CredVal.Type;\r
+import org.onap.aaf.cadi.config.UsersDump;\r
+import org.onap.aaf.cadi.lur.LocalLur;\r
+import org.onap.aaf.cadi.lur.LocalPermission;\r
 \r
 public class JU_LocalLur {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.lur.test;\r
+package org.onap.aaf.cadi.lur.test;\r
 \r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 \r
-import com.att.cadi.Access;\r
-import com.att.cadi.Symm;\r
+import org.onap.aaf.cadi.Access;\r
+import org.onap.aaf.cadi.Symm;\r
 \r
 public class TestAccess implements Access {\r
        private Symm symm;\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertNotSame;\r
 import java.io.IOException;\r
 import java.security.SecureRandom;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.Symm;\r
-import com.att.cadi.config.Config;\r
+import org.onap.aaf.cadi.Symm;\r
+import org.onap.aaf.cadi.config.Config;\r
 \r
 \r
 public class JU_Base64 {\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
 \r
 import java.io.IOException;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.BufferedServletInputStream;\r
+import org.onap.aaf.cadi.BufferedServletInputStream;\r
 \r
 public class JU_BufferedServletInputStream {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.Capacitor;\r
+import org.onap.aaf.cadi.Capacitor;\r
 \r
 public class JU_Capacitor {\r
        @Test\r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.CadiException;\r
-import com.att.cadi.Hash;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.Hash;\r
 \r
 import junit.framework.Assert;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.io.File;\r
 import java.io.FileInputStream;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.CmdLine;\r
-import com.att.cadi.Symm;\r
+import org.onap.aaf.cadi.CmdLine;\r
+import org.onap.aaf.cadi.Symm;\r
 \r
 import junit.framework.Assert;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import static org.junit.Assert.*;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.util.UserChainManip;\r
+import org.onap.aaf.cadi.util.UserChainManip;\r
 \r
 public class JU_UserChainManip {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 \r
 import static org.junit.Assert.assertEquals;\r
 \r
 import org.junit.AfterClass;\r
 import org.junit.Test;\r
-\r
-import com.att.cadi.util.Vars;\r
+import org.onap.aaf.cadi.util.Vars;\r
 \r
 public class JU_Vars {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.test;\r
+package org.onap.aaf.cadi.test;\r
 import java.net.InetAddress;\r
 import java.net.UnknownHostException;\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse.test;\r
+package org.onap.aaf.cadi.wsse.test;\r
 \r
 import static junit.framework.Assert.assertEquals;\r
 import static junit.framework.Assert.assertNotNull;\r
 import javax.xml.stream.XMLStreamException;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.BasicCred;\r
-import com.att.cadi.BufferedServletInputStream;\r
-import com.att.cadi.wsse.WSSEParser;\r
+import org.onap.aaf.cadi.BasicCred;\r
+import org.onap.aaf.cadi.BufferedServletInputStream;\r
+import org.onap.aaf.cadi.wsse.WSSEParser;\r
 \r
 public class JU_WSSE_Read {\r
 \r
 
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  * *\r
  ******************************************************************************/\r
-package com.att.cadi.wsse.test;\r
+package org.onap.aaf.cadi.wsse.test;\r
 \r
 import java.io.FileInputStream;\r
 \r
 import javax.xml.stream.events.XMLEvent;\r
 \r
 import org.junit.Test;\r
-\r
-import com.att.cadi.wsse.XEvent;\r
-import com.att.cadi.wsse.XReader;\r
+import org.onap.aaf.cadi.wsse.XEvent;\r
+import org.onap.aaf.cadi.wsse.XReader;\r
 \r
 public class JU_XReader {\r
        @Test\r
 
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
-       <groupId>com.att.cadi</groupId>
+       <groupId>org.onap.aaf.cadi</groupId>
        <artifactId>parent</artifactId>
        <name>CADI Parent POM (Code, Access, Data, Identity)</name>
        <version>1.0.0-SNAPSHOT</version>
                <skipSigning>true</skipSigning>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
-               <project.authClientVersion>2.6</project.authClientVersion>
+               <project.authClientVersion>1.0.0-SNAPSHOT</project.authClientVersion>
                <project.dme2Version>3.1.200</project.dme2Version>
                                <!-- version>2.8.5.8</version -->
                                <!-- version>2.6.20</version -->
                <!-- jetty-version>8.1.7.v20120910</jetty-version -->
                <!-- jetty-version>7.2.0.v20101020</jetty-version -->
                <!-- project.jettyVersion>9.0.3.v20130506</project.jettyVersion -->
+               <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+               <sitePath>/content/sites/site/org/onap/aaf/cadi/${project.artifactId}/${project.version}</sitePath>
        </properties>
-
        <!-- ============================================================== -->
        <!-- Define the major contributors and developers of CADI -->
        <!-- ============================================================== -->
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>com.att.authz</groupId>
+                               <groupId>org.onap.aaf.authz</groupId>
                                <artifactId>authz-client</artifactId>
                                <version>${project.authClientVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-core</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-core</artifactId>
                                <version>${project.version}</version>
                                <classifier>tests</classifier>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-cass</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-aaf</artifactId>
                                <version>${project.version}</version>
                        </dependency> 
 
                    <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-aaf</artifactId>
                                <version>${project.version}</version>
                                <classifier>full</classifier>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-client</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-tomcat</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.cadi</groupId>
+                               <groupId>org.onap.aaf.cadi</groupId>
                                <artifactId>cadi-tguard</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.inno</groupId>
+                               <groupId>org.onap.aaf.inno</groupId>
                                <artifactId>env</artifactId>
                                <version>${project.innoVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>com.att.inno</groupId>
+                               <groupId>org.onap.aaf.inno</groupId>
                                <artifactId>rosetta</artifactId>
                                <version>${project.innoVersion}</version>
                        </dependency>
                    </plugin>
        
  
-               <plugin>
-                       <groupId>org.sonatype.plugins</groupId>
-                       <artifactId>nexus-staging-maven-plugin</artifactId>
-                       <version>1.6.7</version>
-                       <extensions>true</extensions>
-                       <configuration>
-                       <serverId>ossrhdme</serverId>
-                       <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                       <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                       </configuration>
-               </plugin>
                        
                <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                  </formats>
                                </configuration>
                 </plugin>
-       
-                               <!-- Maven surefire plugin for testing -->
-                               <plugin>
-                                       <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>2.17</version>
-                               </plugin>
-                               
-                               
-                               
+
                                <!--This plugin's configuration is used to store Eclipse m2e settings 
                                        only. It has no influence on the Maven build itself. -->
                                <plugin>
                                                </lifecycleMappingMetadata>
                                        </configuration>
                                </plugin>
-                               
+                                 <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>${nexusproxy}</nexusUrl>
+                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                       <serverId>ecomp-staging</serverId>
+                               </configuration>
+                       </plugin> 
                        </plugins>                      
        </build>
-
-
-       <!-- ============================================================== -->
-       <!-- Maven Central Repository Information -->
-       <!-- ============================================================== -->
-       
-       <scm>
-               <connection>https://github.com/att/AAF.git</connection>
-               <developerConnection>${project.scm.connection}</developerConnection>
-               <url>http://github.com/att/AAF/tree/master</url>
-       </scm>
-<distributionManagement>
-               <snapshotRepository>
-                       <id>ossrhdme</id>
-                       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-               </snapshotRepository>
-               <repository>
-                       <id>ossrhdme</id>
-                       <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-               </repository>
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>AAF Release Repository</name>
+                       <url>${nexusproxy}${releaseNexusPath}</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>AAF Snapshot Repository</name>
+                       <url>${nexusproxy}${snapshotNexusPath}</url>
+               </snapshotRepository>
+               <site>
+                       <id>ecomp-site</id>
+                       <url>dav:${nexusproxy}${sitePath}</url>
+               </site>
        </distributionManagement>
+<pluginRepositories>
+        <pluginRepository>
+            <id>onap-plugin-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+       
+       <repositories>
+               <repository>
+                       <id>central</id>
+                       <name>Maven 2 repository 2</name>
+                       <url>http://repo2.maven.org/maven2/</url>
+               </repository>
+               <repository>
+            <id>onap-jar-snapshots</id>
+            <url>https://nexus.onap.org/content/repositories/snapshots</url>
+        </repository>
+               <repository>
+                       <id>spring-repo</id>
+                       <name>Spring repo</name>
+                       <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
+               </repository>
+               <repository>
+                       <id>repository.jboss.org-public</id>
+                       <name>JBoss.org Maven repository</name>
+                       <url>https://repository.jboss.org/nexus/content/groups/public</url>
+               </repository>
+       </repositories>
 </project>