From: sg481n Date: Fri, 25 Aug 2017 05:57:24 +0000 (-0400) Subject: Update project structure for aaf/cadi X-Git-Tag: v1.0.0~22 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=62c4eb45e157d502463d797c1353802ca8e1e307;p=aaf%2Fcadi.git Update project structure for aaf/cadi Update project structure from com.att to org.onap and add distribution management and staging plugin. Issue-id: AAF-22 Change-Id: Idf2b591139e38921ad28782a51486714a05dee92 Signed-off-by: sg481n --- diff --git a/aaf/pom.xml b/aaf/pom.xml index ca4f30a..4545082 100644 --- a/aaf/pom.xml +++ b/aaf/pom.xml @@ -22,7 +22,7 @@ --> - com.att.cadi + org.onap.aaf.cadi parent 1.0.0-SNAPSHOT .. @@ -34,19 +34,29 @@ https://github.com/att/AAF CADI cadi-aaf + + UTF-8 + 1.0.0-SNAPSHOT + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + + - com.att.authz + org.onap.aaf.authz authz-client - + - com.att.cadi + org.onap.aaf.cadi cadi-client - com.att.cadi + org.onap.aaf.cadi cadi-client @@ -88,7 +98,7 @@ tests - com.att.cadi.cm.CmAgent + org.onap.aaf.cadi.cm.CmAgent @@ -182,7 +192,61 @@ - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + diff --git a/aaf/src/main/java/Examples.java b/aaf/src/main/java/Examples.java deleted file mode 100644 index 7ea379b..0000000 --- a/aaf/src/main/java/Examples.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START==================================================== - * * org.onap.aaf - * * =========================================================================== - * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * * =========================================================================== - * * Licensed under the Apache License, Version 2.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * * - * * http://www.apache.org/licenses/LICENSE-2.0 - * * - * * Unless required by applicable law or agreed to in writing, software - * * distributed under the License is distributed on an "AS IS" BASIS, - * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * * See the License for the specific language governing permissions and - * * limitations under the License. - * * ============LICENSE_END==================================================== - * * - * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * * - ******************************************************************************/ -import com.att.rosetta.env.RosettaEnv; - -public class Examples { - public static void main(String[] args) { - if(args.length<1) { - System.out.println("Usage: Examples [\"optional\" - will show optional fields]"); - } else { - boolean options = args.length>1&&"optional".equals(args[1]); - try { - RosettaEnv env = new RosettaEnv(); - System.out.println(com.att.cadi.aaf.client.Examples.print(env, args[0], options)); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - } - } - - -} diff --git a/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java similarity index 95% rename from aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java index 79dd9ee..7cefc26 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf; +package org.onap.aaf.cadi.aaf; -import com.att.cadi.Permission; +import org.onap.aaf.cadi.Permission; /** * A Class that understands the AAF format of Permission (name/type/action) diff --git a/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java similarity index 89% rename from aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java index c7f0e2c..2d1b88f 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf; +package org.onap.aaf.cadi.aaf; import java.security.Principal; import java.util.regex.Pattern; -import com.att.cadi.Transmutate; -import com.att.cadi.lur.ConfigPrincipal; -import com.att.cadi.principal.BasicPrincipal; -import com.att.cadi.principal.CSPPrincipal_T; +import org.onap.aaf.cadi.Transmutate; +import org.onap.aaf.cadi.lur.ConfigPrincipal; +import org.onap.aaf.cadi.principal.BasicPrincipal; +import org.onap.aaf.cadi.principal.CSPPrincipal_T; /** * AAFTransmutate diff --git a/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java similarity index 91% rename from aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java index 7508522..daac0c3 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf; +package org.onap.aaf.cadi.aaf; import java.io.IOException; import java.io.PrintStream; @@ -33,29 +33,30 @@ import java.net.URI; import java.net.UnknownHostException; import java.util.Date; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.aaf.v2_0.AAFCon; +import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.http.HBasicAuthSS; +import org.onap.aaf.cadi.http.HClient; +import org.onap.aaf.cadi.http.HX509SS; +import org.onap.aaf.cadi.locator.DME2Locator; +import org.onap.aaf.cadi.locator.PropertyLocator; + import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.CadiException; -import com.att.cadi.Locator; -import com.att.cadi.Locator.Item; -import com.att.cadi.LocatorException; -import com.att.cadi.Lur; -import com.att.cadi.PropAccess; -import com.att.cadi.SecuritySetter; -import com.att.cadi.TrustChecker; -import com.att.cadi.aaf.v2_0.AAFCon; -import com.att.cadi.aaf.v2_0.AAFConDME2; -import com.att.cadi.client.Future; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.http.HBasicAuthSS; -import com.att.cadi.http.HClient; -import com.att.cadi.http.HX509SS; -import com.att.cadi.locator.DME2Locator; -import com.att.cadi.locator.PropertyLocator; -import com.att.inno.env.APIException; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaEnv; import aaf.v2_0.Perms; diff --git a/aaf/src/main/java/com/att/cadi/aaf/PermEval.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java similarity index 96% rename from aaf/src/main/java/com/att/cadi/aaf/PermEval.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java index 448f60a..896d153 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/PermEval.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf; +package org.onap.aaf.cadi.aaf; -import com.att.inno.env.util.Split; +import org.onap.aaf.inno.env.util.Split; public class PermEval { diff --git a/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java similarity index 88% rename from aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java index e029765..cf2b3a9 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.cert; +package org.onap.aaf.cadi.aaf.cert; import java.security.Principal; @@ -37,18 +37,19 @@ import java.util.TreeMap; import javax.servlet.http.HttpServletRequest; import javax.xml.datatype.XMLGregorianCalendar; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Hash; -import com.att.cadi.aaf.v2_0.AAFCon; -import com.att.cadi.client.Future; -import com.att.cadi.config.Config; -import com.att.cadi.principal.X509Principal; -import com.att.cadi.taf.cert.CertIdentity; -import com.att.cadi.taf.cert.X509Taf; -import com.att.inno.env.APIException; -import com.att.inno.env.util.Chrono; -import com.att.inno.env.util.Split; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Hash; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.aaf.v2_0.AAFCon; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.principal.X509Principal; +import org.onap.aaf.cadi.taf.cert.CertIdentity; +import org.onap.aaf.cadi.taf.cert.X509Taf; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.util.Chrono; +import org.onap.aaf.inno.env.util.Split; import aaf.v2_0.Certs; import aaf.v2_0.Certs.Cert; @@ -127,7 +128,7 @@ public class AAFListedCertIdentity implements CertIdentity { userLookup.add(s); } for(String authMech : authMechanisms) { - Future fusr = aafcon.client(AAF_VERSION).read("/authz/users/perm/com.att.aaf.trust/"+authMech+"/authenticate", Users.class, aafcon.usersDF); + Future fusr = aafcon.client(AAF_VERSION).read("/authz/users/perm/org.onap.aaf.trust/"+authMech+"/authenticate", Users.class, aafcon.usersDF); if(fusr.get(5000)) { List users = fusr.value.getUser(); if(users.isEmpty()) { diff --git a/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java similarity index 88% rename from aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java index 4b619c6..c49113d 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java @@ -20,18 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.client; +package org.onap.aaf.cadi.aaf.client; import java.io.PrintStream; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.util.Vars; + import aaf.v2_0.Error; -import com.att.cadi.client.Future; -import com.att.cadi.util.Vars; -import com.att.inno.env.APIException; -import com.att.inno.env.Data.TYPE; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data.TYPE; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaEnv; public class ErrMessage { private RosettaDF errDF; diff --git a/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java similarity index 94% rename from aaf/src/main/java/com/att/cadi/aaf/client/Examples.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java index d469805..8867862 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.client; +package org.onap.aaf.cadi.aaf.client; import java.lang.reflect.InvocationTargetException; @@ -51,12 +51,12 @@ import aaf.v2_0.UserRoles; import aaf.v2_0.Users; import aaf.v2_0.Users.User; -import com.att.inno.env.APIException; -import com.att.inno.env.Data; -import com.att.inno.env.Data.TYPE; -import com.att.inno.env.util.Chrono; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data; +import org.onap.aaf.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.util.Chrono; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaEnv; public class Examples { public static String print(RosettaEnv env, String nameOrContentType, boolean optional) throws APIException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { diff --git a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java similarity index 86% rename from aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java index ad75dc5..8871969 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.marshal; +package org.onap.aaf.cadi.aaf.marshal; import javax.xml.datatype.XMLGregorianCalendar; import aaf.v2_0.Certs.Cert; -import com.att.rosetta.marshal.FieldDateTime; -import com.att.rosetta.marshal.FieldHexBinary; -import com.att.rosetta.marshal.FieldString; -import com.att.rosetta.marshal.ObjMarshal; +import org.onap.aaf.rosetta.marshal.FieldDateTime; +import org.onap.aaf.rosetta.marshal.FieldHexBinary; +import org.onap.aaf.rosetta.marshal.FieldString; +import org.onap.aaf.rosetta.marshal.ObjMarshal; public class CertMarshal extends ObjMarshal { public CertMarshal() { diff --git a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java similarity index 89% rename from aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java index 3a27a9c..70a1c96 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.marshal; +package org.onap.aaf.cadi.aaf.marshal; import java.util.List; import aaf.v2_0.Certs; import aaf.v2_0.Certs.Cert; -import com.att.rosetta.marshal.ObjArray; -import com.att.rosetta.marshal.ObjMarshal; +import org.onap.aaf.rosetta.marshal.ObjArray; +import org.onap.aaf.rosetta.marshal.ObjMarshal; public class CertsMarshal extends ObjMarshal { diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java similarity index 89% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java index 33005a3..6d6d947 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java @@ -20,23 +20,24 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.io.IOException; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.GetCred; +import org.onap.aaf.cadi.Hash; +import org.onap.aaf.cadi.User; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.lur.ConfigPrincipal; + import com.att.aft.dme2.api.DME2Exception; -import com.att.cadi.AbsUserCache; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CadiException; -import com.att.cadi.GetCred; -import com.att.cadi.Hash; -import com.att.cadi.User; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.cadi.config.Config; -import com.att.cadi.lur.ConfigPrincipal; -import com.att.inno.env.APIException; +import org.onap.aaf.inno.env.APIException; public class AAFAuthn extends AbsUserCache { private AAFCon con; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java similarity index 88% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java index a9d53f3..3ec6fed 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.net.URI; import java.security.Principal; @@ -30,30 +30,31 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -import com.att.cadi.AbsUserCache; -import com.att.cadi.CadiException; -import com.att.cadi.CadiWrap; -import com.att.cadi.Connector; -import com.att.cadi.LocatorException; -import com.att.cadi.Lur; -import com.att.cadi.PropAccess; -import com.att.cadi.SecuritySetter; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.aaf.marshal.CertsMarshal; -import com.att.cadi.client.AbsBasicAuth; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.cadi.client.Retryable; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.lur.EpiLur; -import com.att.cadi.principal.BasicPrincipal; -import com.att.cadi.util.Vars; -import com.att.inno.env.APIException; -import com.att.inno.env.Data.TYPE; -import com.att.inno.env.util.Split; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.CadiWrap; +import org.onap.aaf.cadi.Connector; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.marshal.CertsMarshal; +import org.onap.aaf.cadi.client.AbsBasicAuth; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.lur.EpiLur; +import org.onap.aaf.cadi.principal.BasicPrincipal; +import org.onap.aaf.cadi.util.Vars; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.util.Split; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaEnv; import aaf.v2_0.Certs; import aaf.v2_0.Error; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java similarity index 88% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java index 6fce97a..2757efc 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.io.IOException; import java.net.ConnectException; @@ -30,23 +30,24 @@ import java.security.GeneralSecurityException; import java.security.Principal; import java.util.Properties; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.dme2.DME2BasicAuth; +import org.onap.aaf.cadi.dme2.DME2TransferSS; +import org.onap.aaf.cadi.dme2.DME2x509SS; +import org.onap.aaf.cadi.dme2.DRcli; +import org.onap.aaf.cadi.principal.BasicPrincipal; + import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.CadiException; -import com.att.cadi.LocatorException; -import com.att.cadi.PropAccess; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.Rcli; -import com.att.cadi.client.Retryable; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.dme2.DME2BasicAuth; -import com.att.cadi.dme2.DME2TransferSS; -import com.att.cadi.dme2.DME2x509SS; -import com.att.cadi.dme2.DRcli; -import com.att.cadi.principal.BasicPrincipal; -import com.att.inno.env.APIException; +import org.onap.aaf.inno.env.APIException; public class AAFConDME2 extends AAFCon{ private DME2Manager manager; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java similarity index 85% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java index e126f08..5a38b0c 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.io.IOException; import java.net.HttpURLConnection; @@ -28,24 +28,25 @@ import java.net.URI; import java.security.GeneralSecurityException; import java.security.Principal; -import com.att.cadi.CadiException; -import com.att.cadi.Locator; -import com.att.cadi.Locator.Item; -import com.att.cadi.LocatorException; -import com.att.cadi.PropAccess; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.AbsTransferSS; -import com.att.cadi.client.Rcli; -import com.att.cadi.client.Retryable; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.http.HBasicAuthSS; -import com.att.cadi.http.HMangr; -import com.att.cadi.http.HRcli; -import com.att.cadi.http.HTransferSS; -import com.att.cadi.http.HX509SS; -import com.att.cadi.principal.BasicPrincipal; -import com.att.inno.env.APIException; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.client.AbsTransferSS; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.http.HBasicAuthSS; +import org.onap.aaf.cadi.http.HMangr; +import org.onap.aaf.cadi.http.HRcli; +import org.onap.aaf.cadi.http.HTransferSS; +import org.onap.aaf.cadi.http.HX509SS; +import org.onap.aaf.cadi.principal.BasicPrincipal; + +import org.onap.aaf.inno.env.APIException; public class AAFConHttp extends AAFCon { private final HMangr hman; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java similarity index 89% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java index 7188224..520d7ab 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java @@ -20,28 +20,29 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.net.ConnectException; import java.net.URISyntaxException; import java.security.Principal; import java.util.Map; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.User; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; +import org.onap.aaf.cadi.lur.LocalPermission; + import com.att.aft.dme2.api.DME2Exception; -import com.att.cadi.AbsUserCache; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.CadiException; -import com.att.cadi.Permission; -import com.att.cadi.User; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.cadi.client.Retryable; -import com.att.cadi.lur.LocalPermission; -import com.att.inno.env.APIException; -import com.att.inno.env.util.Split; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.util.Split; import aaf.v2_0.Perm; import aaf.v2_0.Perms; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java similarity index 86% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java index 4e189ce..fb92108 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.io.IOException; import java.security.Principal; @@ -28,23 +28,23 @@ import java.security.Principal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.AbsUserCache; -import com.att.cadi.Access.Level; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.GetCred; -import com.att.cadi.Hash; -import com.att.cadi.Taf.LifeForm; -import com.att.cadi.User; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.cadi.principal.BasicPrincipal; -import com.att.cadi.principal.CachedBasicPrincipal; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TafResp.RESP; -import com.att.cadi.taf.basic.BasicHttpTafResp; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.GetCred; +import org.onap.aaf.cadi.Hash; +import org.onap.aaf.cadi.User; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.Taf.LifeForm; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.principal.BasicPrincipal; +import org.onap.aaf.cadi.principal.CachedBasicPrincipal; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp.RESP; +import org.onap.aaf.cadi.taf.basic.BasicHttpTafResp; public class AAFTaf extends AbsUserCache implements HttpTaf { // private static final String INVALID_AUTH_TOKEN = "Invalid Auth Token"; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java similarity index 86% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java index 5ee3199..c7644a5 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java @@ -20,21 +20,22 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import javax.servlet.http.HttpServletRequest ; -import com.att.cadi.Access; -import com.att.cadi.Lur; -import com.att.cadi.TrustChecker; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.config.Config; -import com.att.cadi.principal.TrustPrincipal; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TrustNotTafResp; -import com.att.cadi.taf.TrustTafResp; -import com.att.inno.env.Env; -import com.att.inno.env.util.Split; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.principal.TrustPrincipal; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TrustNotTafResp; +import org.onap.aaf.cadi.taf.TrustTafResp; + +import org.onap.aaf.inno.env.Env; +import org.onap.aaf.inno.env.util.Split; public class AAFTrustChecker implements TrustChecker { private final String tag, id; diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java similarity index 91% rename from aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java rename to aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java index 297ad8a..5bcf527 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.v2_0; +package org.onap.aaf.cadi.aaf.v2_0; import java.net.URISyntaxException; import java.security.Principal; @@ -28,19 +28,20 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.CachingLur; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.StrLur; +import org.onap.aaf.cadi.Transmutate; +import org.onap.aaf.cadi.User; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.AAFTransmutate; +import org.onap.aaf.cadi.config.Config; + import com.att.aft.dme2.api.DME2Exception; -import com.att.cadi.AbsUserCache; -import com.att.cadi.Access.Level; -import com.att.cadi.CachingLur; -import com.att.cadi.Permission; -import com.att.cadi.StrLur; -import com.att.cadi.Transmutate; -import com.att.cadi.User; -import com.att.cadi.config.Config; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.aaf.AAFTransmutate; -import com.att.inno.env.APIException; -import com.att.inno.env.util.Split; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.util.Split; public abstract class AbsAAFLur extends AbsUserCache implements StrLur, CachingLur { protected static final byte[] BLANK_PASSWORD = new byte[0]; diff --git a/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java similarity index 93% rename from aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java index 512be78..af50682 100644 --- a/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.File; import java.io.FileOutputStream; @@ -34,12 +34,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.att.cadi.CadiException; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; -import com.att.cadi.util.Chmod; -import com.att.inno.env.Trans; -import com.att.inno.env.util.Chrono; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.util.Chmod; + +import org.onap.aaf.inno.env.Trans; +import org.onap.aaf.inno.env.util.Chrono; import certman.v1_0.Artifacts.Artifact; import certman.v1_0.CertInfo; diff --git a/aaf/src/main/java/com/att/cadi/cm/CertException.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java similarity index 95% rename from aaf/src/main/java/com/att/cadi/cm/CertException.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java index ce38c21..bac4a17 100644 --- a/aaf/src/main/java/com/att/cadi/cm/CertException.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; public class CertException extends Exception { diff --git a/aaf/src/main/java/com/att/cadi/cm/CmAgent.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java similarity index 94% rename from aaf/src/main/java/com/att/cadi/cm/CmAgent.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java index 0240962..15ed5d0 100644 --- a/aaf/src/main/java/com/att/cadi/cm/CmAgent.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.File; import java.io.FileInputStream; @@ -36,25 +36,27 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; + +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.aaf.client.ErrMessage; +import org.onap.aaf.cadi.aaf.v2_0.AAFCon; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.http.HBasicAuthSS; +import org.onap.aaf.cadi.sso.AAFSSO; + import java.util.Properties; -import com.att.cadi.PropAccess; -import com.att.cadi.Symm; -import com.att.cadi.aaf.client.ErrMessage; -import com.att.cadi.aaf.v2_0.AAFCon; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.client.Future; -import com.att.cadi.config.Config; -import com.att.cadi.http.HBasicAuthSS; -import com.att.cadi.sso.AAFSSO; -import com.att.inno.env.Data.TYPE; -import com.att.inno.env.Env; -import com.att.inno.env.TimeTaken; -import com.att.inno.env.Trans; -import com.att.inno.env.util.Chrono; -import com.att.inno.env.util.Split; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.Env; +import org.onap.aaf.inno.env.TimeTaken; +import org.onap.aaf.inno.env.Trans; +import org.onap.aaf.inno.env.util.Chrono; +import org.onap.aaf.inno.env.util.Split; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaEnv; import certman.v1_0.Artifacts; import certman.v1_0.Artifacts.Artifact; diff --git a/aaf/src/main/java/com/att/cadi/cm/Factory.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java similarity index 95% rename from aaf/src/main/java/com/att/cadi/cm/Factory.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java index 85b5dfb..1d488de 100644 --- a/aaf/src/main/java/com/att/cadi/cm/Factory.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -60,10 +60,11 @@ import java.util.List; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; -import com.att.cadi.Symm; -import com.att.inno.env.Env; -import com.att.inno.env.TimeTaken; -import com.att.inno.env.Trans; +import org.onap.aaf.cadi.Symm; + +import org.onap.aaf.inno.env.Env; +import org.onap.aaf.inno.env.TimeTaken; +import org.onap.aaf.inno.env.Trans; public class Factory { private static final String PRIVATE_KEY_HEADER = "PRIVATE KEY"; diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java similarity index 91% rename from aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java index 60434c3..a89b901 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java @@ -20,13 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import certman.v1_0.Artifacts.Artifact; import certman.v1_0.CertInfo; -import com.att.cadi.CadiException; -import com.att.inno.env.Trans; +import org.onap.aaf.cadi.CadiException; + +import org.onap.aaf.inno.env.Trans; public interface PlaceArtifact { public boolean place(Trans trans, CertInfo cert, Artifact arti) throws CadiException; diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java similarity index 90% rename from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java index c9145ec..eaefd58 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java @@ -20,16 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.File; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.util.Chmod; + import certman.v1_0.Artifacts.Artifact; import certman.v1_0.CertInfo; -import com.att.cadi.CadiException; -import com.att.cadi.util.Chmod; -import com.att.inno.env.Trans; +import org.onap.aaf.inno.env.Trans; public class PlaceArtifactInFiles extends ArtifactDir { @Override diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java similarity index 93% rename from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java index 61374e9..ddda1db 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.File; import java.security.KeyStore; @@ -29,11 +29,12 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.Collection; -import com.att.cadi.CadiException; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; -import com.att.cadi.util.Chmod; -import com.att.inno.env.Trans; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.util.Chmod; + +import org.onap.aaf.inno.env.Trans; import certman.v1_0.Artifacts.Artifact; import certman.v1_0.CertInfo; diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java similarity index 94% rename from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java index 4c2c900..162d745 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.PrintStream; import certman.v1_0.Artifacts.Artifact; import certman.v1_0.CertInfo; -import com.att.inno.env.Trans; +import org.onap.aaf.inno.env.Trans; public class PlaceArtifactOnStream implements PlaceArtifact { private PrintStream out; diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java similarity index 93% rename from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java rename to aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java index 714b233..d1b3141 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java @@ -20,15 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.cm; +package org.onap.aaf.cadi.cm; import java.io.File; -import com.att.cadi.CadiException; -import com.att.cadi.util.Chmod; -import com.att.inno.env.Trans; -import com.att.inno.env.util.Chrono; -import com.att.inno.env.util.Split; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.util.Chmod; + +import org.onap.aaf.inno.env.Trans; +import org.onap.aaf.inno.env.util.Chrono; +import org.onap.aaf.inno.env.util.Split; import certman.v1_0.Artifacts.Artifact; import certman.v1_0.CertInfo; diff --git a/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java b/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java similarity index 92% rename from aaf/src/main/java/com/att/cadi/sso/AAFSSO.java rename to aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java index 4f66dd2..ed3254b 100644 --- a/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.sso; +package org.onap.aaf.cadi.sso; import java.io.File; import java.io.FileInputStream; @@ -33,14 +33,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import com.att.cadi.Access.Level; -import com.att.cadi.CadiException; -import com.att.cadi.PropAccess; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; -import com.att.cadi.util.MyConsole; -import com.att.cadi.util.SubStandardConsole; -import com.att.cadi.util.TheConsole; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.util.MyConsole; +import org.onap.aaf.cadi.util.SubStandardConsole; +import org.onap.aaf.cadi.util.TheConsole; public class AAFSSO { diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java similarity index 88% rename from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java rename to aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java index d5f92c1..69c9688 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.aaf.test; +package org.onap.aaf.cadi.lur.aaf.test; import java.io.BufferedReader; import java.io.File; @@ -35,16 +35,15 @@ import java.util.Properties; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.cadi.Permission; -import com.att.cadi.PropAccess; -import com.att.cadi.aaf.v2_0.AAFAuthn; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.aaf.v2_0.AAFLurPerm; -import com.att.cadi.aaf.v2_0.AAFTaf; -import com.att.cadi.config.Config; -import com.att.cadi.locator.DNSLocator; -import com.att.cadi.principal.CachedBasicPrincipal; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm; +import org.onap.aaf.cadi.aaf.v2_0.AAFTaf; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.locator.DNSLocator; +import org.onap.aaf.cadi.principal.CachedBasicPrincipal; import junit.framework.Assert; diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java similarity index 93% rename from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java rename to aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java index f85a4e2..bd4e162 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.aaf.test; +package org.onap.aaf.cadi.lur.aaf.test; import static org.junit.Assert.assertEquals; @@ -50,21 +50,20 @@ import javax.servlet.http.Part; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.cadi.CadiException; -import com.att.cadi.Lur; -import com.att.cadi.Permission; -import com.att.cadi.PropAccess; -import com.att.cadi.Symm; -import com.att.cadi.Taf.LifeForm; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.aaf.v2_0.AAFLurPerm; -import com.att.cadi.aaf.v2_0.AAFTaf; -import com.att.cadi.locator.DNSLocator; -import com.att.cadi.lur.ConfigPrincipal; -import com.att.cadi.lur.LocalPermission; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.Taf.LifeForm; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm; +import org.onap.aaf.cadi.aaf.v2_0.AAFTaf; +import org.onap.aaf.cadi.locator.DNSLocator; +import org.onap.aaf.cadi.lur.ConfigPrincipal; +import org.onap.aaf.cadi.lur.LocalPermission; +import org.onap.aaf.cadi.taf.TafResp; public class JU_Lur2_0Call { private static AAFConHttp aaf; diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java similarity index 96% rename from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java rename to aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java index 8dee6cf..d60eedb 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java @@ -20,14 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.aaf.test; +package org.onap.aaf.cadi.lur.aaf.test; import static org.junit.Assert.*; import org.junit.AfterClass; import org.junit.Test; - -import com.att.cadi.aaf.PermEval; +import org.onap.aaf.cadi.aaf.PermEval; public class JU_PermEval { diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java similarity index 89% rename from aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java rename to aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java index c4f5f7c..ef9dc36 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java @@ -20,21 +20,21 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.aaf.test; +package org.onap.aaf.cadi.lur.aaf.test; import java.security.Principal; import java.util.ArrayList; import java.util.List; -import com.att.cadi.Access; -import com.att.cadi.Permission; -import com.att.cadi.PropAccess; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.aaf.v2_0.AAFAuthn; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.aaf.v2_0.AAFLurPerm; -import com.att.cadi.config.Config; -import com.att.cadi.locator.PropertyLocator; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.locator.PropertyLocator; public class MultiThreadPermHit { public static void main(String args[]) { diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java similarity index 92% rename from aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java rename to aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java index 7d83625..2af452d 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.aaf.test; +package org.onap.aaf.cadi.lur.aaf.test; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; -import com.att.cadi.Access; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; public class TestAccess implements Access { private Symm symm; diff --git a/aaf/src/test/java/com/att/aaf/content/JU_Content.java b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java similarity index 91% rename from aaf/src/test/java/com/att/aaf/content/JU_Content.java rename to aaf/src/test/java/org/onap/aaf/content/JU_Content.java index 80215c9..6691f84 100644 --- a/aaf/src/test/java/com/att/aaf/content/JU_Content.java +++ b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.content; +package org.onap.aaf.content; import java.io.StringReader; @@ -30,9 +30,9 @@ import org.junit.Test; import aaf.v2_0.Error; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaData; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaData; +import org.onap.aaf.rosetta.env.RosettaEnv; public class JU_Content { diff --git a/aaf/src/test/java/com/att/aaf/example/CadiTest.java b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java similarity index 85% rename from aaf/src/test/java/com/att/aaf/example/CadiTest.java rename to aaf/src/test/java/org/onap/aaf/example/CadiTest.java index f50d6ac..34ed858 100644 --- a/aaf/src/test/java/com/att/aaf/example/CadiTest.java +++ b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java @@ -20,17 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.example; +package org.onap.aaf.example; import java.net.HttpURLConnection; import java.net.URI; -import com.att.cadi.Access; -import com.att.cadi.PropAccess; -import com.att.cadi.client.Future; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.http.HClient; -import com.att.cadi.http.HX509SS; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.http.HClient; +import org.onap.aaf.cadi.http.HX509SS; public class CadiTest { public static void main(String args[]) { diff --git a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java similarity index 88% rename from aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java rename to aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java index 53f8c8e..65972cd 100644 --- a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java +++ b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.example; +package org.onap.aaf.example; -import com.att.cadi.PropAccess; -import com.att.cadi.aaf.v2_0.AAFAuthn; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.locator.DNSLocator; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.locator.DNSLocator; public class ExampleAuthCheck { public static void main(String args[]) { diff --git a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java similarity index 89% rename from aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java rename to aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java index 5f6179e..f83b15b 100644 --- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java +++ b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java @@ -20,19 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.example; +package org.onap.aaf.example; import java.security.Principal; import java.util.ArrayList; import java.util.List; -import com.att.cadi.Permission; -import com.att.cadi.PropAccess; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.aaf.v2_0.AAFAuthn; -import com.att.cadi.aaf.v2_0.AAFCon; -import com.att.cadi.aaf.v2_0.AAFConDME2; -import com.att.cadi.aaf.v2_0.AAFLurPerm; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn; +import org.onap.aaf.cadi.aaf.v2_0.AAFCon; +import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2; +import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm; public class ExamplePerm2_0 { public static void main(String args[]) { diff --git a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java similarity index 90% rename from aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java rename to aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java index 5ebbe9f..f6024a5 100644 --- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java +++ b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java @@ -20,19 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.example; +package org.onap.aaf.example; import java.security.Principal; import java.util.ArrayList; import java.util.List; -import com.att.cadi.Permission; -import com.att.cadi.PropAccess; -import com.att.cadi.aaf.AAFPermission; -import com.att.cadi.aaf.v2_0.AAFAuthn; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.aaf.v2_0.AAFLurPerm; -import com.att.cadi.locator.DNSLocator; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm; +import org.onap.aaf.cadi.locator.DNSLocator; public class ExamplePerm2_0_DME2 { public static void main(String args[]) { diff --git a/aaf/src/test/java/com/att/aaf/example/X509Test.java b/aaf/src/test/java/org/onap/aaf/example/X509Test.java similarity index 88% rename from aaf/src/test/java/com/att/aaf/example/X509Test.java rename to aaf/src/test/java/org/onap/aaf/example/X509Test.java index 517393f..ad5d4b2 100644 --- a/aaf/src/test/java/com/att/aaf/example/X509Test.java +++ b/aaf/src/test/java/org/onap/aaf/example/X509Test.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.example; +package org.onap.aaf.example; import java.security.Principal; -import com.att.cadi.PropAccess; -import com.att.cadi.aaf.v2_0.AAFConHttp; -import com.att.cadi.aaf.v2_0.AAFLurPerm; -import com.att.cadi.client.Future; -import com.att.cadi.locator.DNSLocator; -import com.att.cadi.lur.LocalPermission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp; +import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.locator.DNSLocator; +import org.onap.aaf.cadi.lur.LocalPermission; public class X509Test { public static void main(String args[]) { diff --git a/cass/pom.xml b/cass/pom.xml index 4e07ae8..9af30fa 100644 --- a/cass/pom.xml +++ b/cass/pom.xml @@ -22,7 +22,7 @@ --> - com.att.cadi + org.onap.aaf.cadi parent 1.0.0-SNAPSHOT .. @@ -34,10 +34,18 @@ https://github.com/att/AAF CADI cadi-cass - + + UTF-8 + 1.0.0-SNAPSHOT + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + - com.att.cadi + org.onap.aaf.cadi cadi-aaf @@ -96,19 +104,61 @@ - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + - + + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java similarity index 94% rename from cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java rename to cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java index e847bd0..30d979a 100644 --- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java +++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java @@ -20,13 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.cass; +package org.onap.aaf.cadi.aaf.cass; import java.security.Principal; import org.apache.cassandra.auth.AuthenticatedUser; - -import com.att.cadi.Access; +import org.onap.aaf.cadi.Access; public class AAFAuthenticatedUser extends AuthenticatedUser implements Principal { private boolean anonymous = false, supr=false, local=false; diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java similarity index 94% rename from cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java rename to cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java index 631a3fa..6b8b29d 100644 --- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java +++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.cass; +package org.onap.aaf.cadi.aaf.cass; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -34,11 +34,10 @@ import org.apache.cassandra.auth.ISaslAwareAuthenticator; import org.apache.cassandra.exceptions.AuthenticationException; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.RequestExecutionException; - -import com.att.cadi.Access.Level; -import com.att.cadi.CredVal.Type; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CredVal.Type; +import org.onap.aaf.cadi.config.Config; public class AAFAuthenticator extends AAFBase implements ISaslAwareAuthenticator { diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java similarity index 94% rename from cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java rename to cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java index 650e570..bea0e86 100644 --- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java +++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.cass; +package org.onap.aaf.cadi.aaf.cass; import java.util.ArrayList; import java.util.HashSet; @@ -33,10 +33,9 @@ import org.apache.cassandra.auth.Permission; import org.apache.cassandra.auth.PermissionDetails; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; - -import com.att.cadi.Access.Level; -import com.att.cadi.aaf.v2_0.AbsAAFLur; -import com.att.cadi.lur.LocalPermission; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur; +import org.onap.aaf.cadi.lur.LocalPermission; public class AAFAuthorizer extends AAFBase implements IAuthorizer { // Returns every permission on the resource granted to the user. diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java similarity index 89% rename from cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java rename to cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java index 4d82a6b..e422234 100644 --- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java +++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.cass; +package org.onap.aaf.cadi.aaf.cass; import java.io.File; import java.io.FileInputStream; @@ -34,18 +34,17 @@ import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.ConfigurationException; - -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Lur; -import com.att.cadi.SLF4JAccess; -import com.att.cadi.aaf.v2_0.AAFAuthn; -import com.att.cadi.aaf.v2_0.AAFCon; -import com.att.cadi.aaf.v2_0.AbsAAFLur; -import com.att.cadi.config.Config; -import com.att.cadi.lur.EpiLur; -import com.att.cadi.lur.LocalLur; -import com.att.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.SLF4JAccess; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.aaf.AAFPermission; +import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn; +import org.onap.aaf.cadi.aaf.v2_0.AAFCon; +import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.lur.EpiLur; +import org.onap.aaf.cadi.lur.LocalLur; public abstract class AAFBase { protected static final Set options; diff --git a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java similarity index 92% rename from cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java rename to cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java index 0eb95be..bedfa25 100644 --- a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java +++ b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.aaf.cass.test; +package org.onap.aaf.cadi.aaf.cass.test; import java.util.HashMap; import java.util.Map; @@ -33,9 +33,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.cadi.aaf.cass.AAFAuthenticator; -import com.att.cadi.aaf.cass.AAFAuthorizer; +import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator; +import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer; public class JU_CASS { diff --git a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java similarity index 92% rename from cass/src/test/java/com/att/aaf/cass/JU_CASS.java rename to cass/src/test/java/org/onap/aaf/cass/JU_CASS.java index 9eca242..f5ee310 100644 --- a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java +++ b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.aaf.cass; +package org.onap.aaf.cass; import java.util.HashMap; import java.util.Map; @@ -33,9 +33,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; - -import com.att.cadi.aaf.cass.AAFAuthenticator; -import com.att.cadi.aaf.cass.AAFAuthorizer; +import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator; +import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer; public class JU_CASS { diff --git a/client/pom.xml b/client/pom.xml index 1b0d6e3..45615cb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ --> - com.att.cadi + org.onap.aaf.cadi parent 1.0.0-SNAPSHOT .. @@ -34,14 +34,22 @@ https://github.com/att/AAF CADI 4.0.0 - + + UTF-8 + 1.0.0-SNAPSHOT + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + - com.att.inno + org.onap.aaf.inno rosetta - com.att.cadi + org.onap.aaf.cadi cadi-core @@ -89,19 +97,61 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + diff --git a/client/src/main/java/com/att/cadi/client/AAFClient.java b/client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java similarity index 89% rename from client/src/main/java/com/att/cadi/client/AAFClient.java rename to client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java index 3f8fb47..cb6299b 100644 --- a/client/src/main/java/com/att/cadi/client/AAFClient.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java @@ -20,22 +20,23 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.net.HttpURLConnection; import java.util.HashMap; import java.util.Map; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.http.HBasicAuthSS; +import org.onap.aaf.cadi.http.HMangr; +import org.onap.aaf.cadi.locator.DME2Locator; + import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.Access; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.http.HBasicAuthSS; -import com.att.cadi.http.HMangr; -import com.att.cadi.locator.DME2Locator; -import com.att.inno.env.APIException; -import com.att.rosetta.env.RosettaDF; -import com.att.rosetta.env.RosettaEnv; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.rosetta.env.RosettaDF; +import org.onap.aaf.rosetta.env.RosettaEnv; public class AAFClient { private RosettaEnv env; diff --git a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java b/client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java similarity index 92% rename from client/src/main/java/com/att/cadi/client/AbsBasicAuth.java rename to client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java index a0ab06d..e714e3a 100644 --- a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.io.IOException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.Symm; -import com.att.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.SecurityInfoC; public abstract class AbsBasicAuth implements SecuritySetter { protected static final String REPEAT_OFFENDER="This call is aborted because of repeated usage of invalid Passwords"; diff --git a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java b/client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java similarity index 87% rename from client/src/main/java/com/att/cadi/client/AbsTransferSS.java rename to client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java index 69647e6..e731f09 100644 --- a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.security.Principal; -import com.att.cadi.SecuritySetter; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.principal.BasicPrincipal; -import com.att.cadi.principal.TGuardPrincipal; -import com.att.cadi.principal.TrustPrincipal; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.principal.BasicPrincipal; +import org.onap.aaf.cadi.principal.TGuardPrincipal; +import org.onap.aaf.cadi.principal.TrustPrincipal; public abstract class AbsTransferSS implements SecuritySetter { protected String value; diff --git a/client/src/main/java/com/att/cadi/client/Delete.java b/client/src/main/java/org/onap/aaf/cadi/client/Delete.java similarity index 91% rename from client/src/main/java/com/att/cadi/client/Delete.java rename to client/src/main/java/org/onap/aaf/cadi/client/Delete.java index f780af1..9f03aab 100644 --- a/client/src/main/java/com/att/cadi/client/Delete.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Delete.java @@ -20,11 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; -import com.att.cadi.CadiException; -import com.att.inno.env.APIException; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.cadi.CadiException; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.rosetta.env.RosettaDF; public class Delete extends AAFClient.Call { public Delete(AAFClient ac, RosettaDF df) { diff --git a/client/src/main/java/com/att/cadi/client/EClient.java b/client/src/main/java/org/onap/aaf/cadi/client/EClient.java similarity index 90% rename from client/src/main/java/com/att/cadi/client/EClient.java rename to client/src/main/java/org/onap/aaf/cadi/client/EClient.java index 166d150..a880331 100644 --- a/client/src/main/java/com/att/cadi/client/EClient.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/EClient.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.io.IOException; import java.io.OutputStream; import javax.servlet.http.HttpServletResponse; -import com.att.inno.env.APIException; -import com.att.inno.env.Data; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data; +import org.onap.aaf.rosetta.env.RosettaDF; public interface EClient { diff --git a/client/src/main/java/com/att/cadi/client/EnvAccess.java b/client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java similarity index 91% rename from client/src/main/java/com/att/cadi/client/EnvAccess.java rename to client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java index f78f2ff..bcf41f8 100644 --- a/client/src/main/java/com/att/cadi/client/EnvAccess.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java @@ -20,18 +20,20 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.io.IOException; import java.io.InputStream; import java.util.Map.Entry; + +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Symm; + import java.util.Properties; -import com.att.cadi.Access; -import com.att.cadi.Symm; -import com.att.inno.env.Decryptor; -import com.att.inno.env.Env; -import com.att.inno.env.impl.BasicEnv; +import org.onap.aaf.inno.env.Decryptor; +import org.onap.aaf.inno.env.Env; +import org.onap.aaf.inno.env.impl.BasicEnv; public class EnvAccess implements Access { private Env env; diff --git a/client/src/main/java/com/att/cadi/client/Future.java b/client/src/main/java/org/onap/aaf/cadi/client/Future.java similarity index 93% rename from client/src/main/java/com/att/cadi/client/Future.java rename to client/src/main/java/org/onap/aaf/cadi/client/Future.java index 18987a6..01a85b8 100644 --- a/client/src/main/java/com/att/cadi/client/Future.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Future.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; -import com.att.cadi.CadiException; +import org.onap.aaf.cadi.CadiException; public abstract class Future { public T value; diff --git a/client/src/main/java/com/att/cadi/client/Get.java b/client/src/main/java/org/onap/aaf/cadi/client/Get.java similarity index 89% rename from client/src/main/java/com/att/cadi/client/Get.java rename to client/src/main/java/org/onap/aaf/cadi/client/Get.java index a39aaf1..920b476 100644 --- a/client/src/main/java/com/att/cadi/client/Get.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Get.java @@ -20,11 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; -import com.att.cadi.CadiException; -import com.att.inno.env.APIException; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.cadi.CadiException; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.rosetta.env.RosettaDF; public class Get extends AAFClient.Call { public Get(AAFClient ac, RosettaDF df) { diff --git a/client/src/main/java/com/att/cadi/client/Holder.java b/client/src/main/java/org/onap/aaf/cadi/client/Holder.java similarity index 95% rename from client/src/main/java/com/att/cadi/client/Holder.java rename to client/src/main/java/org/onap/aaf/cadi/client/Holder.java index 3ad7ce3..577fa5f 100644 --- a/client/src/main/java/com/att/cadi/client/Holder.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Holder.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; /** * Use to set Variables outside of Anonymous classes. diff --git a/client/src/main/java/com/att/cadi/client/Post.java b/client/src/main/java/org/onap/aaf/cadi/client/Post.java similarity index 87% rename from client/src/main/java/com/att/cadi/client/Post.java rename to client/src/main/java/org/onap/aaf/cadi/client/Post.java index 001f1b3..5c9bde2 100644 --- a/client/src/main/java/com/att/cadi/client/Post.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Post.java @@ -20,12 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; -import com.att.cadi.CadiException; -import com.att.cadi.LocatorException; -import com.att.inno.env.APIException; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.LocatorException; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.rosetta.env.RosettaDF; public class Post extends AAFClient.Call { public Post(AAFClient ac, RosettaDF df) { diff --git a/client/src/main/java/com/att/cadi/client/PropertyLocator.java b/client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java similarity index 93% rename from client/src/main/java/com/att/cadi/client/PropertyLocator.java rename to client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java index acd3b4a..15705ab 100644 --- a/client/src/main/java/com/att/cadi/client/PropertyLocator.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.net.URI; import java.net.URISyntaxException; import java.util.Random; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; public class PropertyLocator implements Locator { private final URI [] orig; diff --git a/client/src/main/java/com/att/cadi/client/Put.java b/client/src/main/java/org/onap/aaf/cadi/client/Put.java similarity index 90% rename from client/src/main/java/com/att/cadi/client/Put.java rename to client/src/main/java/org/onap/aaf/cadi/client/Put.java index b14bfac..ebd6e0d 100644 --- a/client/src/main/java/com/att/cadi/client/Put.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Put.java @@ -20,11 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; -import com.att.cadi.CadiException; -import com.att.inno.env.APIException; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.cadi.CadiException; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.rosetta.env.RosettaDF; public class Put extends AAFClient.Call { public Put(AAFClient ac, RosettaDF df) { diff --git a/client/src/main/java/com/att/cadi/client/RawClient.java b/client/src/main/java/org/onap/aaf/cadi/client/RawClient.java similarity index 95% rename from client/src/main/java/com/att/cadi/client/RawClient.java rename to client/src/main/java/org/onap/aaf/cadi/client/RawClient.java index c1ad633..0386383 100644 --- a/client/src/main/java/com/att/cadi/client/RawClient.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/RawClient.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.io.File; import java.io.FileInputStream; @@ -28,9 +28,10 @@ import java.io.FileOutputStream; import java.io.PrintStream; import java.net.URI; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; + import com.att.aft.dme2.api.DME2Client; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; public abstract class RawClient { protected static String aafid, aafpass, aafurl; diff --git a/client/src/main/java/com/att/cadi/client/Rcli.java b/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java similarity index 94% rename from client/src/main/java/com/att/cadi/client/Rcli.java rename to client/src/main/java/org/onap/aaf/cadi/client/Rcli.java index c25cb2b..23158ef 100644 --- a/client/src/main/java/com/att/cadi/client/Rcli.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.io.IOException; import java.io.OutputStream; @@ -31,13 +31,14 @@ import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.CadiException; -import com.att.cadi.SecuritySetter; -import com.att.inno.env.APIException; -import com.att.inno.env.Data.TYPE; -import com.att.inno.env.util.Pool; -import com.att.inno.env.util.Pool.Pooled; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.SecuritySetter; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.util.Pool; +import org.onap.aaf.inno.env.util.Pool.Pooled; +import org.onap.aaf.rosetta.env.RosettaDF; public abstract class Rcli { public static final String BLANK = ""; diff --git a/client/src/main/java/com/att/cadi/client/Result.java b/client/src/main/java/org/onap/aaf/cadi/client/Result.java similarity index 95% rename from client/src/main/java/com/att/cadi/client/Result.java rename to client/src/main/java/org/onap/aaf/cadi/client/Result.java index b86d9b9..5b3d8fd 100644 --- a/client/src/main/java/com/att/cadi/client/Result.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Result.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; public class Result { public final int code; diff --git a/client/src/main/java/com/att/cadi/client/Retryable.java b/client/src/main/java/org/onap/aaf/cadi/client/Retryable.java similarity index 90% rename from client/src/main/java/com/att/cadi/client/Retryable.java rename to client/src/main/java/org/onap/aaf/cadi/client/Retryable.java index 4f49a72..9c701ef 100644 --- a/client/src/main/java/com/att/cadi/client/Retryable.java +++ b/client/src/main/java/org/onap/aaf/cadi/client/Retryable.java @@ -20,13 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.client; +package org.onap.aaf.cadi.client; import java.net.ConnectException; -import com.att.cadi.CadiException; -import com.att.cadi.Locator; -import com.att.inno.env.APIException; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Locator; + +import org.onap.aaf.inno.env.APIException; /** * diff --git a/client/src/main/java/com/att/cadi/dme2/DEClient.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java similarity index 90% rename from client/src/main/java/com/att/cadi/dme2/DEClient.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java index 138fb63..7bbdc25 100644 --- a/client/src/main/java/com/att/cadi/dme2/DEClient.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,19 +28,20 @@ import java.net.URI; import javax.servlet.http.HttpServletResponse; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.client.EClient; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; + import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; import com.att.aft.dme2.handler.DME2RestfulHandler; import com.att.aft.dme2.handler.DME2RestfulHandler.ResponseInfo; -import com.att.cadi.CadiException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.EClient; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.inno.env.APIException; -import com.att.inno.env.Data; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data; +import org.onap.aaf.rosetta.env.RosettaDF; public class DEClient implements EClient { private DME2Client client; diff --git a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java similarity index 86% rename from client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java index 3fb1f13..b29074f 100644 --- a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java @@ -20,18 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.io.IOException; import java.security.GeneralSecurityException; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.client.AbsBasicAuth; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.principal.BasicPrincipal; + import com.att.aft.dme2.api.DME2Client; -import com.att.cadi.Access; -import com.att.cadi.CadiException; -import com.att.cadi.client.AbsBasicAuth; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.principal.BasicPrincipal; public class DME2BasicAuth extends AbsBasicAuth { public DME2BasicAuth(String user, String pass, SecurityInfoC si) throws IOException { diff --git a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java similarity index 90% rename from client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java index 8895e9f..167fe3b 100644 --- a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java @@ -20,14 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.io.IOException; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Access.Level; + import com.att.aft.dme2.api.DME2Client; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.SecuritySetter; public class DME2ClientSS implements SecuritySetter { private Access access; diff --git a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java similarity index 95% rename from client/src/main/java/com/att/cadi/dme2/DME2Locator.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java index f28fe94..47af9ea 100644 --- a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.net.InetAddress; @@ -31,15 +31,16 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Random; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.Access.Level; + // import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; import com.att.aft.dme2.api.DME2Server; import com.att.aft.dme2.manager.registry.DME2Endpoint; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; public class DME2Locator implements Locator { private DME2Manager dm; diff --git a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java similarity index 87% rename from client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java index a8d7ac9..f71d19c 100644 --- a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java @@ -20,16 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.io.IOException; import java.security.Principal; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.client.AbsTransferSS; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; + import com.att.aft.dme2.api.DME2Client; -import com.att.cadi.CadiException; -import com.att.cadi.client.AbsTransferSS; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; public class DME2TransferSS extends AbsTransferSS { diff --git a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java similarity index 87% rename from client/src/main/java/com/att/cadi/dme2/DME2x509SS.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java index 45978e4..af803c1 100644 --- a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java @@ -20,17 +20,18 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.io.IOException; import java.security.cert.CertificateEncodingException; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; + import com.att.aft.dme2.api.DME2Client; -import com.att.cadi.CadiException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.inno.env.APIException; +import org.onap.aaf.inno.env.APIException; public class DME2x509SS implements SecuritySetter { diff --git a/client/src/main/java/com/att/cadi/dme2/DRcli.java b/client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java similarity index 90% rename from client/src/main/java/com/att/cadi/dme2/DRcli.java rename to client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java index 8a1f5fb..cd95bcc 100644 --- a/client/src/main/java/com/att/cadi/dme2/DRcli.java +++ b/client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dme2; +package org.onap.aaf.cadi.dme2; import java.net.MalformedURLException; import java.net.URI; @@ -28,17 +28,18 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.client.EClient; +import org.onap.aaf.cadi.client.Rcli; + import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; import com.att.aft.dme2.manager.registry.DME2Endpoint; import com.att.aft.dme2.request.DmeUniformResource; -import com.att.cadi.CadiException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.EClient; -import com.att.cadi.client.Rcli; -import com.att.inno.env.APIException; -import com.att.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data.TYPE; /** * DME2 Rosetta Client diff --git a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java b/client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java similarity index 92% rename from client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java rename to client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java index 3bf9080..105ccf1 100644 --- a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java +++ b/client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java @@ -20,17 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.dnsloc; +package org.onap.aaf.cadi.dnsloc; import java.io.IOException; import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.Access.Level; public class DNSLocator implements Locator { private static enum Status {UNTRIED, OK, INVALID, SLOW}; diff --git a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java b/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java similarity index 88% rename from client/src/main/java/com/att/cadi/http/HBasicAuthSS.java rename to client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java index dfedcc1..f9212e8 100644 --- a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java +++ b/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java @@ -20,19 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.http; +package org.onap.aaf.cadi.http; import java.io.IOException; import java.net.HttpURLConnection; import javax.net.ssl.HttpsURLConnection; -import com.att.cadi.Access; -import com.att.cadi.CadiException; -import com.att.cadi.client.AbsBasicAuth; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.principal.BasicPrincipal; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.client.AbsBasicAuth; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.principal.BasicPrincipal; public class HBasicAuthSS extends AbsBasicAuth { public HBasicAuthSS(Access access, SecurityInfoC si) throws IOException { diff --git a/client/src/main/java/com/att/cadi/http/HClient.java b/client/src/main/java/org/onap/aaf/cadi/http/HClient.java similarity index 91% rename from client/src/main/java/com/att/cadi/http/HClient.java rename to client/src/main/java/org/onap/aaf/cadi/http/HClient.java index 6704bf4..70a703e 100644 --- a/client/src/main/java/com/att/cadi/http/HClient.java +++ b/client/src/main/java/org/onap/aaf/cadi/http/HClient.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.http; +package org.onap.aaf.cadi.http; import java.io.IOException; import java.io.InputStream; @@ -34,17 +34,18 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.CadiException; -import com.att.cadi.LocatorException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.EClient; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.inno.env.APIException; -import com.att.inno.env.Data; -import com.att.inno.env.Data.TYPE; -import com.att.inno.env.util.Pool.Pooled; -import com.att.rosetta.env.RosettaDF; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.client.EClient; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data; +import org.onap.aaf.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.util.Pool.Pooled; +import org.onap.aaf.rosetta.env.RosettaDF; /** * Low Level Http Client Mechanism. Chances are, you want the high level "HRcli" diff --git a/client/src/main/java/com/att/cadi/http/HMangr.java b/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java similarity index 91% rename from client/src/main/java/com/att/cadi/http/HMangr.java rename to client/src/main/java/org/onap/aaf/cadi/http/HMangr.java index 13fe815..833434f 100644 --- a/client/src/main/java/com/att/cadi/http/HMangr.java +++ b/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.http; +package org.onap.aaf.cadi.http; import java.net.ConnectException; import java.net.HttpURLConnection; @@ -30,16 +30,17 @@ import java.net.URISyntaxException; import javax.net.ssl.SSLHandshakeException; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator.Item; -import com.att.cadi.CadiException; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.Rcli; -import com.att.cadi.client.Retryable; -import com.att.inno.env.APIException; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; + +import org.onap.aaf.inno.env.APIException; public class HMangr { private String apiVersion; diff --git a/client/src/main/java/com/att/cadi/http/HRcli.java b/client/src/main/java/org/onap/aaf/cadi/http/HRcli.java similarity index 87% rename from client/src/main/java/com/att/cadi/http/HRcli.java rename to client/src/main/java/org/onap/aaf/cadi/http/HRcli.java index cfbb5c1..1ad0fcc 100644 --- a/client/src/main/java/com/att/cadi/http/HRcli.java +++ b/client/src/main/java/org/onap/aaf/cadi/http/HRcli.java @@ -20,21 +20,22 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.http; +package org.onap.aaf.cadi.http; import java.net.HttpURLConnection; import java.net.URI; import java.net.URISyntaxException; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.client.EClient; +import org.onap.aaf.cadi.client.Rcli; + import com.att.aft.dme2.api.DME2Exception; -import com.att.cadi.CadiException; -import com.att.cadi.LocatorException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.Locator.Item; -import com.att.cadi.client.EClient; -import com.att.cadi.client.Rcli; -import com.att.inno.env.APIException; -import com.att.inno.env.Data.TYPE; +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.Data.TYPE; /** * DME2 Rosetta Client diff --git a/client/src/main/java/com/att/cadi/http/HTransferSS.java b/client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java similarity index 88% rename from client/src/main/java/com/att/cadi/http/HTransferSS.java rename to client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java index 89a38c3..db456f2 100644 --- a/client/src/main/java/com/att/cadi/http/HTransferSS.java +++ b/client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.http; +package org.onap.aaf.cadi.http; import java.io.IOException; import java.net.HttpURLConnection; @@ -28,10 +28,10 @@ import java.security.Principal; import javax.net.ssl.HttpsURLConnection; -import com.att.cadi.CadiException; -import com.att.cadi.client.AbsTransferSS; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.client.AbsTransferSS; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; public class HTransferSS extends AbsTransferSS { diff --git a/client/src/main/java/com/att/cadi/http/HX509SS.java b/client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java similarity index 92% rename from client/src/main/java/com/att/cadi/http/HX509SS.java rename to client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java index b790ede..0bdc843 100644 --- a/client/src/main/java/com/att/cadi/http/HX509SS.java +++ b/client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.http; +package org.onap.aaf.cadi.http; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -35,13 +35,14 @@ import java.security.cert.X509Certificate; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.X509KeyManager; -import com.att.cadi.CadiException; -import com.att.cadi.SecuritySetter; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.inno.env.APIException; -import com.att.inno.env.util.Chrono; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; + +import org.onap.aaf.inno.env.APIException; +import org.onap.aaf.inno.env.util.Chrono; public class HX509SS implements SecuritySetter { diff --git a/client/src/main/java/com/att/cadi/locator/DME2Locator.java b/client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java similarity index 94% rename from client/src/main/java/com/att/cadi/locator/DME2Locator.java rename to client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java index c750448..656fd19 100644 --- a/client/src/main/java/com/att/cadi/locator/DME2Locator.java +++ b/client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.locator; +package org.onap.aaf.cadi.locator; import java.net.InetAddress; @@ -31,6 +31,13 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Properties; import java.util.Random; + +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Access.Level; + import java.security.SecureRandom; //import com.att.aft.dme2.api.DME2Endpoint; @@ -38,11 +45,6 @@ import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; import com.att.aft.dme2.api.DME2Server; import com.att.aft.dme2.manager.registry.DME2Endpoint; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; -import com.att.cadi.PropAccess; public class DME2Locator implements Locator { private DME2Manager dm; diff --git a/client/src/main/java/com/att/cadi/locator/DNSLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java similarity index 92% rename from client/src/main/java/com/att/cadi/locator/DNSLocator.java rename to client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java index baa65ed..9d420d2 100644 --- a/client/src/main/java/com/att/cadi/locator/DNSLocator.java +++ b/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java @@ -20,17 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.locator; +package org.onap.aaf.cadi.locator; import java.io.IOException; import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; -import com.att.cadi.Access; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; -import com.att.cadi.Access.Level; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.Access.Level; public class DNSLocator implements Locator { private static enum Status {UNTRIED, OK, INVALID, SLOW}; diff --git a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java similarity index 89% rename from client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java rename to client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java index db95d91..0aa69a3 100644 --- a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java +++ b/client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.locator; +package org.onap.aaf.cadi.locator; import java.net.URI; import java.net.URISyntaxException; -import com.att.cadi.Access; -import com.att.cadi.LocatorException; -import com.att.cadi.http.HClient; -import com.att.cadi.http.HX509SS; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.http.HClient; +import org.onap.aaf.cadi.http.HX509SS; public class HClientHotPeerLocator extends HotPeerLocator { private final HX509SS ss; diff --git a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java similarity index 93% rename from client/src/main/java/com/att/cadi/locator/HotPeerLocator.java rename to client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java index 5b756b2..04d2a28 100644 --- a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java +++ b/client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java @@ -20,14 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.locator; +package org.onap.aaf.cadi.locator; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; -import com.att.cadi.routing.GreatCircle; -import com.att.inno.env.util.Split; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.routing.GreatCircle; + +import org.onap.aaf.inno.env.util.Split; /** * This Locator is to handle Hot Peer load protection, when the Servers are diff --git a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java b/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java similarity index 94% rename from client/src/main/java/com/att/cadi/locator/PropertyLocator.java rename to client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java index 216be4f..3d9470e 100644 --- a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java +++ b/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.locator; +package org.onap.aaf.cadi.locator; import java.io.IOException; import java.net.InetAddress; @@ -35,9 +35,10 @@ import java.security.SecureRandom; import java.util.Timer; import java.util.TimerTask; -import com.att.cadi.Locator; -import com.att.cadi.LocatorException; -import com.att.inno.env.util.Split; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.LocatorException; + +import org.onap.aaf.inno.env.util.Split; public class PropertyLocator implements Locator { private final URI [] orig; diff --git a/client/src/main/java/com/att/cadi/routing/GreatCircle.java b/client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java similarity index 95% rename from client/src/main/java/com/att/cadi/routing/GreatCircle.java rename to client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java index 8558f8e..9e47b3f 100644 --- a/client/src/main/java/com/att/cadi/routing/GreatCircle.java +++ b/client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.routing; +package org.onap.aaf.cadi.routing; -import com.att.inno.env.util.Split; +import org.onap.aaf.inno.env.util.Split; public class GreatCircle { // Note: multiplying by this constant is faster than calling Math equivalent function diff --git a/client/src/test/java/com/client/test/BasicDME2Client.java b/client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java similarity index 96% rename from client/src/test/java/com/client/test/BasicDME2Client.java rename to client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java index f26d3b1..4619a0f 100644 --- a/client/src/test/java/com/client/test/BasicDME2Client.java +++ b/client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.net.URI; import java.util.Properties; diff --git a/client/src/test/java/com/client/test/JU_DNSLocator.java b/client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java similarity index 89% rename from client/src/test/java/com/client/test/JU_DNSLocator.java rename to client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java index 04a4f17..8cac8d1 100644 --- a/client/src/test/java/com/client/test/JU_DNSLocator.java +++ b/client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.net.URI; import java.net.URL; @@ -28,10 +28,9 @@ import java.net.URLConnection; import org.junit.AfterClass; import org.junit.Test; - -import com.att.cadi.locator.DNSLocator; -import com.att.cadi.PropAccess; -import com.att.cadi.Locator.Item; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.locator.DNSLocator; public class JU_DNSLocator { diff --git a/client/src/test/java/com/client/test/JU_PropertyLocator.java b/client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java similarity index 92% rename from client/src/test/java/com/client/test/JU_PropertyLocator.java rename to client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java index 89bef62..c09d697 100644 --- a/client/src/test/java/com/client/test/JU_PropertyLocator.java +++ b/client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java @@ -20,18 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.net.URI; import org.junit.AfterClass; import org.junit.Test; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.locator.PropertyLocator; import static org.junit.Assert.*; -import com.att.cadi.Locator.Item; -import com.att.cadi.locator.PropertyLocator; - public class JU_PropertyLocator { @AfterClass diff --git a/client/src/test/java/com/client/test/PaulUzee.java b/client/src/test/java/org/onap/aaf/client/test/PaulUzee.java similarity index 91% rename from client/src/test/java/com/client/test/PaulUzee.java rename to client/src/test/java/org/onap/aaf/client/test/PaulUzee.java index 24aeb49..4bec3fd 100644 --- a/client/src/test/java/com/client/test/PaulUzee.java +++ b/client/src/test/java/org/onap/aaf/client/test/PaulUzee.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.io.IOException; import java.io.InputStream; @@ -28,12 +28,13 @@ import java.io.PrintStream; import java.net.URI; import java.util.Properties; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.dme2.DME2Locator; + import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.Access; -import com.att.cadi.Locator; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator.Item; -import com.att.cadi.dme2.DME2Locator; public class PaulUzee { public static void main(String[] args) { diff --git a/client/src/test/java/com/client/test/TestAccess.java b/client/src/test/java/org/onap/aaf/client/test/TestAccess.java similarity index 93% rename from client/src/test/java/com/client/test/TestAccess.java rename to client/src/test/java/org/onap/aaf/client/test/TestAccess.java index 434ae62..c054bc0 100644 --- a/client/src/test/java/com/client/test/TestAccess.java +++ b/client/src/test/java/org/onap/aaf/client/test/TestAccess.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.io.IOException; import java.io.InputStream; -import com.att.cadi.Access; -import com.att.cadi.Symm; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Symm; public class TestAccess implements Access { private Symm symm; diff --git a/client/src/test/java/com/client/test/TestDME2Client.java b/client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java similarity index 95% rename from client/src/test/java/com/client/test/TestDME2Client.java rename to client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java index 415f992..4abec42 100644 --- a/client/src/test/java/com/client/test/TestDME2Client.java +++ b/client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java @@ -20,15 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.io.FileInputStream; import java.net.URI; import java.util.Properties; +import org.onap.aaf.cadi.Symm; + import com.att.aft.dme2.api.DME2Client; import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.Symm; public class TestDME2Client { public static void main(String[] args) { diff --git a/client/src/test/java/com/client/test/TestDME2RcliClient.java b/client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java similarity index 91% rename from client/src/test/java/com/client/test/TestDME2RcliClient.java rename to client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java index 6ff5d6f..10c917c 100644 --- a/client/src/test/java/com/client/test/TestDME2RcliClient.java +++ b/client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java @@ -20,16 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.net.URI; import java.util.Properties; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.dme2.DME2ClientSS; +import org.onap.aaf.cadi.dme2.DRcli; + import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.Access; -import com.att.cadi.client.Future; -import com.att.cadi.dme2.DME2ClientSS; -import com.att.cadi.dme2.DRcli; public class TestDME2RcliClient { public static void main(String[] args) { diff --git a/client/src/test/java/com/client/test/TestHClient.java b/client/src/test/java/org/onap/aaf/client/test/TestHClient.java similarity index 79% rename from client/src/test/java/com/client/test/TestHClient.java rename to client/src/test/java/org/onap/aaf/client/test/TestHClient.java index 7fcd113..2476caf 100644 --- a/client/src/test/java/com/client/test/TestHClient.java +++ b/client/src/test/java/org/onap/aaf/client/test/TestHClient.java @@ -20,27 +20,28 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.client.test; +package org.onap.aaf.client.test; import java.net.HttpURLConnection; import java.net.URI; import java.util.Properties; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.SecuritySetter; +import org.onap.aaf.cadi.Locator.Item; +import org.onap.aaf.cadi.client.Future; +import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.client.Retryable; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.http.HBasicAuthSS; +import org.onap.aaf.cadi.http.HMangr; +import org.onap.aaf.cadi.locator.DME2Locator; + import com.att.aft.dme2.api.DME2Manager; -import com.att.cadi.CadiException; -import com.att.cadi.Locator; -import com.att.cadi.Locator.Item; -import com.att.cadi.PropAccess; -import com.att.cadi.SecuritySetter; -import com.att.cadi.client.Future; -import com.att.cadi.client.Rcli; -import com.att.cadi.client.Retryable; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.http.HBasicAuthSS; -import com.att.cadi.http.HMangr; -import com.att.cadi.locator.DME2Locator; -import com.att.inno.env.APIException; +import org.onap.aaf.inno.env.APIException; public class TestHClient { public static void main(String[] args) { diff --git a/core/pom.xml b/core/pom.xml index 3cfdeb1..80fb699 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ --> - com.att.cadi + org.onap.aaf.cadi parent .. 1.0.0-SNAPSHOT @@ -34,7 +34,15 @@ jar https://github.com/att/AAF CADI - + + UTF-8 + 1.0.0-SNAPSHOT + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + @@ -112,19 +120,61 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + - + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + + diff --git a/core/src/main/java/com/att/cadi/AES.java b/core/src/main/java/org/onap/aaf/cadi/AES.java similarity index 95% rename from core/src/main/java/com/att/cadi/AES.java rename to core/src/main/java/org/onap/aaf/cadi/AES.java index 7304932..515fc27 100644 --- a/core/src/main/java/com/att/cadi/AES.java +++ b/core/src/main/java/org/onap/aaf/cadi/AES.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.File; import java.io.FileInputStream; @@ -41,7 +41,7 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import com.att.cadi.util.Chmod; +import org.onap.aaf.cadi.util.Chmod; public class AES { public static final String AES = AES.class.getSimpleName(); diff --git a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java similarity index 95% rename from core/src/main/java/com/att/cadi/AbsCachedPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java index f244d09..ceb6ca3 100644 --- a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public abstract class AbsCachedPrincipal implements CachedPrincipal { diff --git a/core/src/main/java/com/att/cadi/AbsUserCache.java b/core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java similarity index 95% rename from core/src/main/java/com/att/cadi/AbsUserCache.java rename to core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java index d374faa..1846793 100644 --- a/core/src/main/java/com/att/cadi/AbsUserCache.java +++ b/core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; @@ -32,8 +32,8 @@ import java.util.TimerTask; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import com.att.cadi.Access.Level; -import com.att.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CachedPrincipal.Resp; /** * Implement Fast lookup and Cache for Local User Info diff --git a/core/src/main/java/com/att/cadi/Access.java b/core/src/main/java/org/onap/aaf/cadi/Access.java similarity index 95% rename from core/src/main/java/com/att/cadi/Access.java rename to core/src/main/java/org/onap/aaf/cadi/Access.java index 4c238ee..a8eeda1 100644 --- a/core/src/main/java/com/att/cadi/Access.java +++ b/core/src/main/java/org/onap/aaf/cadi/Access.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/att/cadi/BasicCred.java b/core/src/main/java/org/onap/aaf/cadi/BasicCred.java similarity index 96% rename from core/src/main/java/com/att/cadi/BasicCred.java rename to core/src/main/java/org/onap/aaf/cadi/BasicCred.java index 6f0aff5..a645b83 100644 --- a/core/src/main/java/com/att/cadi/BasicCred.java +++ b/core/src/main/java/org/onap/aaf/cadi/BasicCred.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; /** * An Interface for testing on Requests to see if we can get a User and Password diff --git a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java b/core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java similarity index 96% rename from core/src/main/java/com/att/cadi/BufferedCadiWrap.java rename to core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java index 74dd126..56d72aa 100644 --- a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java +++ b/core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java b/core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java similarity index 96% rename from core/src/main/java/com/att/cadi/BufferedServletInputStream.java rename to core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java index 10e7b1f..345db91 100644 --- a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java +++ b/core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/att/cadi/CachedPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java similarity index 95% rename from core/src/main/java/com/att/cadi/CachedPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java index 3968f1b..de90b74 100644 --- a/core/src/main/java/com/att/cadi/CachedPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; diff --git a/core/src/main/java/com/att/cadi/CachingLur.java b/core/src/main/java/org/onap/aaf/cadi/CachingLur.java similarity index 93% rename from core/src/main/java/com/att/cadi/CachingLur.java rename to core/src/main/java/org/onap/aaf/cadi/CachingLur.java index ee87431..f57a567 100644 --- a/core/src/main/java/com/att/cadi/CachingLur.java +++ b/core/src/main/java/org/onap/aaf/cadi/CachingLur.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; -import com.att.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.CachedPrincipal.Resp; public interface CachingLur extends Lur { diff --git a/core/src/main/java/com/att/cadi/CadiException.java b/core/src/main/java/org/onap/aaf/cadi/CadiException.java similarity index 95% rename from core/src/main/java/com/att/cadi/CadiException.java rename to core/src/main/java/org/onap/aaf/cadi/CadiException.java index 66b7b5b..f8b06ce 100644 --- a/core/src/main/java/com/att/cadi/CadiException.java +++ b/core/src/main/java/org/onap/aaf/cadi/CadiException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; /** * CADI Specific Exception diff --git a/core/src/main/java/com/att/cadi/CadiWrap.java b/core/src/main/java/org/onap/aaf/cadi/CadiWrap.java similarity index 92% rename from core/src/main/java/com/att/cadi/CadiWrap.java rename to core/src/main/java/org/onap/aaf/cadi/CadiWrap.java index 64c565f..6cf5694 100644 --- a/core/src/main/java/com/att/cadi/CadiWrap.java +++ b/core/src/main/java/org/onap/aaf/cadi/CadiWrap.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; import java.util.ArrayList; @@ -29,11 +29,11 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.att.cadi.Access.Level; -import com.att.cadi.filter.NullPermConverter; -import com.att.cadi.filter.PermConverter; -import com.att.cadi.lur.EpiLur; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.filter.NullPermConverter; +import org.onap.aaf.cadi.filter.PermConverter; +import org.onap.aaf.cadi.lur.EpiLur; +import org.onap.aaf.cadi.taf.TafResp; diff --git a/core/src/main/java/com/att/cadi/Capacitor.java b/core/src/main/java/org/onap/aaf/cadi/Capacitor.java similarity index 95% rename from core/src/main/java/com/att/cadi/Capacitor.java rename to core/src/main/java/org/onap/aaf/cadi/Capacitor.java index 73fd83c..a7aa4f6 100644 --- a/core/src/main/java/com/att/cadi/Capacitor.java +++ b/core/src/main/java/org/onap/aaf/cadi/Capacitor.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/core/src/main/java/com/att/cadi/CmdLine.java b/core/src/main/java/org/onap/aaf/cadi/CmdLine.java similarity index 96% rename from core/src/main/java/com/att/cadi/CmdLine.java rename to core/src/main/java/org/onap/aaf/cadi/CmdLine.java index 89685e2..b387c7a 100644 --- a/core/src/main/java/com/att/cadi/CmdLine.java +++ b/core/src/main/java/org/onap/aaf/cadi/CmdLine.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.BufferedReader; import java.io.File; @@ -33,8 +33,8 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.security.NoSuchAlgorithmException; -import com.att.cadi.util.Chmod; -import com.att.cadi.util.JsonOutputStream; +import org.onap.aaf.cadi.util.Chmod; +import org.onap.aaf.cadi.util.JsonOutputStream; diff --git a/core/src/main/java/com/att/cadi/Connector.java b/core/src/main/java/org/onap/aaf/cadi/Connector.java similarity index 96% rename from core/src/main/java/com/att/cadi/Connector.java rename to core/src/main/java/org/onap/aaf/cadi/Connector.java index ab96010..0a55b0d 100644 --- a/core/src/main/java/com/att/cadi/Connector.java +++ b/core/src/main/java/org/onap/aaf/cadi/Connector.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public interface Connector { public Lur newLur() throws CadiException; diff --git a/core/src/main/java/com/att/cadi/CredVal.java b/core/src/main/java/org/onap/aaf/cadi/CredVal.java similarity index 95% rename from core/src/main/java/com/att/cadi/CredVal.java rename to core/src/main/java/org/onap/aaf/cadi/CredVal.java index 4fe0a28..324746b 100644 --- a/core/src/main/java/com/att/cadi/CredVal.java +++ b/core/src/main/java/org/onap/aaf/cadi/CredVal.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; /** diff --git a/core/src/main/java/com/att/cadi/GetCred.java b/core/src/main/java/org/onap/aaf/cadi/GetCred.java similarity index 95% rename from core/src/main/java/com/att/cadi/GetCred.java rename to core/src/main/java/org/onap/aaf/cadi/GetCred.java index d2c99f2..c0917a5 100644 --- a/core/src/main/java/com/att/cadi/GetCred.java +++ b/core/src/main/java/org/onap/aaf/cadi/GetCred.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public interface GetCred { byte[] getCred(); diff --git a/core/src/main/java/com/att/cadi/Hash.java b/core/src/main/java/org/onap/aaf/cadi/Hash.java similarity index 96% rename from core/src/main/java/com/att/cadi/Hash.java rename to core/src/main/java/org/onap/aaf/cadi/Hash.java index b4e114f..9d8719a 100644 --- a/core/src/main/java/com/att/cadi/Hash.java +++ b/core/src/main/java/org/onap/aaf/cadi/Hash.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.nio.ByteBuffer; import java.security.MessageDigest; diff --git a/core/src/main/java/com/att/cadi/Locator.java b/core/src/main/java/org/onap/aaf/cadi/Locator.java similarity index 96% rename from core/src/main/java/com/att/cadi/Locator.java rename to core/src/main/java/org/onap/aaf/cadi/Locator.java index ab1a7f9..05b6442 100644 --- a/core/src/main/java/com/att/cadi/Locator.java +++ b/core/src/main/java/org/onap/aaf/cadi/Locator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public interface Locator { public T get(Locator.Item item) throws LocatorException; diff --git a/core/src/main/java/com/att/cadi/LocatorException.java b/core/src/main/java/org/onap/aaf/cadi/LocatorException.java similarity index 95% rename from core/src/main/java/com/att/cadi/LocatorException.java rename to core/src/main/java/org/onap/aaf/cadi/LocatorException.java index 9c3b804..43127ec 100644 --- a/core/src/main/java/com/att/cadi/LocatorException.java +++ b/core/src/main/java/org/onap/aaf/cadi/LocatorException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public class LocatorException extends Exception { /** diff --git a/core/src/main/java/com/att/cadi/Lur.java b/core/src/main/java/org/onap/aaf/cadi/Lur.java similarity index 96% rename from core/src/main/java/com/att/cadi/Lur.java rename to core/src/main/java/org/onap/aaf/cadi/Lur.java index d8ae6a3..afbf2dd 100644 --- a/core/src/main/java/com/att/cadi/Lur.java +++ b/core/src/main/java/org/onap/aaf/cadi/Lur.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; import java.util.List; diff --git a/core/src/main/java/com/att/cadi/Permission.java b/core/src/main/java/org/onap/aaf/cadi/Permission.java similarity index 96% rename from core/src/main/java/com/att/cadi/Permission.java rename to core/src/main/java/org/onap/aaf/cadi/Permission.java index adb80a1..ac0ec46 100644 --- a/core/src/main/java/com/att/cadi/Permission.java +++ b/core/src/main/java/org/onap/aaf/cadi/Permission.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public interface Permission { public String permType(); diff --git a/core/src/main/java/com/att/cadi/PropAccess.java b/core/src/main/java/org/onap/aaf/cadi/PropAccess.java similarity index 95% rename from core/src/main/java/com/att/cadi/PropAccess.java rename to core/src/main/java/org/onap/aaf/cadi/PropAccess.java index d7c9d99..d866e85 100644 --- a/core/src/main/java/com/att/cadi/PropAccess.java +++ b/core/src/main/java/org/onap/aaf/cadi/PropAccess.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.File; import java.io.FileInputStream; @@ -32,10 +32,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map.Entry; -import java.util.Properties; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfo; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfo; + +import java.util.Properties; public class PropAccess implements Access { private static final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); diff --git a/core/src/main/java/com/att/cadi/Revalidator.java b/core/src/main/java/org/onap/aaf/cadi/Revalidator.java similarity index 95% rename from core/src/main/java/com/att/cadi/Revalidator.java rename to core/src/main/java/org/onap/aaf/cadi/Revalidator.java index 5d492aa..68b2661 100644 --- a/core/src/main/java/com/att/cadi/Revalidator.java +++ b/core/src/main/java/org/onap/aaf/cadi/Revalidator.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; public interface Revalidator { diff --git a/core/src/main/java/com/att/cadi/SLF4JAccess.java b/core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java similarity index 95% rename from core/src/main/java/com/att/cadi/SLF4JAccess.java rename to core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java index b222e35..33b7050 100644 --- a/core/src/main/java/com/att/cadi/SLF4JAccess.java +++ b/core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.util.Properties; diff --git a/core/src/main/java/com/att/cadi/SecuritySetter.java b/core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java similarity index 95% rename from core/src/main/java/com/att/cadi/SecuritySetter.java rename to core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java index 295148f..88c45b0 100644 --- a/core/src/main/java/com/att/cadi/SecuritySetter.java +++ b/core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; /** diff --git a/core/src/main/java/com/att/cadi/ServletContextAccess.java b/core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java similarity index 94% rename from core/src/main/java/com/att/cadi/ServletContextAccess.java rename to core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java index 2d1cfa1..6c288d5 100644 --- a/core/src/main/java/com/att/cadi/ServletContextAccess.java +++ b/core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.util.Enumeration; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.config.Config; public class ServletContextAccess extends PropAccess { diff --git a/core/src/main/java/com/att/cadi/StrLur.java b/core/src/main/java/org/onap/aaf/cadi/StrLur.java similarity index 96% rename from core/src/main/java/com/att/cadi/StrLur.java rename to core/src/main/java/org/onap/aaf/cadi/StrLur.java index f191203..1a86c8e 100644 --- a/core/src/main/java/com/att/cadi/StrLur.java +++ b/core/src/main/java/org/onap/aaf/cadi/StrLur.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.util.List; diff --git a/core/src/main/java/com/att/cadi/Symm.java b/core/src/main/java/org/onap/aaf/cadi/Symm.java similarity index 96% rename from core/src/main/java/com/att/cadi/Symm.java rename to core/src/main/java/org/onap/aaf/cadi/Symm.java index 1504c2d..beb0c40 100644 --- a/core/src/main/java/com/att/cadi/Symm.java +++ b/core/src/main/java/org/onap/aaf/cadi/Symm.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -38,8 +38,8 @@ import java.util.Random; import javax.crypto.CipherInputStream; import javax.crypto.CipherOutputStream; -import com.att.cadi.Access.Level; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Config; /** * Key Conversion, primarily "Base64" diff --git a/core/src/main/java/com/att/cadi/Taf.java b/core/src/main/java/org/onap/aaf/cadi/Taf.java similarity index 95% rename from core/src/main/java/com/att/cadi/Taf.java rename to core/src/main/java/org/onap/aaf/cadi/Taf.java index 4017866..d4b2211 100644 --- a/core/src/main/java/com/att/cadi/Taf.java +++ b/core/src/main/java/org/onap/aaf/cadi/Taf.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp; /** diff --git a/core/src/main/java/com/att/cadi/Transmutate.java b/core/src/main/java/org/onap/aaf/cadi/Transmutate.java similarity index 96% rename from core/src/main/java/com/att/cadi/Transmutate.java rename to core/src/main/java/org/onap/aaf/cadi/Transmutate.java index 1d6ff6f..950f28f 100644 --- a/core/src/main/java/com/att/cadi/Transmutate.java +++ b/core/src/main/java/org/onap/aaf/cadi/Transmutate.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; diff --git a/core/src/main/java/com/att/cadi/TrustChecker.java b/core/src/main/java/org/onap/aaf/cadi/TrustChecker.java similarity index 93% rename from core/src/main/java/com/att/cadi/TrustChecker.java rename to core/src/main/java/org/onap/aaf/cadi/TrustChecker.java index 60b9a17..feade74 100644 --- a/core/src/main/java/com/att/cadi/TrustChecker.java +++ b/core/src/main/java/org/onap/aaf/cadi/TrustChecker.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import javax.servlet.http.HttpServletRequest; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp; /** * Change to another Principal based on Trust of caller and User Chain (if desired) diff --git a/core/src/main/java/com/att/cadi/User.java b/core/src/main/java/org/onap/aaf/cadi/User.java similarity index 94% rename from core/src/main/java/com/att/cadi/User.java rename to core/src/main/java/org/onap/aaf/cadi/User.java index bde3488..372e9bc 100644 --- a/core/src/main/java/com/att/cadi/User.java +++ b/core/src/main/java/org/onap/aaf/cadi/User.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.security.Principal; import java.util.HashMap; @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.att.cadi.lur.LocalPermission; +import org.onap.aaf.cadi.lur.LocalPermission; /** * Class to hold info from the User Perspective. diff --git a/core/src/main/java/com/att/cadi/UserChain.java b/core/src/main/java/org/onap/aaf/cadi/UserChain.java similarity index 96% rename from core/src/main/java/com/att/cadi/UserChain.java rename to core/src/main/java/org/onap/aaf/cadi/UserChain.java index df493c5..ac04792 100644 --- a/core/src/main/java/com/att/cadi/UserChain.java +++ b/core/src/main/java/org/onap/aaf/cadi/UserChain.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; /** * Interface to add a User Chain String to Principal diff --git a/core/src/main/java/com/att/cadi/config/Config.java b/core/src/main/java/org/onap/aaf/cadi/config/Config.java similarity index 95% rename from core/src/main/java/com/att/cadi/config/Config.java rename to core/src/main/java/org/onap/aaf/cadi/config/Config.java index ada6117..4128665 100644 --- a/core/src/main/java/com/att/cadi/config/Config.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/Config.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; import java.io.IOException; import java.lang.reflect.Constructor; @@ -34,29 +34,30 @@ import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; + +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CachingLur; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.CredVal; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.lur.EpiLur; +import org.onap.aaf.cadi.lur.LocalLur; +import org.onap.aaf.cadi.lur.NullLur; +import org.onap.aaf.cadi.taf.HttpEpiTaf; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.basic.BasicHttpTaf; +import org.onap.aaf.cadi.taf.cert.X509Taf; +import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf; + import java.util.Properties; import java.util.TimerTask; -import com.att.cadi.AbsUserCache; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CachingLur; -import com.att.cadi.CadiException; -import com.att.cadi.CredVal; -import com.att.cadi.Locator; -import com.att.cadi.Lur; -import com.att.cadi.PropAccess; -import com.att.cadi.Symm; -import com.att.cadi.TrustChecker; -import com.att.cadi.lur.EpiLur; -import com.att.cadi.lur.LocalLur; -import com.att.cadi.lur.NullLur; -import com.att.cadi.taf.HttpEpiTaf; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.basic.BasicHttpTaf; -import com.att.cadi.taf.cert.X509Taf; -import com.att.cadi.taf.dos.DenialOfServiceTaf; - /** * Create a Consistent Configuration mechanism, even when configuration styles are as vastly different as * Properties vs JavaBeans vs FilterConfigs... diff --git a/core/src/main/java/com/att/cadi/config/Get.java b/core/src/main/java/org/onap/aaf/cadi/config/Get.java similarity index 93% rename from core/src/main/java/com/att/cadi/config/Get.java rename to core/src/main/java/org/onap/aaf/cadi/config/Get.java index 7a2eab5..ea06c87 100644 --- a/core/src/main/java/com/att/cadi/config/Get.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/Get.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; import java.lang.reflect.Method; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Access.Level; public interface Get { public String get(String name, String def, boolean print); diff --git a/core/src/main/java/com/att/cadi/config/GetAccess.java b/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java similarity index 94% rename from core/src/main/java/com/att/cadi/config/GetAccess.java rename to core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java index 1df9b0e..dc5e4ef 100644 --- a/core/src/main/java/com/att/cadi/config/GetAccess.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; -import com.att.cadi.PropAccess; +import org.onap.aaf.cadi.PropAccess; public class GetAccess extends PropAccess { private final Get getter; diff --git a/core/src/main/java/com/att/cadi/config/MultiGet.java b/core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java similarity index 95% rename from core/src/main/java/com/att/cadi/config/MultiGet.java rename to core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java index 83cd21d..551018c 100644 --- a/core/src/main/java/com/att/cadi/config/MultiGet.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; public class MultiGet implements Get { private Get[] getters; diff --git a/core/src/main/java/com/att/cadi/config/SecurityInfo.java b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java similarity index 95% rename from core/src/main/java/com/att/cadi/config/SecurityInfo.java rename to core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java index 6d0f3c2..4301d53 100644 --- a/core/src/main/java/com/att/cadi/config/SecurityInfo.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; import java.io.File; import java.io.FileInputStream; @@ -46,10 +46,10 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.util.MaskFormatException; -import com.att.cadi.util.NetMask; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.util.MaskFormatException; +import org.onap.aaf.cadi.util.NetMask; public class SecurityInfo { private static final String SECURITY_ALGO = "RSA"; diff --git a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java similarity index 91% rename from core/src/main/java/com/att/cadi/config/SecurityInfoC.java rename to core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java index 2b0ec43..e631928 100644 --- a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; import java.io.IOException; import java.security.GeneralSecurityException; -import com.att.cadi.Access; -import com.att.cadi.SecuritySetter; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.SecuritySetter; public class SecurityInfoC extends SecurityInfo { diff --git a/core/src/main/java/com/att/cadi/config/UsersDump.java b/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java similarity index 94% rename from core/src/main/java/com/att/cadi/config/UsersDump.java rename to core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java index 992b365..e0893e6 100644 --- a/core/src/main/java/com/att/cadi/config/UsersDump.java +++ b/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.config; +package org.onap.aaf.cadi.config; import java.io.ByteArrayOutputStream; import java.io.File; @@ -32,8 +32,8 @@ import java.io.PrintStream; import java.util.Date; import java.util.HashSet; -import com.att.cadi.AbsUserCache; -import com.att.cadi.lur.LocalLur; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.lur.LocalLur; public class UsersDump { diff --git a/core/src/main/java/com/att/cadi/filter/AUTHZ.java b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java similarity index 95% rename from core/src/main/java/com/att/cadi/filter/AUTHZ.java rename to core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java index ab32a98..49a1634 100644 --- a/core/src/main/java/com/att/cadi/filter/AUTHZ.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java similarity index 95% rename from core/src/main/java/com/att/cadi/filter/AUTHZServlet.java rename to core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java index c1ad627..871dee3 100644 --- a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import java.io.IOException; diff --git a/core/src/main/java/com/att/cadi/filter/AccessGetter.java b/core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java similarity index 91% rename from core/src/main/java/com/att/cadi/filter/AccessGetter.java rename to core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java index 37d2c04..596afd2 100644 --- a/core/src/main/java/com/att/cadi/filter/AccessGetter.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java @@ -20,10 +20,10 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; -import com.att.cadi.Access; -import com.att.cadi.config.Get; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.config.Get; public class AccessGetter implements Get { private final Access access; diff --git a/core/src/main/java/com/att/cadi/filter/CadiAccess.java b/core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java similarity index 93% rename from core/src/main/java/com/att/cadi/filter/CadiAccess.java rename to core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java index e9bc5a8..2ccd29a 100644 --- a/core/src/main/java/com/att/cadi/filter/CadiAccess.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import java.io.FileInputStream; import java.io.IOException; @@ -31,10 +31,10 @@ import java.util.Properties; import javax.servlet.ServletContext; -import com.att.cadi.Access; -import com.att.cadi.Symm; -import com.att.cadi.config.Config; -import com.att.cadi.config.Get; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.Get; public class CadiAccess implements Access { // constants for a couple of very commonly used strings. diff --git a/core/src/main/java/com/att/cadi/filter/CadiFilter.java b/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java similarity index 92% rename from core/src/main/java/com/att/cadi/filter/CadiFilter.java rename to core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java index da24f44..0b8bb8f 100644 --- a/core/src/main/java/com/att/cadi/filter/CadiFilter.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import java.io.IOException; import java.lang.reflect.Constructor; @@ -36,18 +36,18 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CadiException; -import com.att.cadi.CadiWrap; -import com.att.cadi.Lur; -import com.att.cadi.PropAccess; -import com.att.cadi.ServletContextAccess; -import com.att.cadi.TrustChecker; -import com.att.cadi.config.Config; -import com.att.cadi.config.Get; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TafResp.RESP; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.CadiWrap; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.ServletContextAccess; +import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.Get; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp.RESP; /** * CadiFilter diff --git a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java b/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java similarity index 90% rename from core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java rename to core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java index 6969b8c..a3df1c0 100644 --- a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import java.io.IOException; import java.util.ArrayList; @@ -29,20 +29,20 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CadiException; -import com.att.cadi.CadiWrap; -import com.att.cadi.Connector; -import com.att.cadi.CredVal; -import com.att.cadi.Lur; -import com.att.cadi.Taf; -import com.att.cadi.TrustChecker; -import com.att.cadi.config.Config; -import com.att.cadi.lur.EpiLur; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.TafResp; -import com.att.cadi.util.UserChainManip; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.CadiWrap; +import org.onap.aaf.cadi.Connector; +import org.onap.aaf.cadi.CredVal; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.Taf; +import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.lur.EpiLur; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.util.UserChainManip; /** * Encapsulate common HTTP Manipulation Behavior. It will appropriately set diff --git a/core/src/main/java/com/att/cadi/filter/FCGet.java b/core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java similarity index 91% rename from core/src/main/java/com/att/cadi/filter/FCGet.java rename to core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java index b8f95da..e6912e7 100644 --- a/core/src/main/java/com/att/cadi/filter/FCGet.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.config.Get; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Get; /* * A private method to query the Filter config and if not exists, return the default. This diff --git a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java b/core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java similarity index 95% rename from core/src/main/java/com/att/cadi/filter/MapPermConverter.java rename to core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java index 09b6f93..933e6f9 100644 --- a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java b/core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java similarity index 95% rename from core/src/main/java/com/att/cadi/filter/NullPermConverter.java rename to core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java index d73008e..223e1a4 100644 --- a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; /** diff --git a/core/src/main/java/com/att/cadi/filter/PathFilter.java b/core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java similarity index 94% rename from core/src/main/java/com/att/cadi/filter/PathFilter.java rename to core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java index 328977d..87e3c78 100644 --- a/core/src/main/java/com/att/cadi/filter/PathFilter.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import java.io.IOException; @@ -34,9 +34,9 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Config; /** * PathFilter diff --git a/core/src/main/java/com/att/cadi/filter/PermConverter.java b/core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java similarity index 95% rename from core/src/main/java/com/att/cadi/filter/PermConverter.java rename to core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java index ba098c4..8f71e29 100644 --- a/core/src/main/java/com/att/cadi/filter/PermConverter.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; /** * Convert a simplistic, single string Permission into an Enterprise Scoped Perm diff --git a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java b/core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java similarity index 96% rename from core/src/main/java/com/att/cadi/filter/RolesAllowed.java rename to core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java index 97a8f54..0a5873e 100644 --- a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java @@ -31,7 +31,7 @@ * POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation * */ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/core/src/main/java/com/att/cadi/filter/ServletImpl.java b/core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java similarity index 96% rename from core/src/main/java/com/att/cadi/filter/ServletImpl.java rename to core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java index 13a251c..f581c5f 100644 --- a/core/src/main/java/com/att/cadi/filter/ServletImpl.java +++ b/core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java @@ -31,7 +31,7 @@ * POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation * */ -package com.att.cadi.filter; +package org.onap.aaf.cadi.filter; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java similarity index 92% rename from core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java index 443d7e7..32e4816 100644 --- a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur; +package org.onap.aaf.cadi.lur; import java.io.IOException; import java.security.Principal; -import com.att.cadi.GetCred; -import com.att.cadi.Symm; +import org.onap.aaf.cadi.GetCred; +import org.onap.aaf.cadi.Symm; public class ConfigPrincipal implements Principal, GetCred { private String name; diff --git a/core/src/main/java/com/att/cadi/lur/EpiLur.java b/core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java similarity index 92% rename from core/src/main/java/com/att/cadi/lur/EpiLur.java rename to core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java index 1eff70e..0e612e9 100644 --- a/core/src/main/java/com/att/cadi/lur/EpiLur.java +++ b/core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur; +package org.onap.aaf.cadi.lur; import java.security.Principal; import java.util.List; -import com.att.cadi.CachingLur; -import com.att.cadi.CadiException; -import com.att.cadi.CredVal; -import com.att.cadi.Lur; -import com.att.cadi.Permission; +import org.onap.aaf.cadi.CachingLur; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.CredVal; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.Permission; /** * EpiLUR diff --git a/core/src/main/java/com/att/cadi/lur/LocalLur.java b/core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java similarity index 92% rename from core/src/main/java/com/att/cadi/lur/LocalLur.java rename to core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java index 5980769..4086b51 100644 --- a/core/src/main/java/com/att/cadi/lur/LocalLur.java +++ b/core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur; +package org.onap.aaf.cadi.lur; import java.io.IOException; import java.security.Principal; @@ -29,15 +29,15 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import com.att.cadi.AbsUserCache; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CredVal; -import com.att.cadi.Hash; -import com.att.cadi.Permission; -import com.att.cadi.StrLur; -import com.att.cadi.User; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CredVal; +import org.onap.aaf.cadi.Hash; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.StrLur; +import org.onap.aaf.cadi.User; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.config.Config; /** diff --git a/core/src/main/java/com/att/cadi/lur/LocalPermission.java b/core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java similarity index 93% rename from core/src/main/java/com/att/cadi/lur/LocalPermission.java rename to core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java index b44f840..cccb74c 100644 --- a/core/src/main/java/com/att/cadi/lur/LocalPermission.java +++ b/core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur; +package org.onap.aaf.cadi.lur; -import com.att.cadi.Permission; +import org.onap.aaf.cadi.Permission; public class LocalPermission implements Permission { private String key; diff --git a/core/src/main/java/com/att/cadi/lur/NullLur.java b/core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java similarity index 93% rename from core/src/main/java/com/att/cadi/lur/NullLur.java rename to core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java index 7b01f5a..94080df 100644 --- a/core/src/main/java/com/att/cadi/lur/NullLur.java +++ b/core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur; +package org.onap.aaf.cadi.lur; import java.security.Principal; import java.util.List; -import com.att.cadi.Lur; -import com.att.cadi.Permission; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.Permission; public class NullLur implements Lur { private static final Permission NULL = new Permission() { diff --git a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java similarity index 92% rename from core/src/main/java/com/att/cadi/principal/BasicPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java index 800628d..e84caeb 100644 --- a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,9 +28,9 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Date; -import com.att.cadi.BasicCred; -import com.att.cadi.GetCred; -import com.att.cadi.Symm; +import org.onap.aaf.cadi.BasicCred; +import org.onap.aaf.cadi.GetCred; +import org.onap.aaf.cadi.Symm; public class BasicPrincipal extends BearerPrincipal implements GetCred { private static byte[] basic = "Basic ".getBytes(); diff --git a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java similarity index 95% rename from core/src/main/java/com/att/cadi/principal/BearerPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java index 0d215a5..08793c5 100644 --- a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.security.Principal; diff --git a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java b/core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java similarity index 95% rename from core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java rename to core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java index e3ccb42..3694584 100644 --- a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.security.Principal; diff --git a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java similarity index 91% rename from core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java index de1ebaf..9a33dc6 100644 --- a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.io.IOException; -import com.att.cadi.BasicCred; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.BasicCred; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.taf.HttpTaf; /** * Cached Principals need to be able to revalidate in the Background diff --git a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java similarity index 95% rename from core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java index e2a6400..b55f86a 100644 --- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; public class TGuardPrincipal extends BearerPrincipal { diff --git a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java similarity index 95% rename from core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java rename to core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java index cfd8564..235c74c 100644 --- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.security.Principal; diff --git a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java b/core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java similarity index 93% rename from core/src/main/java/com/att/cadi/principal/TrustPrincipal.java rename to core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java index 744560f..4add242 100644 --- a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.security.Principal; -import com.att.cadi.UserChain; +import org.onap.aaf.cadi.UserChain; public class TrustPrincipal extends BearerPrincipal implements UserChain { private final String name; diff --git a/core/src/main/java/com/att/cadi/principal/X509Principal.java b/core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java similarity index 94% rename from core/src/main/java/com/att/cadi/principal/X509Principal.java rename to core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java index 89a8dc2..2f3fd28 100644 --- a/core/src/main/java/com/att/cadi/principal/X509Principal.java +++ b/core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.principal; +package org.onap.aaf.cadi.principal; import java.io.IOException; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.regex.Pattern; -import com.att.cadi.GetCred; +import org.onap.aaf.cadi.GetCred; public class X509Principal extends BearerPrincipal implements GetCred { private static final Pattern pattern = Pattern.compile("[a-zA-Z0-9]*\\@[a-zA-Z0-9.]*"); diff --git a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java similarity index 94% rename from core/src/main/java/com/att/cadi/taf/AbsTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java index f57b975..6a7f15e 100644 --- a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java @@ -20,11 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.security.Principal; -import com.att.cadi.Access; +import org.onap.aaf.cadi.Access; /** * AbsTafResp diff --git a/core/src/main/java/com/att/cadi/taf/EpiTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java similarity index 93% rename from core/src/main/java/com/att/cadi/taf/EpiTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java index 613f317..7cb40ed 100644 --- a/core/src/main/java/com/att/cadi/taf/EpiTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java @@ -20,10 +20,10 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; -import com.att.cadi.CadiException; -import com.att.cadi.Taf; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Taf; /** * EpiTAF diff --git a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java similarity index 92% rename from core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java index 3036f07..05832f7 100644 --- a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.net.URI; import java.security.Principal; @@ -30,13 +30,13 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.CadiException; -import com.att.cadi.Locator; -import com.att.cadi.Taf.LifeForm; -import com.att.cadi.TrustChecker; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.Taf.LifeForm; /** * HttpEpiTaf diff --git a/core/src/main/java/com/att/cadi/taf/HttpTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java similarity index 92% rename from core/src/main/java/com/att/cadi/taf/HttpTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java index ad22872..325de6a 100644 --- a/core/src/main/java/com/att/cadi/taf/HttpTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.Taf.LifeForm; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.Taf.LifeForm; /** * A TAF which is in a specific HTTP environment in which the engine implements diff --git a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java similarity index 91% rename from core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java index 8a6acad..b6bb385 100644 --- a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.io.IOException; import java.net.URI; @@ -28,10 +28,10 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.Locator; -import com.att.cadi.Locator.Item; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Locator; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.Locator.Item; public class LoginPageTafResp extends AbsTafResp { private final HttpServletResponse httpResp; diff --git a/core/src/main/java/com/att/cadi/taf/NullTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java similarity index 91% rename from core/src/main/java/com/att/cadi/taf/NullTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java index 0a6f4bb..fb1b930 100644 --- a/core/src/main/java/com/att/cadi/taf/NullTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.Taf; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.Taf; +import org.onap.aaf.cadi.CachedPrincipal.Resp; /** diff --git a/core/src/main/java/com/att/cadi/taf/NullTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java similarity index 93% rename from core/src/main/java/com/att/cadi/taf/NullTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java index 8dcfc1e..97e49e0 100644 --- a/core/src/main/java/com/att/cadi/taf/NullTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.io.IOException; import java.security.Principal; -import com.att.cadi.Access; +import org.onap.aaf.cadi.Access; /** * A Null Pattern for setting responses to "Deny" before configuration is setup. diff --git a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java similarity index 94% rename from core/src/main/java/com/att/cadi/taf/PuntTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java index 8951145..10c401a 100644 --- a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.io.IOException; import java.security.Principal; -import com.att.cadi.Access; +import org.onap.aaf.cadi.Access; /** * A Punt Resp to make it fast and easy for a Taf to respond that it cannot handle a particular kind of diff --git a/core/src/main/java/com/att/cadi/taf/Redirectable.java b/core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java similarity index 95% rename from core/src/main/java/com/att/cadi/taf/Redirectable.java rename to core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java index 4ef31bc..6e20bab 100644 --- a/core/src/main/java/com/att/cadi/taf/Redirectable.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; public interface Redirectable extends TafResp { /** diff --git a/core/src/main/java/com/att/cadi/taf/TafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java similarity index 93% rename from core/src/main/java/com/att/cadi/taf/TafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java index 140ac13..cb0915a 100644 --- a/core/src/main/java/com/att/cadi/taf/TafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.io.IOException; import java.security.Principal; -import com.att.cadi.Access; -import com.att.cadi.CadiException; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CadiException; /** * Response from Taf objects, which inform users what has happened and/or what should be done diff --git a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java similarity index 93% rename from core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java index 29a299f..2ab4a62 100644 --- a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.io.IOException; import java.security.Principal; -import com.att.cadi.Access; +import org.onap.aaf.cadi.Access; public class TrustNotTafResp implements TafResp { private final TafResp delegate; diff --git a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java similarity index 94% rename from core/src/main/java/com/att/cadi/taf/TrustTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java index 25c665b..cd4c92f 100644 --- a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf; +package org.onap.aaf.cadi.taf; import java.io.IOException; import java.security.Principal; -import com.att.cadi.Access; +import org.onap.aaf.cadi.Access; public class TrustTafResp implements TafResp { private final TafResp delegate; diff --git a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java similarity index 88% rename from core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java index f954a00..f6cc3a7 100644 --- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.basic; +package org.onap.aaf.cadi.taf.basic; import java.io.IOException; import java.security.Principal; @@ -28,20 +28,20 @@ import java.security.Principal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.BasicCred; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.CredVal; -import com.att.cadi.CredVal.Type; -import com.att.cadi.Taf; -import com.att.cadi.principal.BasicPrincipal; -import com.att.cadi.principal.CachedBasicPrincipal; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TafResp.RESP; -import com.att.cadi.taf.dos.DenialOfServiceTaf; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.BasicCred; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.CredVal; +import org.onap.aaf.cadi.Taf; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.CredVal.Type; +import org.onap.aaf.cadi.principal.BasicPrincipal; +import org.onap.aaf.cadi.principal.CachedBasicPrincipal; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp.RESP; +import org.onap.aaf.cadi.taf.dos.DenialOfServiceTaf; /** * BasicHttpTaf diff --git a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java similarity index 91% rename from core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java index 1d43054..45eab48 100644 --- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.basic; +package org.onap.aaf.cadi.taf.basic; import java.io.IOException; import java.security.Principal; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.taf.AbsTafResp; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.taf.AbsTafResp; +import org.onap.aaf.cadi.taf.TafResp; public class BasicHttpTafResp extends AbsTafResp implements TafResp { private HttpServletResponse httpResp; diff --git a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java b/core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java similarity index 95% rename from core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java rename to core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java index 5d9624a..1d84d67 100644 --- a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.cert; +package org.onap.aaf.cadi.taf.cert; import java.security.Principal; import java.security.cert.CertificateException; diff --git a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java similarity index 89% rename from core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java index 8148a4e..f301fc2 100644 --- a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.cert; +package org.onap.aaf.cadi.taf.cert; import java.io.IOException; import java.security.Principal; -import com.att.cadi.Access; -import com.att.cadi.taf.AbsTafResp; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.taf.AbsTafResp; +import org.onap.aaf.cadi.taf.TafResp; public class X509HttpTafResp extends AbsTafResp implements TafResp { private RESP status; diff --git a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java similarity index 90% rename from core/src/main/java/com/att/cadi/taf/cert/X509Taf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java index 6bef245..36217cc 100644 --- a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.cert; +package org.onap.aaf.cadi.taf.cert; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -39,24 +39,24 @@ import javax.net.ssl.TrustManagerFactory; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.CadiException; -import com.att.cadi.Lur; -import com.att.cadi.Symm; -import com.att.cadi.Taf.LifeForm; -import com.att.cadi.config.Config; -import com.att.cadi.config.SecurityInfoC; -import com.att.cadi.config.SecurityInfo; -import com.att.cadi.lur.LocalPermission; -import com.att.cadi.principal.TGuardPrincipal; -import com.att.cadi.principal.X509Principal; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TafResp.RESP; -import com.att.cadi.util.Split; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.Taf.LifeForm; +import org.onap.aaf.cadi.config.Config; +import org.onap.aaf.cadi.config.SecurityInfo; +import org.onap.aaf.cadi.config.SecurityInfoC; +import org.onap.aaf.cadi.lur.LocalPermission; +import org.onap.aaf.cadi.principal.TGuardPrincipal; +import org.onap.aaf.cadi.principal.X509Principal; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp.RESP; +import org.onap.aaf.cadi.util.Split; public class X509Taf implements HttpTaf { diff --git a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java similarity index 91% rename from core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java index 6bb9252..c55b7eb 100644 --- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.dos; +package org.onap.aaf.cadi.taf.dos; import java.io.BufferedReader; import java.io.File; @@ -37,15 +37,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.CadiException; -import com.att.cadi.Taf.LifeForm; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.PuntTafResp; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TafResp.RESP; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.Taf.LifeForm; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.PuntTafResp; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp.RESP; public class DenialOfServiceTaf implements HttpTaf { private static Map deniedIP=null, deniedID=null; diff --git a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java similarity index 91% rename from core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java index 1b4efed..ac6c01a 100644 --- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.dos; +package org.onap.aaf.cadi.taf.dos; import java.io.IOException; -import com.att.cadi.Access; -import com.att.cadi.taf.AbsTafResp; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.taf.AbsTafResp; public class DenialOfServiceTafResp extends AbsTafResp { private RESP ect; // Homage to Arethra Franklin diff --git a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java similarity index 90% rename from core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java rename to core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java index 67754a9..af9554f 100644 --- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.localhost; +package org.onap.aaf.cadi.taf.localhost; import java.net.InetAddress; import java.net.NetworkInterface; @@ -32,14 +32,14 @@ import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.att.cadi.Access; -import com.att.cadi.Access.Level; -import com.att.cadi.CachedPrincipal; -import com.att.cadi.CachedPrincipal.Resp; -import com.att.cadi.Taf; -import com.att.cadi.taf.HttpTaf; -import com.att.cadi.taf.TafResp; -import com.att.cadi.taf.TafResp.RESP; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.CachedPrincipal; +import org.onap.aaf.cadi.Taf; +import org.onap.aaf.cadi.Access.Level; +import org.onap.aaf.cadi.CachedPrincipal.Resp; +import org.onap.aaf.cadi.taf.HttpTaf; +import org.onap.aaf.cadi.taf.TafResp; +import org.onap.aaf.cadi.taf.TafResp.RESP; /** * Implement the ability to utilize LocalHost as a TAF. diff --git a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java similarity index 91% rename from core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java rename to core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java index 2a074d1..bda5484 100644 --- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java +++ b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.taf.localhost; +package org.onap.aaf.cadi.taf.localhost; import java.security.Principal; -import com.att.cadi.Access; -import com.att.cadi.taf.TafResp; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.taf.TafResp; public class LocalhostTafResp implements TafResp { private RESP action; diff --git a/core/src/main/java/com/att/cadi/util/Chmod.java b/core/src/main/java/org/onap/aaf/cadi/util/Chmod.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/Chmod.java rename to core/src/main/java/org/onap/aaf/cadi/util/Chmod.java index ddde50b..f999a11 100644 --- a/core/src/main/java/com/att/cadi/util/Chmod.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/Chmod.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java b/core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/JsonOutputStream.java rename to core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java index 33deed0..546292e 100644 --- a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/com/att/cadi/util/MaskFormatException.java b/core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/MaskFormatException.java rename to core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java index fa3f220..551eae9 100644 --- a/core/src/main/java/com/att/cadi/util/MaskFormatException.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; @SuppressWarnings("serial") public class MaskFormatException extends Exception { diff --git a/core/src/main/java/com/att/cadi/util/MyConsole.java b/core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/MyConsole.java rename to core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java index 4083dea..de1c882 100644 --- a/core/src/main/java/com/att/cadi/util/MyConsole.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; public interface MyConsole { public String readLine(String fmt, Object ... args); diff --git a/core/src/main/java/com/att/cadi/util/NetMask.java b/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/NetMask.java rename to core/src/main/java/org/onap/aaf/cadi/util/NetMask.java index 9707047..b19f150 100644 --- a/core/src/main/java/com/att/cadi/util/NetMask.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; /* * NetMask - a class to quickly validate whether a given IP is part of a mask, as defined by bytes or standard String format. diff --git a/core/src/main/java/com/att/cadi/util/Split.java b/core/src/main/java/org/onap/aaf/cadi/util/Split.java similarity index 96% rename from core/src/main/java/com/att/cadi/util/Split.java rename to core/src/main/java/org/onap/aaf/cadi/util/Split.java index 07332dd..c3b37dc 100644 --- a/core/src/main/java/com/att/cadi/util/Split.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/Split.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; /** * Split by Char, optional Trim diff --git a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java b/core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/SubStandardConsole.java rename to core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java index 8a44568..b2a29e6 100644 --- a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/core/src/main/java/com/att/cadi/util/TheConsole.java b/core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/TheConsole.java rename to core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java index 05fcd9b..3a6b291 100644 --- a/core/src/main/java/com/att/cadi/util/TheConsole.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; public class TheConsole implements MyConsole { @Override diff --git a/core/src/main/java/com/att/cadi/util/UserChainManip.java b/core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java similarity index 94% rename from core/src/main/java/com/att/cadi/util/UserChainManip.java rename to core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java index 9f6eeec..5f945f3 100644 --- a/core/src/main/java/com/att/cadi/util/UserChainManip.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; -import com.att.cadi.UserChain; +import org.onap.aaf.cadi.UserChain; public class UserChainManip { /** diff --git a/core/src/main/java/com/att/cadi/util/Vars.java b/core/src/main/java/org/onap/aaf/cadi/util/Vars.java similarity index 95% rename from core/src/main/java/com/att/cadi/util/Vars.java rename to core/src/main/java/org/onap/aaf/cadi/util/Vars.java index 8d0b27e..af8cf86 100644 --- a/core/src/main/java/com/att/cadi/util/Vars.java +++ b/core/src/main/java/org/onap/aaf/cadi/util/Vars.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.util; +package org.onap.aaf.cadi.util; import java.util.List; diff --git a/core/src/main/java/com/att/cadi/wsse/Action.java b/core/src/main/java/org/onap/aaf/cadi/wsse/Action.java similarity index 96% rename from core/src/main/java/com/att/cadi/wsse/Action.java rename to core/src/main/java/org/onap/aaf/cadi/wsse/Action.java index 0ed99c0..e95337f 100644 --- a/core/src/main/java/com/att/cadi/wsse/Action.java +++ b/core/src/main/java/org/onap/aaf/cadi/wsse/Action.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse; +package org.onap.aaf.cadi.wsse; /** * Interface to specify an action deep within a parsing tree on a local object diff --git a/core/src/main/java/com/att/cadi/wsse/Match.java b/core/src/main/java/org/onap/aaf/cadi/wsse/Match.java similarity index 96% rename from core/src/main/java/com/att/cadi/wsse/Match.java rename to core/src/main/java/org/onap/aaf/cadi/wsse/Match.java index e1c1078..bffe447 100644 --- a/core/src/main/java/com/att/cadi/wsse/Match.java +++ b/core/src/main/java/org/onap/aaf/cadi/wsse/Match.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse; +package org.onap.aaf.cadi.wsse; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; diff --git a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java b/core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java similarity index 95% rename from core/src/main/java/com/att/cadi/wsse/WSSEParser.java rename to core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java index 4c7ba90..760020a 100644 --- a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java +++ b/core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse; +package org.onap.aaf.cadi.wsse; import java.io.IOException; import java.io.InputStream; import javax.xml.stream.XMLStreamException; -import com.att.cadi.BasicCred; +import org.onap.aaf.cadi.BasicCred; /** diff --git a/core/src/main/java/com/att/cadi/wsse/XEvent.java b/core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java similarity index 95% rename from core/src/main/java/com/att/cadi/wsse/XEvent.java rename to core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java index 51a2734..e5af256 100644 --- a/core/src/main/java/com/att/cadi/wsse/XEvent.java +++ b/core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse; +package org.onap.aaf.cadi.wsse; import javax.xml.namespace.QName; import javax.xml.stream.events.XMLEvent; diff --git a/core/src/main/java/com/att/cadi/wsse/XReader.java b/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java similarity index 96% rename from core/src/main/java/com/att/cadi/wsse/XReader.java rename to core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java index 833eb60..8fa8113 100644 --- a/core/src/main/java/com/att/cadi/wsse/XReader.java +++ b/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse; +package org.onap.aaf.cadi.wsse; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/core/src/test/java/com/att/cadi/JU_AES.java b/core/src/test/java/org/onap/aaf/cadi/JU_AES.java similarity index 94% rename from core/src/test/java/com/att/cadi/JU_AES.java rename to core/src/test/java/org/onap/aaf/cadi/JU_AES.java index fb2482a..11e40a6 100644 --- a/core/src/test/java/com/att/cadi/JU_AES.java +++ b/core/src/test/java/org/onap/aaf/cadi/JU_AES.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi; +package org.onap.aaf.cadi; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,6 +29,8 @@ import javax.crypto.CipherInputStream; import javax.crypto.CipherOutputStream; import org.junit.Test; +import org.onap.aaf.cadi.AES; +import org.onap.aaf.cadi.Symm; import junit.framework.Assert; diff --git a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java similarity index 88% rename from core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java rename to core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java index f11c74d..f050a6b 100644 --- a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java +++ b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.test; +package org.onap.aaf.cadi.lur.test; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -35,15 +35,14 @@ import java.util.Set; import java.util.TreeSet; import org.junit.Test; - -import com.att.cadi.CredVal.Type; -import com.att.cadi.Lur; -import com.att.cadi.Permission; -import com.att.cadi.PropAccess; -import com.att.cadi.Symm; -import com.att.cadi.config.UsersDump; -import com.att.cadi.lur.LocalLur; -import com.att.cadi.lur.LocalPermission; +import org.onap.aaf.cadi.Lur; +import org.onap.aaf.cadi.Permission; +import org.onap.aaf.cadi.PropAccess; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.CredVal.Type; +import org.onap.aaf.cadi.config.UsersDump; +import org.onap.aaf.cadi.lur.LocalLur; +import org.onap.aaf.cadi.lur.LocalPermission; public class JU_LocalLur { diff --git a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java b/core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java similarity index 93% rename from core/src/test/java/com/att/cadi/lur/test/TestAccess.java rename to core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java index 81d5092..8b1bab6 100644 --- a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java +++ b/core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java @@ -20,13 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.lur.test; +package org.onap.aaf.cadi.lur.test; import java.io.IOException; import java.io.InputStream; -import com.att.cadi.Access; -import com.att.cadi.Symm; +import org.onap.aaf.cadi.Access; +import org.onap.aaf.cadi.Symm; public class TestAccess implements Access { private Symm symm; diff --git a/core/src/test/java/com/att/cadi/test/JU_Base64.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java similarity index 95% rename from core/src/test/java/com/att/cadi/test/JU_Base64.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java index 1a82298..4d49c92 100644 --- a/core/src/test/java/com/att/cadi/test/JU_Base64.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; @@ -30,9 +30,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.security.SecureRandom; import org.junit.Test; - -import com.att.cadi.Symm; -import com.att.cadi.config.Config; +import org.onap.aaf.cadi.Symm; +import org.onap.aaf.cadi.config.Config; public class JU_Base64 { diff --git a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java similarity index 94% rename from core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java index 5f299bb..e496076 100644 --- a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import static junit.framework.Assert.assertEquals; @@ -29,8 +29,7 @@ import java.io.FileInputStream; import java.io.IOException; import org.junit.Test; - -import com.att.cadi.BufferedServletInputStream; +import org.onap.aaf.cadi.BufferedServletInputStream; public class JU_BufferedServletInputStream { diff --git a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java similarity index 95% rename from core/src/test/java/com/att/cadi/test/JU_Capacitor.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java index 5584911..9d11fe4 100644 --- a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java @@ -20,13 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import static junit.framework.Assert.assertEquals; import org.junit.Test; - -import com.att.cadi.Capacitor; +import org.onap.aaf.cadi.Capacitor; public class JU_Capacitor { @Test diff --git a/core/src/test/java/com/att/cadi/test/JU_Hash.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java similarity index 92% rename from core/src/test/java/com/att/cadi/test/JU_Hash.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java index e5d2d6b..92dd297 100644 --- a/core/src/test/java/com/att/cadi/test/JU_Hash.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java @@ -20,12 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import org.junit.Test; - -import com.att.cadi.CadiException; -import com.att.cadi.Hash; +import org.onap.aaf.cadi.CadiException; +import org.onap.aaf.cadi.Hash; import junit.framework.Assert; diff --git a/core/src/test/java/com/att/cadi/test/JU_Passcode.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java similarity index 94% rename from core/src/test/java/com/att/cadi/test/JU_Passcode.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java index 122ecf7..40ceaa1 100644 --- a/core/src/test/java/com/att/cadi/test/JU_Passcode.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java @@ -20,16 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import org.junit.Test; - -import com.att.cadi.CmdLine; -import com.att.cadi.Symm; +import org.onap.aaf.cadi.CmdLine; +import org.onap.aaf.cadi.Symm; import junit.framework.Assert; diff --git a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java similarity index 94% rename from core/src/test/java/com/att/cadi/test/JU_UserChainManip.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java index 65f5ebd..397b4b1 100644 --- a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java @@ -20,13 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import static org.junit.Assert.*; import org.junit.Test; - -import com.att.cadi.util.UserChainManip; +import org.onap.aaf.cadi.util.UserChainManip; public class JU_UserChainManip { diff --git a/core/src/test/java/com/att/cadi/test/JU_Vars.java b/core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java similarity index 96% rename from core/src/test/java/com/att/cadi/test/JU_Vars.java rename to core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java index e681622..47209cd 100644 --- a/core/src/test/java/com/att/cadi/test/JU_Vars.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java @@ -20,14 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import static org.junit.Assert.assertEquals; import org.junit.AfterClass; import org.junit.Test; - -import com.att.cadi.util.Vars; +import org.onap.aaf.cadi.util.Vars; public class JU_Vars { diff --git a/core/src/test/java/com/att/cadi/test/Test.java b/core/src/test/java/org/onap/aaf/cadi/test/Test.java similarity index 96% rename from core/src/test/java/com/att/cadi/test/Test.java rename to core/src/test/java/org/onap/aaf/cadi/test/Test.java index 4fe9111..ad0c517 100644 --- a/core/src/test/java/com/att/cadi/test/Test.java +++ b/core/src/test/java/org/onap/aaf/cadi/test/Test.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.test; +package org.onap.aaf.cadi.test; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java similarity index 93% rename from core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java rename to core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java index 65338ae..af45f55 100644 --- a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java +++ b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse.test; +package org.onap.aaf.cadi.wsse.test; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; @@ -33,10 +33,9 @@ import java.io.FileInputStream; import javax.xml.stream.XMLStreamException; import org.junit.Test; - -import com.att.cadi.BasicCred; -import com.att.cadi.BufferedServletInputStream; -import com.att.cadi.wsse.WSSEParser; +import org.onap.aaf.cadi.BasicCred; +import org.onap.aaf.cadi.BufferedServletInputStream; +import org.onap.aaf.cadi.wsse.WSSEParser; public class JU_WSSE_Read { diff --git a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java similarity index 92% rename from core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java rename to core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java index ee69561..de8da8a 100644 --- a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java +++ b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java @@ -20,16 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * * ******************************************************************************/ -package com.att.cadi.wsse.test; +package org.onap.aaf.cadi.wsse.test; import java.io.FileInputStream; import javax.xml.stream.events.XMLEvent; import org.junit.Test; - -import com.att.cadi.wsse.XEvent; -import com.att.cadi.wsse.XReader; +import org.onap.aaf.cadi.wsse.XEvent; +import org.onap.aaf.cadi.wsse.XReader; public class JU_XReader { @Test diff --git a/pom.xml b/pom.xml index 7f74b12..1568559 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,8 @@ 4.0.0 - com.att.cadi + org.onap.aaf.cadi parent CADI Parent POM (Code, Access, Data, Identity) 1.0.0-SNAPSHOT @@ -49,7 +48,7 @@ true UTF-8 1.0.0-SNAPSHOT - 2.6 + 1.0.0-SNAPSHOT 3.1.200 @@ -59,8 +58,13 @@ + 1.0.0-SNAPSHOT + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/aaf/cadi/${project.artifactId}/${project.version} - @@ -101,69 +105,69 @@ - com.att.authz + org.onap.aaf.authz authz-client ${project.authClientVersion} - com.att.cadi + org.onap.aaf.cadi cadi-core ${project.version} - com.att.cadi + org.onap.aaf.cadi cadi-core ${project.version} tests - com.att.cadi + org.onap.aaf.cadi cadi-cass ${project.version} - com.att.cadi + org.onap.aaf.cadi cadi-aaf ${project.version} - com.att.cadi + org.onap.aaf.cadi cadi-aaf ${project.version} full - com.att.cadi + org.onap.aaf.cadi cadi-client ${project.version} - com.att.cadi + org.onap.aaf.cadi cadi-tomcat ${project.version} - com.att.cadi + org.onap.aaf.cadi cadi-tguard ${project.version} - com.att.inno + org.onap.aaf.inno env ${project.innoVersion} - com.att.inno + org.onap.aaf.inno rosetta ${project.innoVersion} @@ -389,17 +393,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrhdme - https://oss.sonatype.org/ - true - - org.codehaus.mojo @@ -412,15 +405,7 @@ - - - - maven-surefire-plugin - 2.17 - - - - + @@ -453,28 +438,61 @@ - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + - - - - - - - - https://github.com/att/AAF.git - ${project.scm.connection} - http://github.com/att/AAF/tree/master - - - - ossrhdme - https://oss.sonatype.org/content/repositories/snapshots - - - ossrhdme - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + + + onap-plugin-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + onap-jar-snapshots + https://nexus.onap.org/content/repositories/snapshots + + + spring-repo + Spring repo + https://artifacts.alfresco.com/nexus/content/repositories/public/ + + + repository.jboss.org-public + JBoss.org Maven repository + https://repository.jboss.org/nexus/content/groups/public + +