Update project structure for aaf/cadi 51/8751/1
authorsg481n <sg481n@att.com>
Fri, 25 Aug 2017 05:57:24 +0000 (01:57 -0400)
committersg481n <sg481n@att.com>
Fri, 25 Aug 2017 05:57:37 +0000 (01:57 -0400)
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 <sg481n@att.com>
209 files changed:
aaf/pom.xml
aaf/src/main/java/Examples.java [deleted file]
aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java [moved from aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java with 95% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java [moved from aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java with 89% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java [moved from aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java with 91% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java [moved from aaf/src/main/java/com/att/cadi/aaf/PermEval.java with 96% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java [moved from aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java with 88% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java [moved from aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java with 88% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java [moved from aaf/src/main/java/com/att/cadi/aaf/client/Examples.java with 94% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java [moved from aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java with 86% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java [moved from aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java with 89% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java with 89% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java with 88% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java with 88% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java with 85% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java with 89% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java with 86% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java with 86% similarity]
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java [moved from aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java with 91% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java [moved from aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java with 93% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java [moved from aaf/src/main/java/com/att/cadi/cm/CertException.java with 95% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java [moved from aaf/src/main/java/com/att/cadi/cm/CmAgent.java with 94% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java [moved from aaf/src/main/java/com/att/cadi/cm/Factory.java with 95% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java [moved from aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java with 91% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java [moved from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java with 90% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java [moved from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java with 93% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java [moved from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java with 94% similarity]
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java [moved from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java with 93% similarity]
aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java [moved from aaf/src/main/java/com/att/cadi/sso/AAFSSO.java with 92% similarity]
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java [moved from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java with 88% similarity]
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java [moved from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java with 93% similarity]
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java [moved from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java with 96% similarity]
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java [moved from aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java with 89% similarity]
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java [moved from aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java with 92% similarity]
aaf/src/test/java/org/onap/aaf/content/JU_Content.java [moved from aaf/src/test/java/com/att/aaf/content/JU_Content.java with 91% similarity]
aaf/src/test/java/org/onap/aaf/example/CadiTest.java [moved from aaf/src/test/java/com/att/aaf/example/CadiTest.java with 85% similarity]
aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java [moved from aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java with 88% similarity]
aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java [moved from aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java with 89% similarity]
aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java [moved from aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java with 90% similarity]
aaf/src/test/java/org/onap/aaf/example/X509Test.java [moved from aaf/src/test/java/com/att/aaf/example/X509Test.java with 88% similarity]
cass/pom.xml
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java [moved from cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java with 94% similarity]
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java [moved from cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java with 94% similarity]
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java [moved from cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java with 94% similarity]
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java [moved from cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java with 89% similarity]
cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java [moved from cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java with 92% similarity]
cass/src/test/java/org/onap/aaf/cass/JU_CASS.java [moved from cass/src/test/java/com/att/aaf/cass/JU_CASS.java with 92% similarity]
client/pom.xml
client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java [moved from client/src/main/java/com/att/cadi/client/AAFClient.java with 89% similarity]
client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java [moved from client/src/main/java/com/att/cadi/client/AbsBasicAuth.java with 92% similarity]
client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java [moved from client/src/main/java/com/att/cadi/client/AbsTransferSS.java with 87% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Delete.java [moved from client/src/main/java/com/att/cadi/client/Delete.java with 91% similarity]
client/src/main/java/org/onap/aaf/cadi/client/EClient.java [moved from client/src/main/java/com/att/cadi/client/EClient.java with 90% similarity]
client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java [moved from client/src/main/java/com/att/cadi/client/EnvAccess.java with 91% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Future.java [moved from client/src/main/java/com/att/cadi/client/Future.java with 93% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Get.java [moved from client/src/main/java/com/att/cadi/client/Get.java with 89% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Holder.java [moved from client/src/main/java/com/att/cadi/client/Holder.java with 95% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Post.java [moved from client/src/main/java/com/att/cadi/client/Post.java with 87% similarity]
client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java [moved from client/src/main/java/com/att/cadi/client/PropertyLocator.java with 93% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Put.java [moved from client/src/main/java/com/att/cadi/client/Put.java with 90% similarity]
client/src/main/java/org/onap/aaf/cadi/client/RawClient.java [moved from client/src/main/java/com/att/cadi/client/RawClient.java with 95% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Rcli.java [moved from client/src/main/java/com/att/cadi/client/Rcli.java with 94% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Result.java [moved from client/src/main/java/com/att/cadi/client/Result.java with 95% similarity]
client/src/main/java/org/onap/aaf/cadi/client/Retryable.java [moved from client/src/main/java/com/att/cadi/client/Retryable.java with 90% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java [moved from client/src/main/java/com/att/cadi/dme2/DEClient.java with 90% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java [moved from client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java with 86% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java [moved from client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java with 90% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java [moved from client/src/main/java/com/att/cadi/dme2/DME2Locator.java with 95% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java [moved from client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java with 87% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java [moved from client/src/main/java/com/att/cadi/dme2/DME2x509SS.java with 87% similarity]
client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java [moved from client/src/main/java/com/att/cadi/dme2/DRcli.java with 90% similarity]
client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java [moved from client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java with 92% similarity]
client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java [moved from client/src/main/java/com/att/cadi/http/HBasicAuthSS.java with 88% similarity]
client/src/main/java/org/onap/aaf/cadi/http/HClient.java [moved from client/src/main/java/com/att/cadi/http/HClient.java with 91% similarity]
client/src/main/java/org/onap/aaf/cadi/http/HMangr.java [moved from client/src/main/java/com/att/cadi/http/HMangr.java with 91% similarity]
client/src/main/java/org/onap/aaf/cadi/http/HRcli.java [moved from client/src/main/java/com/att/cadi/http/HRcli.java with 87% similarity]
client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java [moved from client/src/main/java/com/att/cadi/http/HTransferSS.java with 88% similarity]
client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java [moved from client/src/main/java/com/att/cadi/http/HX509SS.java with 92% similarity]
client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java [moved from client/src/main/java/com/att/cadi/locator/DME2Locator.java with 94% similarity]
client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java [moved from client/src/main/java/com/att/cadi/locator/DNSLocator.java with 92% similarity]
client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java [moved from client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java with 89% similarity]
client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java [moved from client/src/main/java/com/att/cadi/locator/HotPeerLocator.java with 93% similarity]
client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java [moved from client/src/main/java/com/att/cadi/locator/PropertyLocator.java with 94% similarity]
client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java [moved from client/src/main/java/com/att/cadi/routing/GreatCircle.java with 95% similarity]
client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java [moved from client/src/test/java/com/client/test/BasicDME2Client.java with 96% similarity]
client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java [moved from client/src/test/java/com/client/test/JU_DNSLocator.java with 89% similarity]
client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java [moved from client/src/test/java/com/client/test/JU_PropertyLocator.java with 92% similarity]
client/src/test/java/org/onap/aaf/client/test/PaulUzee.java [moved from client/src/test/java/com/client/test/PaulUzee.java with 91% similarity]
client/src/test/java/org/onap/aaf/client/test/TestAccess.java [moved from client/src/test/java/com/client/test/TestAccess.java with 93% similarity]
client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java [moved from client/src/test/java/com/client/test/TestDME2Client.java with 95% similarity]
client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java [moved from client/src/test/java/com/client/test/TestDME2RcliClient.java with 91% similarity]
client/src/test/java/org/onap/aaf/client/test/TestHClient.java [moved from client/src/test/java/com/client/test/TestHClient.java with 79% similarity]
core/pom.xml
core/src/main/java/org/onap/aaf/cadi/AES.java [moved from core/src/main/java/com/att/cadi/AES.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java [moved from core/src/main/java/com/att/cadi/AbsCachedPrincipal.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java [moved from core/src/main/java/com/att/cadi/AbsUserCache.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/Access.java [moved from core/src/main/java/com/att/cadi/Access.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/BasicCred.java [moved from core/src/main/java/com/att/cadi/BasicCred.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java [moved from core/src/main/java/com/att/cadi/BufferedCadiWrap.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java [moved from core/src/main/java/com/att/cadi/BufferedServletInputStream.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java [moved from core/src/main/java/com/att/cadi/CachedPrincipal.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/CachingLur.java [moved from core/src/main/java/com/att/cadi/CachingLur.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/CadiException.java [moved from core/src/main/java/com/att/cadi/CadiException.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/CadiWrap.java [moved from core/src/main/java/com/att/cadi/CadiWrap.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/Capacitor.java [moved from core/src/main/java/com/att/cadi/Capacitor.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/CmdLine.java [moved from core/src/main/java/com/att/cadi/CmdLine.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/Connector.java [moved from core/src/main/java/com/att/cadi/Connector.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/CredVal.java [moved from core/src/main/java/com/att/cadi/CredVal.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/GetCred.java [moved from core/src/main/java/com/att/cadi/GetCred.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/Hash.java [moved from core/src/main/java/com/att/cadi/Hash.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/Locator.java [moved from core/src/main/java/com/att/cadi/Locator.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/LocatorException.java [moved from core/src/main/java/com/att/cadi/LocatorException.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/Lur.java [moved from core/src/main/java/com/att/cadi/Lur.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/Permission.java [moved from core/src/main/java/com/att/cadi/Permission.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/PropAccess.java [moved from core/src/main/java/com/att/cadi/PropAccess.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/Revalidator.java [moved from core/src/main/java/com/att/cadi/Revalidator.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java [moved from core/src/main/java/com/att/cadi/SLF4JAccess.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java [moved from core/src/main/java/com/att/cadi/SecuritySetter.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java [moved from core/src/main/java/com/att/cadi/ServletContextAccess.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/StrLur.java [moved from core/src/main/java/com/att/cadi/StrLur.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/Symm.java [moved from core/src/main/java/com/att/cadi/Symm.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/Taf.java [moved from core/src/main/java/com/att/cadi/Taf.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/Transmutate.java [moved from core/src/main/java/com/att/cadi/Transmutate.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/TrustChecker.java [moved from core/src/main/java/com/att/cadi/TrustChecker.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/User.java [moved from core/src/main/java/com/att/cadi/User.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/UserChain.java [moved from core/src/main/java/com/att/cadi/UserChain.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/config/Config.java [moved from core/src/main/java/com/att/cadi/config/Config.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/config/Get.java [moved from core/src/main/java/com/att/cadi/config/Get.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java [moved from core/src/main/java/com/att/cadi/config/GetAccess.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java [moved from core/src/main/java/com/att/cadi/config/MultiGet.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java [moved from core/src/main/java/com/att/cadi/config/SecurityInfo.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java [moved from core/src/main/java/com/att/cadi/config/SecurityInfoC.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java [moved from core/src/main/java/com/att/cadi/config/UsersDump.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java [moved from core/src/main/java/com/att/cadi/filter/AUTHZ.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java [moved from core/src/main/java/com/att/cadi/filter/AUTHZServlet.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java [moved from core/src/main/java/com/att/cadi/filter/AccessGetter.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java [moved from core/src/main/java/com/att/cadi/filter/CadiAccess.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java [moved from core/src/main/java/com/att/cadi/filter/CadiFilter.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java [moved from core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java with 90% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java [moved from core/src/main/java/com/att/cadi/filter/FCGet.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java [moved from core/src/main/java/com/att/cadi/filter/MapPermConverter.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java [moved from core/src/main/java/com/att/cadi/filter/NullPermConverter.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java [moved from core/src/main/java/com/att/cadi/filter/PathFilter.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java [moved from core/src/main/java/com/att/cadi/filter/PermConverter.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java [moved from core/src/main/java/com/att/cadi/filter/RolesAllowed.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java [moved from core/src/main/java/com/att/cadi/filter/ServletImpl.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java [moved from core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java [moved from core/src/main/java/com/att/cadi/lur/EpiLur.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java [moved from core/src/main/java/com/att/cadi/lur/LocalLur.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java [moved from core/src/main/java/com/att/cadi/lur/LocalPermission.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java [moved from core/src/main/java/com/att/cadi/lur/NullLur.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java [moved from core/src/main/java/com/att/cadi/principal/BasicPrincipal.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java [moved from core/src/main/java/com/att/cadi/principal/BearerPrincipal.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java [moved from core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java [moved from core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java [moved from core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java [moved from core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java [moved from core/src/main/java/com/att/cadi/principal/TrustPrincipal.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java [moved from core/src/main/java/com/att/cadi/principal/X509Principal.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java [moved from core/src/main/java/com/att/cadi/taf/AbsTafResp.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java [moved from core/src/main/java/com/att/cadi/taf/EpiTaf.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java [moved from core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java [moved from core/src/main/java/com/att/cadi/taf/HttpTaf.java with 92% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java [moved from core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java [moved from core/src/main/java/com/att/cadi/taf/NullTaf.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java [moved from core/src/main/java/com/att/cadi/taf/NullTafResp.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java [moved from core/src/main/java/com/att/cadi/taf/PuntTafResp.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java [moved from core/src/main/java/com/att/cadi/taf/Redirectable.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java [moved from core/src/main/java/com/att/cadi/taf/TafResp.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java [moved from core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java with 93% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java [moved from core/src/main/java/com/att/cadi/taf/TrustTafResp.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java [moved from core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java with 88% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java [moved from core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java [moved from core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java [moved from core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java with 89% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java [moved from core/src/main/java/com/att/cadi/taf/cert/X509Taf.java with 90% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java [moved from core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java [moved from core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java [moved from core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java with 90% similarity]
core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java [moved from core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java with 91% similarity]
core/src/main/java/org/onap/aaf/cadi/util/Chmod.java [moved from core/src/main/java/com/att/cadi/util/Chmod.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java [moved from core/src/main/java/com/att/cadi/util/JsonOutputStream.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java [moved from core/src/main/java/com/att/cadi/util/MaskFormatException.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java [moved from core/src/main/java/com/att/cadi/util/MyConsole.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/NetMask.java [moved from core/src/main/java/com/att/cadi/util/NetMask.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/Split.java [moved from core/src/main/java/com/att/cadi/util/Split.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java [moved from core/src/main/java/com/att/cadi/util/SubStandardConsole.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java [moved from core/src/main/java/com/att/cadi/util/TheConsole.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java [moved from core/src/main/java/com/att/cadi/util/UserChainManip.java with 94% similarity]
core/src/main/java/org/onap/aaf/cadi/util/Vars.java [moved from core/src/main/java/com/att/cadi/util/Vars.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/wsse/Action.java [moved from core/src/main/java/com/att/cadi/wsse/Action.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/wsse/Match.java [moved from core/src/main/java/com/att/cadi/wsse/Match.java with 96% similarity]
core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java [moved from core/src/main/java/com/att/cadi/wsse/WSSEParser.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java [moved from core/src/main/java/com/att/cadi/wsse/XEvent.java with 95% similarity]
core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java [moved from core/src/main/java/com/att/cadi/wsse/XReader.java with 96% similarity]
core/src/test/java/org/onap/aaf/cadi/JU_AES.java [moved from core/src/test/java/com/att/cadi/JU_AES.java with 94% similarity]
core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java [moved from core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java with 88% similarity]
core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java [moved from core/src/test/java/com/att/cadi/lur/test/TestAccess.java with 93% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java [moved from core/src/test/java/com/att/cadi/test/JU_Base64.java with 95% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java [moved from core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java with 94% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java [moved from core/src/test/java/com/att/cadi/test/JU_Capacitor.java with 95% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java [moved from core/src/test/java/com/att/cadi/test/JU_Hash.java with 92% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java [moved from core/src/test/java/com/att/cadi/test/JU_Passcode.java with 94% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java [moved from core/src/test/java/com/att/cadi/test/JU_UserChainManip.java with 94% similarity]
core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java [moved from core/src/test/java/com/att/cadi/test/JU_Vars.java with 96% similarity]
core/src/test/java/org/onap/aaf/cadi/test/Test.java [moved from core/src/test/java/com/att/cadi/test/Test.java with 96% similarity]
core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java [moved from core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java with 93% similarity]
core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java [moved from core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java with 92% similarity]
pom.xml

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