Code Review
/
aaf
/
cadi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a623b76
)
Update project structure for aaf/cadi
51/8751/1
author
sg481n
<sg481n@att.com>
Fri, 25 Aug 2017 05:57:24 +0000
(
01:57
-0400)
committer
sg481n
<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
patch
|
blob
|
history
aaf/src/main/java/Examples.java
[deleted file]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
cass/pom.xml
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
client/pom.xml
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
core/pom.xml
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/AES.java
[moved from
core/src/main/java/com/att/cadi/AES.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java
[moved from
core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java
[moved from
core/src/main/java/com/att/cadi/AbsUserCache.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Access.java
[moved from
core/src/main/java/com/att/cadi/Access.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/BasicCred.java
[moved from
core/src/main/java/com/att/cadi/BasicCred.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java
[moved from
core/src/main/java/com/att/cadi/BufferedCadiWrap.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java
[moved from
core/src/main/java/com/att/cadi/BufferedServletInputStream.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java
[moved from
core/src/main/java/com/att/cadi/CachedPrincipal.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/CachingLur.java
[moved from
core/src/main/java/com/att/cadi/CachingLur.java
with 93% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/CadiException.java
[moved from
core/src/main/java/com/att/cadi/CadiException.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/CadiWrap.java
[moved from
core/src/main/java/com/att/cadi/CadiWrap.java
with 92% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Capacitor.java
[moved from
core/src/main/java/com/att/cadi/Capacitor.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/CmdLine.java
[moved from
core/src/main/java/com/att/cadi/CmdLine.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Connector.java
[moved from
core/src/main/java/com/att/cadi/Connector.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/CredVal.java
[moved from
core/src/main/java/com/att/cadi/CredVal.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/GetCred.java
[moved from
core/src/main/java/com/att/cadi/GetCred.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Hash.java
[moved from
core/src/main/java/com/att/cadi/Hash.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Locator.java
[moved from
core/src/main/java/com/att/cadi/Locator.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/LocatorException.java
[moved from
core/src/main/java/com/att/cadi/LocatorException.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Lur.java
[moved from
core/src/main/java/com/att/cadi/Lur.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Permission.java
[moved from
core/src/main/java/com/att/cadi/Permission.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/PropAccess.java
[moved from
core/src/main/java/com/att/cadi/PropAccess.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Revalidator.java
[moved from
core/src/main/java/com/att/cadi/Revalidator.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java
[moved from
core/src/main/java/com/att/cadi/SLF4JAccess.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java
[moved from
core/src/main/java/com/att/cadi/SecuritySetter.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java
[moved from
core/src/main/java/com/att/cadi/ServletContextAccess.java
with 94% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/StrLur.java
[moved from
core/src/main/java/com/att/cadi/StrLur.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Symm.java
[moved from
core/src/main/java/com/att/cadi/Symm.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Taf.java
[moved from
core/src/main/java/com/att/cadi/Taf.java
with 95% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/Transmutate.java
[moved from
core/src/main/java/com/att/cadi/Transmutate.java
with 96% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/TrustChecker.java
[moved from
core/src/main/java/com/att/cadi/TrustChecker.java
with 93% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/User.java
[moved from
core/src/main/java/com/att/cadi/User.java
with 94% similarity]
patch
|
blob
|
history
core/src/main/java/org/onap/aaf/cadi/UserChain.java
[moved from
core/src/main/java/com/att/cadi/UserChain.java
with 96% similarity]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
pom.xml
patch
|
blob
|
history
diff --git
a/aaf/pom.xml
b/aaf/pom.xml
index
ca4f30a
..
4545082
100644
(file)
--- a/
aaf/pom.xml
+++ b/
aaf/pom.xml
@@
-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
-->
\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
<artifactId>parent</artifactId>
\r
<version>1.0.0-SNAPSHOT</version>
\r
<relativePath>..</relativePath>
\r
@@
-34,19
+34,29
@@
<url>https://github.com/att/AAF</url>
\r
<description>CADI</description>
\r
<artifactId>cadi-aaf</artifactId>
\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
<dependencies>
\r
<dependency>
\r
- <groupId>
com.att
.authz</groupId>
\r
+ <groupId>
org.onap.aaf
.authz</groupId>
\r
<artifactId>authz-client</artifactId>
\r
<artifactId>authz-client</artifactId>
\r
- </dependency>
\r
+ </dependency>
\r
\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
<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
<artifactId>cadi-client</artifactId>
\r
</dependency>
\r
\r
@@
-88,7
+98,7
@@
<classifier>tests</classifier>
\r
<archive>
\r
<manifest>
\r
<classifier>tests</classifier>
\r
<archive>
\r
<manifest>
\r
- <mainClass>
com.att
.cadi.cm.CmAgent</mainClass>
\r
+ <mainClass>
org.onap.aaf
.cadi.cm.CmAgent</mainClass>
\r
</manifest>
\r
\r
<manifestEntries>
\r
</manifest>
\r
\r
<manifestEntries>
\r
@@
-182,7
+192,61
@@
</execution>
\r
</executions>
\r
</plugin>
\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
</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
</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
--- a/
aaf/src/main/java/Examples.java
+++ /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
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java
similarity index 95%
rename from
aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java
index
79dd9ee
..
7cefc26
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf;
\r
+package
org.onap.aaf
.cadi.aaf;
\r
\r
\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
\r
/**
\r
* A Class that understands the AAF format of Permission (name/type/action)
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java
similarity index 89%
rename from
aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java
index
c7f0e2c
..
2d1b88f
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java
@@
-20,15
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf;
\r
+package
org.onap.aaf
.cadi.aaf;
\r
\r
import java.security.Principal;
\r
import java.util.regex.Pattern;
\r
\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
\r
/**
\r
* AAFTransmutate
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java
similarity index 91%
rename from
aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java
index
7508522
..
daac0c3
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf;
\r
+package
org.onap.aaf
.cadi.aaf;
\r
\r
import java.io.IOException;
\r
import java.io.PrintStream;
\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 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.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
\r
import aaf.v2_0.Perms;
\r
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/PermEval.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java
similarity index 96%
rename from
aaf/src/main/java/com/att/cadi/aaf/PermEval.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java
index
448f60a
..
896d153
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/PermEval.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf;
\r
+package
org.onap.aaf
.cadi.aaf;
\r
\r
\r
-import
com.att
.inno.env.util.Split;
\r
+import
org.onap.aaf
.inno.env.util.Split;
\r
\r
\r
public class PermEval {
\r
\r
\r
public class PermEval {
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java
similarity index 88%
rename from
aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java
index
e029765
..
cf2b3a9
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.cert;
\r
+package
org.onap.aaf
.cadi.aaf.cert;
\r
\r
\r
import java.security.Principal;
\r
\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 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
\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
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
if(fusr.get(5000)) {
\r
List<User> users = fusr.value.getUser();
\r
if(users.isEmpty()) {
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
similarity index 88%
rename from
aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
index
4b619c6
..
c49113d
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java
@@
-20,18
+20,19
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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 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
\r
public class ErrMessage {
\r
private RosettaDF<Error> errDF;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java
similarity index 94%
rename from
aaf/src/main/java/com/att/cadi/aaf/client/Examples.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java
index
d469805
..
8867862
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/client/Examples.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.client;
\r
+package
org.onap.aaf
.cadi.aaf.client;
\r
\r
\r
import java.lang.reflect.InvocationTargetException;
\r
\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 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
\r
public class Examples {
\r
public static <C> String print(RosettaEnv env, String nameOrContentType, boolean optional) throws APIException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java
similarity index 86%
rename from
aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java
index
ad75dc5
..
8871969
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java
@@
-20,16
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class CertMarshal extends ObjMarshal<Cert> {
\r
public CertMarshal() {
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java
similarity index 89%
rename from
aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java
index
3a27a9c
..
70a1c96
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java
@@
-20,15
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class CertsMarshal extends ObjMarshal<Certs> {
\r
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
similarity index 89%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
index
33005a3
..
6d6d947
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
@@
-20,23
+20,24
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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.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
\r
public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
\r
private AAFCon<CLIENT> con;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
similarity index 88%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
index
a9d53f3
..
3ec6fed
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.net.URI;
\r
import java.security.Principal;
\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 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
\r
import aaf.v2_0.Certs;
\r
import aaf.v2_0.Error;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java
similarity index 88%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java
index
6fce97a
..
2757efc
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.net.ConnectException;
\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 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.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
\r
public class AAFConDME2 extends AAFCon<DME2Client>{
\r
private DME2Manager manager;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java
similarity index 85%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java
index
e126f08
..
5a38b0c
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.net.HttpURLConnection;
\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 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
\r
public class AAFConHttp extends AAFCon<HttpURLConnection> {
\r
private final HMangr hman;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java
similarity index 89%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java
index
7188224
..
520d7ab
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java
@@
-20,28
+20,29
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.net.ConnectException;
\r
import java.net.URISyntaxException;
\r
import java.security.Principal;
\r
import java.util.Map;
\r
\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.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
\r
import aaf.v2_0.Perm;
\r
import aaf.v2_0.Perms;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java
similarity index 86%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java
index
4e189ce
..
fb92108
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.security.Principal;
\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 javax.servlet.http.HttpServletRequest;
\r
import javax.servlet.http.HttpServletResponse;
\r
\r
-import
com.att
.cadi.AbsUserCache;
\r
-import
com.att.cadi.Access.Leve
l;
\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.CachedPrincipa
l;
\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
\r
public class AAFTaf<CLIENT> extends AbsUserCache<AAFPermission> implements HttpTaf {
\r
// private static final String INVALID_AUTH_TOKEN = "Invalid Auth Token";
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java
similarity index 86%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java
index
5ee3199
..
c7644a5
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java
@@
-20,21
+20,22
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 javax.servlet.http.HttpServletRequest ;
\r
\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
\r
public class AAFTrustChecker implements TrustChecker {
\r
private final String tag, id;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java
similarity index 91%
rename from
aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java
index
297ad8a
..
5bcf527
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.net.URISyntaxException;
\r
import java.security.Principal;
\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 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.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
\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
diff --git
a/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java
similarity index 93%
rename from
aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java
index
512be78
..
af50682
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.File;
\r
import java.io.FileOutputStream;
\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 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
\r
import certman.v1_0.Artifacts.Artifact;
\r
import certman.v1_0.CertInfo;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/CertException.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java
similarity index 95%
rename from
aaf/src/main/java/com/att/cadi/cm/CertException.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java
index
ce38c21
..
bac4a17
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/CertException.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
public class CertException extends Exception {
\r
\r
\r
public class CertException extends Exception {
\r
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/CmAgent.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
similarity index 94%
rename from
aaf/src/main/java/com/att/cadi/cm/CmAgent.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
index
0240962
..
15ed5d0
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/CmAgent.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\r
\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
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 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
\r
import certman.v1_0.Artifacts;
\r
import certman.v1_0.Artifacts.Artifact;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/Factory.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java
similarity index 95%
rename from
aaf/src/main/java/com/att/cadi/cm/Factory.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java
index
85b5dfb
..
1d488de
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/Factory.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.BufferedReader;
\r
import java.io.ByteArrayInputStream;
\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 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
\r
public class Factory {
\r
private static final String PRIVATE_KEY_HEADER = "PRIVATE KEY";
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java
similarity index 91%
rename from
aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java
index
60434c3
..
a89b901
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java
@@
-20,13
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import certman.v1_0.Artifacts.Artifact;
\r
import certman.v1_0.CertInfo;
\r
\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
\r
public interface PlaceArtifact {
\r
public boolean place(Trans trans, CertInfo cert, Artifact arti) throws CadiException;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java
similarity index 90%
rename from
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java
index
c9145ec
..
eaefd58
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java
@@
-20,16
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.File;
\r
\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 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
\r
public class PlaceArtifactInFiles extends ArtifactDir {
\r
@Override
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
similarity index 93%
rename from
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
index
61374e9
..
ddda1db
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.File;
\r
import java.security.KeyStore;
\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 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
\r
import certman.v1_0.Artifacts.Artifact;
\r
import certman.v1_0.CertInfo;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java
similarity index 94%
rename from
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java
index
4c2c900
..
162d745
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.PrintStream;
\r
\r
import certman.v1_0.Artifacts.Artifact;
\r
import certman.v1_0.CertInfo;
\r
\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
\r
public class PlaceArtifactOnStream implements PlaceArtifact {
\r
private PrintStream out;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java
similarity index 93%
rename from
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java
index
714b233
..
d1b3141
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java
@@
-20,15
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.cm;
\r
+package
org.onap.aaf
.cadi.cm;
\r
\r
import java.io.File;
\r
\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
\r
import certman.v1_0.Artifacts.Artifact;
\r
import certman.v1_0.CertInfo;
\r
diff --git
a/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java
b/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
similarity index 92%
rename from
aaf/src/main/java/com/att/cadi/sso/AAFSSO.java
rename to
aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
index
4f66dd2
..
ed3254b
100644
(file)
--- a/
aaf/src/main/java/com/att/cadi/sso/AAFSSO.java
+++ b/
aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.sso;
\r
+package
org.onap.aaf
.cadi.sso;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\r
\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 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
\r
\r
public class AAFSSO {
\r
diff --git
a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java
b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java
similarity index 88%
rename from
aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java
rename to
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java
index
d5f92c1
..
69c9688
100644
(file)
--- a/
aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java
+++ b/
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.io.BufferedReader;
\r
import java.io.File;
\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 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
\r
import junit.framework.Assert;
\r
\r
diff --git
a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java
b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
similarity index 93%
rename from
aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java
rename to
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
index
f85a4e2
..
bd4e162
100644
(file)
--- a/
aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java
+++ b/
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur.aaf.test;
\r
+package
org.onap.aaf
.cadi.lur.aaf.test;
\r
\r
import static org.junit.Assert.assertEquals;
\r
\r
\r
import 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 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
\r
public class JU_Lur2_0Call {
\r
private static AAFConHttp aaf;
\r
diff --git
a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java
b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java
similarity index 96%
rename from
aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java
rename to
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java
index
8dee6cf
..
d60eedb
100644
(file)
--- a/
aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java
+++ b/
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java
@@
-20,14
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur.aaf.test;
\r
+package
org.onap.aaf
.cadi.lur.aaf.test;
\r
\r
import static org.junit.Assert.*;
\r
\r
import org.junit.AfterClass;
\r
import org.junit.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
\r
public class JU_PermEval {
\r
\r
diff --git
a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java
b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java
similarity index 89%
rename from
aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java
rename to
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java
index
c4f5f7c
..
ef9dc36
100644
(file)
--- a/
aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java
+++ b/
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java
@@
-20,21
+20,21
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\r
public class MultiThreadPermHit {
\r
public static void main(String args[]) {
\r
diff --git
a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java
similarity index 92%
rename from
aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
rename to
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java
index
7d83625
..
2af452d
100644
(file)
--- a/
aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
+++ b/
aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java
@@
-20,16
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.io.FileInputStream;
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
import java.io.PrintStream;
\r
\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
\r
public class TestAccess implements Access {
\r
private Symm symm;
\r
diff --git
a/aaf/src/test/java/com/att/aaf/content/JU_Content.java
b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java
similarity index 91%
rename from
aaf/src/test/java/com/att/aaf/content/JU_Content.java
rename to
aaf/src/test/java/org/onap/aaf/content/JU_Content.java
index
80215c9
..
6691f84
100644
(file)
--- a/
aaf/src/test/java/com/att/aaf/content/JU_Content.java
+++ b/
aaf/src/test/java/org/onap/aaf/content/JU_Content.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.aaf.content;
\r
+package
org.onap
.aaf.content;
\r
\r
import java.io.StringReader;
\r
\r
\r
import java.io.StringReader;
\r
\r
@@
-30,9
+30,9
@@
import org.junit.Test;
\r
import aaf.v2_0.Error;
\r
\r
\r
import aaf.v2_0.Error;
\r
\r
-import
com.att
.rosetta.env.RosettaDF;
\r
-import
com.att
.rosetta.env.RosettaData;
\r
-import
com.att
.rosetta.env.RosettaEnv;
\r
+import
org.onap.aaf
.rosetta.env.RosettaDF;
\r
+import
org.onap.aaf
.rosetta.env.RosettaData;
\r
+import
org.onap.aaf
.rosetta.env.RosettaEnv;
\r
\r
public class JU_Content {
\r
\r
\r
public class JU_Content {
\r
\r
diff --git
a/aaf/src/test/java/com/att/aaf/example/CadiTest.java
b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java
similarity index 85%
rename from
aaf/src/test/java/com/att/aaf/example/CadiTest.java
rename to
aaf/src/test/java/org/onap/aaf/example/CadiTest.java
index
f50d6ac
..
34ed858
100644
(file)
--- a/
aaf/src/test/java/com/att/aaf/example/CadiTest.java
+++ b/
aaf/src/test/java/org/onap/aaf/example/CadiTest.java
@@
-20,17
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\r
public class CadiTest {
\r
public static void main(String args[]) {
\r
diff --git
a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java
b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java
similarity index 88%
rename from
aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java
rename to
aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java
index
53f8c8e
..
65972cd
100644
(file)
--- a/
aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java
+++ b/
aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\r
public class ExampleAuthCheck {
\r
public static void main(String args[]) {
\r
diff --git
a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java
b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java
similarity index 89%
rename from
aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java
rename to
aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java
index
5f6179e
..
f83b15b
100644
(file)
--- a/
aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java
+++ b/
aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java
@@
-20,19
+20,19
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.security.Principal;
\r
import java.util.ArrayList;
\r
import java.util.List;
\r
\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
\r
public class ExamplePerm2_0 {
\r
public static void main(String args[]) {
\r
diff --git
a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java
b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java
similarity index 90%
rename from
aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java
rename to
aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java
index
5ebbe9f
..
f6024a5
100644
(file)
--- a/
aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java
+++ b/
aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java
@@
-20,19
+20,19
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.security.Principal;
\r
import java.util.ArrayList;
\r
import java.util.List;
\r
\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
\r
public class ExamplePerm2_0_DME2 {
\r
public static void main(String args[]) {
\r
diff --git
a/aaf/src/test/java/com/att/aaf/example/X509Test.java
b/aaf/src/test/java/org/onap/aaf/example/X509Test.java
similarity index 88%
rename from
aaf/src/test/java/com/att/aaf/example/X509Test.java
rename to
aaf/src/test/java/org/onap/aaf/example/X509Test.java
index
517393f
..
ad5d4b2
100644
(file)
--- a/
aaf/src/test/java/com/att/aaf/example/X509Test.java
+++ b/
aaf/src/test/java/org/onap/aaf/example/X509Test.java
@@
-20,16
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.security.Principal;
\r
\r
\r
import java.security.Principal;
\r
\r
-import
com.att
.cadi.PropAccess;
\r
-import
com.att
.cadi.aaf.v2_0.AAFConHttp;
\r
-import
com.att
.cadi.aaf.v2_0.AAFLurPerm;
\r
-import
com.att
.cadi.client.Future;
\r
-import
com.att
.cadi.locator.DNSLocator;
\r
-import
com.att
.cadi.lur.LocalPermission;
\r
+import
org.onap.aaf
.cadi.PropAccess;
\r
+import
org.onap.aaf
.cadi.aaf.v2_0.AAFConHttp;
\r
+import
org.onap.aaf
.cadi.aaf.v2_0.AAFLurPerm;
\r
+import
org.onap.aaf
.cadi.client.Future;
\r
+import
org.onap.aaf
.cadi.locator.DNSLocator;
\r
+import
org.onap.aaf
.cadi.lur.LocalPermission;
\r
\r
public class X509Test {
\r
public static void main(String args[]) {
\r
\r
public class X509Test {
\r
public static void main(String args[]) {
\r
diff --git
a/cass/pom.xml
b/cass/pom.xml
index
4e07ae8
..
9af30fa
100644
(file)
--- a/
cass/pom.xml
+++ b/
cass/pom.xml
@@
-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
-->
\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
<artifactId>parent</artifactId>
\r
<version>1.0.0-SNAPSHOT</version>
\r
<relativePath>..</relativePath>
\r
@@
-34,10
+34,18
@@
<url>https://github.com/att/AAF</url>
\r
<description>CADI</description>
\r
<artifactId>cadi-cass</artifactId>
\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
<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
<artifactId>cadi-aaf</artifactId>
\r
</dependency>
\r
\r
@@
-96,19
+104,61
@@
</execution>
\r
</executions>
\r
</plugin>
\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
</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
</project>
\r
diff --git
a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
similarity index 94%
rename from
cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
rename to
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
index
e847bd0
..
30d979a
100644
(file)
--- a/
cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
+++ b/
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
@@
-20,13
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.cass;
\r
+package
org.onap.aaf
.cadi.aaf.cass;
\r
\r
import java.security.Principal;
\r
\r
import org.apache.cassandra.auth.AuthenticatedUser;
\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
\r
public class AAFAuthenticatedUser extends AuthenticatedUser implements Principal {
\r
private boolean anonymous = false, supr=false, local=false;
\r
diff --git
a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
similarity index 94%
rename from
cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
rename to
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
index
631a3fa
..
6b8b29d
100644
(file)
--- a/
cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
+++ b/
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.cass;
\r
+package
org.onap.aaf
.cadi.aaf.cass;
\r
\r
import java.io.IOException;
\r
import java.io.UnsupportedEncodingException;
\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
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
\r
public class AAFAuthenticator extends AAFBase implements ISaslAwareAuthenticator {
\r
\r
diff --git
a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
similarity index 94%
rename from
cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
rename to
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
index
650e570
..
bea0e86
100644
(file)
--- a/
cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
+++ b/
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.cass;
\r
+package
org.onap.aaf
.cadi.aaf.cass;
\r
\r
import java.util.ArrayList;
\r
import java.util.HashSet;
\r
\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
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
\r
public class AAFAuthorizer extends AAFBase implements IAuthorizer {
\r
// Returns every permission on the resource granted to the user.
\r
diff --git
a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
similarity index 89%
rename from
cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
rename to
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
index
4d82a6b
..
e422234
100644
(file)
--- a/
cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
+++ b/
cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.cass;
\r
+package
org.onap.aaf
.cadi.aaf.cass;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\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
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
\r
public abstract class AAFBase {
\r
protected static final Set<IAuthenticator.Option> options;
\r
diff --git
a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
similarity index 92%
rename from
cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
rename to
cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
index
0eb95be
..
bedfa25
100644
(file)
--- a/
cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
+++ b/
cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.aaf.cass.test;
\r
+package
org.onap.aaf
.cadi.aaf.cass.test;
\r
\r
import java.util.HashMap;
\r
import java.util.Map;
\r
\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
import org.junit.Assert;
\r
import org.junit.BeforeClass;
\r
import org.junit.Test;
\r
-
\r
-import com.att.cadi.aaf.cass.AAFAuthenticator;
\r
-import com.att.cadi.aaf.cass.AAFAuthorizer;
\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;
\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;
\r
\r
public class JU_CASS {
\r
\r
\r
public class JU_CASS {
\r
\r
diff --git
a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java
b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
similarity index 92%
rename from
cass/src/test/java/com/att/aaf/cass/JU_CASS.java
rename to
cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
index
9eca242
..
f5ee310
100644
(file)
--- a/
cass/src/test/java/com/att/aaf/cass/JU_CASS.java
+++ b/
cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.aaf.cass;
\r
+package
org.onap
.aaf.cass;
\r
\r
import java.util.HashMap;
\r
import java.util.Map;
\r
\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
import org.junit.Assert;
\r
import org.junit.BeforeClass;
\r
import org.junit.Test;
\r
-
\r
-import com.att.cadi.aaf.cass.AAFAuthenticator;
\r
-import com.att.cadi.aaf.cass.AAFAuthorizer;
\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;
\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;
\r
\r
public class JU_CASS {
\r
\r
\r
public class JU_CASS {
\r
\r
diff --git
a/client/pom.xml
b/client/pom.xml
index
1b0d6e3
..
45615cb
100644
(file)
--- a/
client/pom.xml
+++ b/
client/pom.xml
@@
-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
-->
\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
<artifactId>parent</artifactId>
\r
<version>1.0.0-SNAPSHOT</version>
\r
<relativePath>..</relativePath>
\r
@@
-34,14
+34,22
@@
<url>https://github.com/att/AAF</url>
\r
<description>CADI</description>
\r
<modelVersion>4.0.0</modelVersion>
\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
<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
<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
<artifactId>cadi-core</artifactId>
\r
</dependency>
\r
<dependency>
\r
@@
-89,19
+97,61
@@
</executions>
\r
</plugin>
\r
\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
</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
\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
</project>
\r
diff --git
a/client/src/main/java/com/att/cadi/client/AAFClient.java
b/client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java
similarity index 89%
rename from
client/src/main/java/com/att/cadi/client/AAFClient.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java
index
3f8fb47
..
cb6299b
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/AAFClient.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/AAFClient.java
@@
-20,22
+20,23
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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.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
\r
public class AAFClient {
\r
private RosettaEnv env;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
b/client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java
similarity index 92%
rename from
client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java
index
a0ab06d
..
e714e3a
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/AbsBasicAuth.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\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
diff --git
a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
b/client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java
similarity index 87%
rename from
client/src/main/java/com/att/cadi/client/AbsTransferSS.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java
index
69647e6
..
e731f09
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/AbsTransferSS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/AbsTransferSS.java
@@
-20,15
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public abstract class AbsTransferSS<CLIENT> implements SecuritySetter<CLIENT> {
\r
protected String value;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Delete.java
b/client/src/main/java/org/onap/aaf/cadi/client/Delete.java
similarity index 91%
rename from
client/src/main/java/com/att/cadi/client/Delete.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Delete.java
index
f780af1
..
9f03aab
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Delete.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Delete.java
@@
-20,11
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
\r
-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
\r
public class Delete<T> extends AAFClient.Call<T> {
\r
public Delete(AAFClient ac, RosettaDF<T> df) {
\r
diff --git
a/client/src/main/java/com/att/cadi/client/EClient.java
b/client/src/main/java/org/onap/aaf/cadi/client/EClient.java
similarity index 90%
rename from
client/src/main/java/com/att/cadi/client/EClient.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/EClient.java
index
166d150
..
a880331
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/EClient.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/EClient.java
@@
-20,16
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
\r
public interface EClient<CT> {
\r
diff --git
a/client/src/main/java/com/att/cadi/client/EnvAccess.java
b/client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java
similarity index 91%
rename from
client/src/main/java/com/att/cadi/client/EnvAccess.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java
index
f78f2ff
..
bcf41f8
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/EnvAccess.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/EnvAccess.java
@@
-20,18
+20,20
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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 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 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
\r
public class EnvAccess implements Access {
\r
private Env env;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Future.java
b/client/src/main/java/org/onap/aaf/cadi/client/Future.java
similarity index 93%
rename from
client/src/main/java/com/att/cadi/client/Future.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Future.java
index
18987a6
..
01a85b8
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Future.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Future.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
\r
-import
com.att
.cadi.CadiException;
\r
+import
org.onap.aaf
.cadi.CadiException;
\r
\r
public abstract class Future<T> {
\r
public T value;
\r
\r
public abstract class Future<T> {
\r
public T value;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Get.java
b/client/src/main/java/org/onap/aaf/cadi/client/Get.java
similarity index 89%
rename from
client/src/main/java/com/att/cadi/client/Get.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Get.java
index
a39aaf1
..
920b476
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Get.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Get.java
@@
-20,11
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
\r
-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
\r
public class Get<T> extends AAFClient.Call<T> {
\r
public Get(AAFClient ac, RosettaDF<T> df) {
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Holder.java
b/client/src/main/java/org/onap/aaf/cadi/client/Holder.java
similarity index 95%
rename from
client/src/main/java/com/att/cadi/client/Holder.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Holder.java
index
3ad7ce3
..
577fa5f
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Holder.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Holder.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
/**
\r
* Use to set Variables outside of Anonymous classes.
\r
\r
/**
\r
* Use to set Variables outside of Anonymous classes.
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Post.java
b/client/src/main/java/org/onap/aaf/cadi/client/Post.java
similarity index 87%
rename from
client/src/main/java/com/att/cadi/client/Post.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Post.java
index
001f1b3
..
5c9bde2
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Post.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Post.java
@@
-20,12
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
\r
-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
\r
public class Post<T> extends AAFClient.Call<T> {
\r
public Post(AAFClient ac, RosettaDF<T> df) {
\r
diff --git
a/client/src/main/java/com/att/cadi/client/PropertyLocator.java
b/client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java
similarity index 93%
rename from
client/src/main/java/com/att/cadi/client/PropertyLocator.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java
index
acd3b4a
..
15705ab
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/PropertyLocator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/PropertyLocator.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class PropertyLocator implements Locator {
\r
private final URI [] orig;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Put.java
b/client/src/main/java/org/onap/aaf/cadi/client/Put.java
similarity index 90%
rename from
client/src/main/java/com/att/cadi/client/Put.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Put.java
index
b14bfac
..
ebd6e0d
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Put.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Put.java
@@
-20,11
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
\r
-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
\r
public class Put<T> extends AAFClient.Call<T> {
\r
public Put(AAFClient ac, RosettaDF<T> df) {
\r
diff --git
a/client/src/main/java/com/att/cadi/client/RawClient.java
b/client/src/main/java/org/onap/aaf/cadi/client/RawClient.java
similarity index 95%
rename from
client/src/main/java/com/att/cadi/client/RawClient.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/RawClient.java
index
c1ad633
..
0386383
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/RawClient.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/RawClient.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\r
\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 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.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
\r
public abstract class RawClient {
\r
protected static String aafid, aafpass, aafurl;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Rcli.java
b/client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
similarity index 94%
rename from
client/src/main/java/com/att/cadi/client/Rcli.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
index
c25cb2b
..
23158ef
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Rcli.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Rcli.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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 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 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
\r
public abstract class Rcli<CT> {
\r
public static final String BLANK = "";
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Result.java
b/client/src/main/java/org/onap/aaf/cadi/client/Result.java
similarity index 95%
rename from
client/src/main/java/com/att/cadi/client/Result.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Result.java
index
b86d9b9
..
5b3d8fd
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Result.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Result.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.client;
\r
+package
org.onap.aaf
.cadi.client;
\r
\r
public class Result<T> {
\r
public final int code;
\r
\r
public class Result<T> {
\r
public final int code;
\r
diff --git
a/client/src/main/java/com/att/cadi/client/Retryable.java
b/client/src/main/java/org/onap/aaf/cadi/client/Retryable.java
similarity index 90%
rename from
client/src/main/java/com/att/cadi/client/Retryable.java
rename to
client/src/main/java/org/onap/aaf/cadi/client/Retryable.java
index
4f49a72
..
9c701ef
100644
(file)
--- a/
client/src/main/java/com/att/cadi/client/Retryable.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/client/Retryable.java
@@
-20,13
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
/**
\r
*
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DEClient.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java
similarity index 90%
rename from
client/src/main/java/com/att/cadi/dme2/DEClient.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java
index
138fb63
..
7bbdc25
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DEClient.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DEClient.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
import java.io.ByteArrayOutputStream;
\r
import java.io.IOException;
\r
\r
import 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
\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.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
\r
public class DEClient implements EClient<DME2Client> {
\r
private DME2Client client;
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java
similarity index 86%
rename from
client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java
index
3fb1f13
..
b29074f
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DME2BasicAuth.java
@@
-20,18
+20,19
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
import java.io.IOException;
\r
import java.security.GeneralSecurityException;
\r
\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.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
\r
public class DME2BasicAuth extends AbsBasicAuth<DME2Client> {
\r
public DME2BasicAuth(String user, String pass, SecurityInfoC<DME2Client> si) throws IOException {
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java
similarity index 90%
rename from
client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java
index
8895e9f
..
167fe3b
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DME2ClientSS.java
@@
-20,14
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
import java.io.IOException;
\r
\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.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
\r
public class DME2ClientSS implements SecuritySetter<DME2Client> {
\r
private Access access;
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java
similarity index 95%
rename from
client/src/main/java/com/att/cadi/dme2/DME2Locator.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java
index
f28fe94
..
47af9ea
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DME2Locator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DME2Locator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
\r
import java.net.InetAddress;
\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 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
//
\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
\r
public class DME2Locator implements Locator {
\r
private DME2Manager dm;
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java
similarity index 87%
rename from
client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java
index
a8d7ac9
..
f71d19c
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DME2TransferSS.java
@@
-20,16
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
import java.io.IOException;
\r
import java.security.Principal;
\r
\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.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
\r
public class DME2TransferSS extends AbsTransferSS<DME2Client> {
\r
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java
similarity index 87%
rename from
client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java
index
45978e4
..
af803c1
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DME2x509SS.java
@@
-20,17
+20,18
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
import java.io.IOException;
\r
import java.security.cert.CertificateEncodingException;
\r
\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.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
\r
\r
public class DME2x509SS implements SecuritySetter<DME2Client> {
\r
diff --git
a/client/src/main/java/com/att/cadi/dme2/DRcli.java
b/client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java
similarity index 90%
rename from
client/src/main/java/com/att/cadi/dme2/DRcli.java
rename to
client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java
index
8a1f5fb
..
cd95bcc
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dme2/DRcli.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dme2/DRcli.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.dme2;
\r
+package
org.onap.aaf
.cadi.dme2;
\r
\r
import java.net.MalformedURLException;
\r
import java.net.URI;
\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 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.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
\r
/**
\r
* DME2 Rosetta Client
\r
diff --git
a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
b/client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java
similarity index 92%
rename from
client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
rename to
client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java
index
3bf9080
..
105ccf1
100644
(file)
--- a/
client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/dnsloc/DNSLocator.java
@@
-20,17
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class DNSLocator implements Locator {
\r
private static enum Status {UNTRIED, OK, INVALID, SLOW};
\r
diff --git
a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
b/client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
similarity index 88%
rename from
client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
rename to
client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
index
dfedcc1
..
f9212e8
100644
(file)
--- a/
client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/http/HBasicAuthSS.java
@@
-20,19
+20,19
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class HBasicAuthSS extends AbsBasicAuth<HttpURLConnection> {
\r
public HBasicAuthSS(Access access, SecurityInfoC<HttpURLConnection> si) throws IOException {
\r
diff --git
a/client/src/main/java/com/att/cadi/http/HClient.java
b/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
similarity index 91%
rename from
client/src/main/java/com/att/cadi/http/HClient.java
rename to
client/src/main/java/org/onap/aaf/cadi/http/HClient.java
index
6704bf4
..
70a703e
100644
(file)
--- a/
client/src/main/java/com/att/cadi/http/HClient.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/http/HClient.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.http;
\r
+package
org.onap.aaf
.cadi.http;
\r
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
\r
import 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
\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
\r
/**
\r
* Low Level Http Client Mechanism. Chances are, you want the high level "HRcli"
\r
diff --git
a/client/src/main/java/com/att/cadi/http/HMangr.java
b/client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
similarity index 91%
rename from
client/src/main/java/com/att/cadi/http/HMangr.java
rename to
client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
index
13fe815
..
833434f
100644
(file)
--- a/
client/src/main/java/com/att/cadi/http/HMangr.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/http/HMangr.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.http;
\r
+package
org.onap.aaf
.cadi.http;
\r
\r
import java.net.ConnectException;
\r
import java.net.HttpURLConnection;
\r
\r
import 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
\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
\r
public class HMangr {
\r
private String apiVersion;
\r
diff --git
a/client/src/main/java/com/att/cadi/http/HRcli.java
b/client/src/main/java/org/onap/aaf/cadi/http/HRcli.java
similarity index 87%
rename from
client/src/main/java/com/att/cadi/http/HRcli.java
rename to
client/src/main/java/org/onap/aaf/cadi/http/HRcli.java
index
cfbb5c1
..
1ad0fcc
100644
(file)
--- a/
client/src/main/java/com/att/cadi/http/HRcli.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/http/HRcli.java
@@
-20,21
+20,22
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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.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
\r
/**
\r
* DME2 Rosetta Client
\r
diff --git
a/client/src/main/java/com/att/cadi/http/HTransferSS.java
b/client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java
similarity index 88%
rename from
client/src/main/java/com/att/cadi/http/HTransferSS.java
rename to
client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java
index
89a38c3
..
db456f2
100644
(file)
--- a/
client/src/main/java/com/att/cadi/http/HTransferSS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/http/HTransferSS.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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 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
\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
\r
\r
public class HTransferSS extends AbsTransferSS<HttpURLConnection> {
\r
diff --git
a/client/src/main/java/com/att/cadi/http/HX509SS.java
b/client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java
similarity index 92%
rename from
client/src/main/java/com/att/cadi/http/HX509SS.java
rename to
client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java
index
b790ede
..
0bdc843
100644
(file)
--- a/
client/src/main/java/com/att/cadi/http/HX509SS.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/http/HX509SS.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.http;
\r
+package
org.onap.aaf
.cadi.http;
\r
\r
import java.io.ByteArrayInputStream;
\r
import java.io.ByteArrayOutputStream;
\r
\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 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
\r
\r
public class HX509SS implements SecuritySetter<HttpURLConnection> {
\r
diff --git
a/client/src/main/java/com/att/cadi/locator/DME2Locator.java
b/client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java
similarity index 94%
rename from
client/src/main/java/com/att/cadi/locator/DME2Locator.java
rename to
client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java
index
c750448
..
656fd19
100644
(file)
--- a/
client/src/main/java/com/att/cadi/locator/DME2Locator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/locator/DME2Locator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.locator;
\r
+package
org.onap.aaf
.cadi.locator;
\r
\r
\r
import java.net.InetAddress;
\r
\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
import java.util.Comparator;
\r
import java.util.Properties;
\r
import java.util.Random;
\r
+
\r
+import org.onap.aaf.cadi.Access;
\r
+import org.onap.aaf.cadi.Locator;
\r
+import org.onap.aaf.cadi.LocatorException;
\r
+import org.onap.aaf.cadi.PropAccess;
\r
+import org.onap.aaf.cadi.Access.Level;
\r
+
\r
import java.security.SecureRandom;
\r
\r
//import com.att.aft.dme2.api.DME2Endpoint;
\r
import 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.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
\r
public class DME2Locator implements Locator<URI> {
\r
private DME2Manager dm;
\r
diff --git
a/client/src/main/java/com/att/cadi/locator/DNSLocator.java
b/client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
similarity index 92%
rename from
client/src/main/java/com/att/cadi/locator/DNSLocator.java
rename to
client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
index
baa65ed
..
9d420d2
100644
(file)
--- a/
client/src/main/java/com/att/cadi/locator/DNSLocator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/locator/DNSLocator.java
@@
-20,17
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class DNSLocator implements Locator<URI> {
\r
private static enum Status {UNTRIED, OK, INVALID, SLOW};
\r
diff --git
a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
b/client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java
similarity index 89%
rename from
client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
rename to
client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java
index
db95d91
..
0aa69a3
100644
(file)
--- a/
client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/locator/HClientHotPeerLocator.java
@@
-20,15
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class HClientHotPeerLocator extends HotPeerLocator<HClient> {
\r
private final HX509SS ss;
\r
diff --git
a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
b/client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java
similarity index 93%
rename from
client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
rename to
client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java
index
5b756b2
..
04d2a28
100644
(file)
--- a/
client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/locator/HotPeerLocator.java
@@
-20,14
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.locator;
\r
+package
org.onap.aaf
.cadi.locator;
\r
\r
\r
-import 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
\r
/**
\r
* This Locator is to handle Hot Peer load protection, when the Servers are
\r
diff --git
a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
b/client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
similarity index 94%
rename from
client/src/main/java/com/att/cadi/locator/PropertyLocator.java
rename to
client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
index
216be4f
..
3d9470e
100644
(file)
--- a/
client/src/main/java/com/att/cadi/locator/PropertyLocator.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/locator/PropertyLocator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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 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
\r
public class PropertyLocator implements Locator<URI> {
\r
private final URI [] orig;
\r
diff --git
a/client/src/main/java/com/att/cadi/routing/GreatCircle.java
b/client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java
similarity index 95%
rename from
client/src/main/java/com/att/cadi/routing/GreatCircle.java
rename to
client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java
index
8558f8e
..
9e47b3f
100644
(file)
--- a/
client/src/main/java/com/att/cadi/routing/GreatCircle.java
+++ b/
client/src/main/java/org/onap/aaf/cadi/routing/GreatCircle.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.routing;
\r
+package
org.onap.aaf
.cadi.routing;
\r
\r
\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
\r
public class GreatCircle {
\r
// Note: multiplying by this constant is faster than calling Math equivalent function
\r
diff --git
a/client/src/test/java/com/client/test/BasicDME2Client.java
b/client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java
similarity index 96%
rename from
client/src/test/java/com/client/test/BasicDME2Client.java
rename to
client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java
index
f26d3b1
..
4619a0f
100644
(file)
--- a/
client/src/test/java/com/client/test/BasicDME2Client.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/BasicDME2Client.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.util.Properties;
\r
\r
import java.net.URI;
\r
import java.util.Properties;
\r
diff --git
a/client/src/test/java/com/client/test/JU_DNSLocator.java
b/client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java
similarity index 89%
rename from
client/src/test/java/com/client/test/JU_DNSLocator.java
rename to
client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java
index
04a4f17
..
8cac8d1
100644
(file)
--- a/
client/src/test/java/com/client/test/JU_DNSLocator.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/JU_DNSLocator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.net.URL;
\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 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
\r
public class JU_DNSLocator {
\r
\r
diff --git
a/client/src/test/java/com/client/test/JU_PropertyLocator.java
b/client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java
similarity index 92%
rename from
client/src/test/java/com/client/test/JU_PropertyLocator.java
rename to
client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java
index
89bef62
..
c09d697
100644
(file)
--- a/
client/src/test/java/com/client/test/JU_PropertyLocator.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/JU_PropertyLocator.java
@@
-20,18
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\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
public class JU_PropertyLocator {
\r
\r
@AfterClass
\r
diff --git
a/client/src/test/java/com/client/test/PaulUzee.java
b/client/src/test/java/org/onap/aaf/client/test/PaulUzee.java
similarity index 91%
rename from
client/src/test/java/com/client/test/PaulUzee.java
rename to
client/src/test/java/org/onap/aaf/client/test/PaulUzee.java
index
24aeb49
..
4bec3fd
100644
(file)
--- a/
client/src/test/java/com/client/test/PaulUzee.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/PaulUzee.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.io.IOException;
\r
import java.io.InputStream;
\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 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.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
\r
public class PaulUzee {
\r
public static void main(String[] args) {
\r
diff --git
a/client/src/test/java/com/client/test/TestAccess.java
b/client/src/test/java/org/onap/aaf/client/test/TestAccess.java
similarity index 93%
rename from
client/src/test/java/com/client/test/TestAccess.java
rename to
client/src/test/java/org/onap/aaf/client/test/TestAccess.java
index
434ae62
..
c054bc0
100644
(file)
--- a/
client/src/test/java/com/client/test/TestAccess.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/TestAccess.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.io.IOException;
\r
import java.io.InputStream;
\r
\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
\r
public class TestAccess implements Access {
\r
private Symm symm;
\r
diff --git
a/client/src/test/java/com/client/test/TestDME2Client.java
b/client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java
similarity index 95%
rename from
client/src/test/java/com/client/test/TestDME2Client.java
rename to
client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java
index
415f992
..
4abec42
100644
(file)
--- a/
client/src/test/java/com/client/test/TestDME2Client.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/TestDME2Client.java
@@
-20,15
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.io.FileInputStream;
\r
import java.net.URI;
\r
import java.util.Properties;
\r
\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.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
\r
public class TestDME2Client {
\r
public static void main(String[] args) {
\r
diff --git
a/client/src/test/java/com/client/test/TestDME2RcliClient.java
b/client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java
similarity index 91%
rename from
client/src/test/java/com/client/test/TestDME2RcliClient.java
rename to
client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java
index
6ff5d6f
..
10c917c
100644
(file)
--- a/
client/src/test/java/com/client/test/TestDME2RcliClient.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/TestDME2RcliClient.java
@@
-20,16
+20,17
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.util.Properties;
\r
\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.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
\r
public class TestDME2RcliClient {
\r
public static void main(String[] args) {
\r
diff --git
a/client/src/test/java/com/client/test/TestHClient.java
b/client/src/test/java/org/onap/aaf/client/test/TestHClient.java
similarity index 79%
rename from
client/src/test/java/com/client/test/TestHClient.java
rename to
client/src/test/java/org/onap/aaf/client/test/TestHClient.java
index
7fcd113
..
2476caf
100644
(file)
--- a/
client/src/test/java/com/client/test/TestHClient.java
+++ b/
client/src/test/java/org/onap/aaf/client/test/TestHClient.java
@@
-20,27
+20,28
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.HttpURLConnection;
\r
import java.net.URI;
\r
import java.util.Properties;
\r
\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.aft.dme2.api.DME2Manager;
\r
-import com.att.cadi.CadiException;
\r
-import com.att.cadi.Locator;
\r
-import com.att.cadi.Locator.Item;
\r
-import com.att.cadi.PropAccess;
\r
-import com.att.cadi.SecuritySetter;
\r
-import com.att.cadi.client.Future;
\r
-import com.att.cadi.client.Rcli;
\r
-import com.att.cadi.client.Retryable;
\r
-import com.att.cadi.config.Config;
\r
-import com.att.cadi.config.SecurityInfoC;
\r
-import com.att.cadi.http.HBasicAuthSS;
\r
-import com.att.cadi.http.HMangr;
\r
-import com.att.cadi.locator.DME2Locator;
\r
-import com.att.inno.env.APIException;
\r
+import org.onap.aaf.inno.env.APIException;
\r
\r
public class TestHClient {
\r
public static void main(String[] args) {
\r
\r
public class TestHClient {
\r
public static void main(String[] args) {
\r
diff --git
a/core/pom.xml
b/core/pom.xml
index
3cfdeb1
..
80fb699
100644
(file)
--- a/
core/pom.xml
+++ b/
core/pom.xml
@@
-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
-->
\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
<artifactId>parent</artifactId>
\r
<relativePath>..</relativePath>
\r
<version>1.0.0-SNAPSHOT</version>
\r
@@
-34,7
+34,15
@@
<packaging>jar</packaging>
\r
<url>https://github.com/att/AAF</url>
\r
<description>CADI</description>
\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
<dependencies>
\r
\r
<dependency>
\r
@@
-112,19
+120,61
@@
</execution>
\r
</executions>
\r
</plugin>
\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
</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
</project>
\r
diff --git
a/core/src/main/java/com/att/cadi/AES.java
b/core/src/main/java/org/onap/aaf/cadi/AES.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/AES.java
rename to
core/src/main/java/org/onap/aaf/cadi/AES.java
index
7304932
..
515fc27
100644
(file)
--- a/
core/src/main/java/com/att/cadi/AES.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/AES.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\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 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
\r
public class AES {
\r
public static final String AES = AES.class.getSimpleName();
\r
diff --git
a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java
index
f244d09
..
ceb6ca3
100644
(file)
--- a/
core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/AbsCachedPrincipal.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
public abstract class AbsCachedPrincipal<TAF> implements CachedPrincipal {
\r
\r
\r
public abstract class AbsCachedPrincipal<TAF> implements CachedPrincipal {
\r
diff --git
a/core/src/main/java/com/att/cadi/AbsUserCache.java
b/core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/AbsUserCache.java
rename to
core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java
index
d374faa
..
1846793
100644
(file)
--- a/
core/src/main/java/com/att/cadi/AbsUserCache.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/AbsUserCache.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
import java.security.Principal;
\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 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
\r
/**
\r
* Implement Fast lookup and Cache for Local User Info
\r
diff --git
a/core/src/main/java/com/att/cadi/Access.java
b/core/src/main/java/org/onap/aaf/cadi/Access.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/Access.java
rename to
core/src/main/java/org/onap/aaf/cadi/Access.java
index
4c238ee
..
a8eeda1
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Access.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Access.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
diff --git
a/core/src/main/java/com/att/cadi/BasicCred.java
b/core/src/main/java/org/onap/aaf/cadi/BasicCred.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/BasicCred.java
rename to
core/src/main/java/org/onap/aaf/cadi/BasicCred.java
index
6f0aff5
..
a645b83
100644
(file)
--- a/
core/src/main/java/com/att/cadi/BasicCred.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/BasicCred.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
/**
\r
* An Interface for testing on Requests to see if we can get a User and Password
\r
\r
/**
\r
* An Interface for testing on Requests to see if we can get a User and Password
\r
diff --git
a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
b/core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/BufferedCadiWrap.java
rename to
core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java
index
74dd126
..
56d72aa
100644
(file)
--- a/
core/src/main/java/com/att/cadi/BufferedCadiWrap.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/BufferedCadiWrap.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.BufferedReader;
\r
import java.io.IOException;
\r
\r
import java.io.BufferedReader;
\r
import java.io.IOException;
\r
diff --git
a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
b/core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/BufferedServletInputStream.java
rename to
core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java
index
10e7b1f
..
345db91
100644
(file)
--- a/
core/src/main/java/com/att/cadi/BufferedServletInputStream.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/BufferedServletInputStream.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
diff --git
a/core/src/main/java/com/att/cadi/CachedPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/CachedPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java
index
3968f1b
..
de90b74
100644
(file)
--- a/
core/src/main/java/com/att/cadi/CachedPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/CachedPrincipal.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.security.Principal;
\r
\r
\r
import java.security.Principal;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/CachingLur.java
b/core/src/main/java/org/onap/aaf/cadi/CachingLur.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/CachingLur.java
rename to
core/src/main/java/org/onap/aaf/cadi/CachingLur.java
index
ee87431
..
f57a567
100644
(file)
--- a/
core/src/main/java/com/att/cadi/CachingLur.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/CachingLur.java
@@
-20,11
+20,11
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.security.Principal;
\r
\r
\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
\r
\r
public interface CachingLur<PERM extends Permission> extends Lur {
\r
diff --git
a/core/src/main/java/com/att/cadi/CadiException.java
b/core/src/main/java/org/onap/aaf/cadi/CadiException.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/CadiException.java
rename to
core/src/main/java/org/onap/aaf/cadi/CadiException.java
index
66b7b5b
..
f8b06ce
100644
(file)
--- a/
core/src/main/java/com/att/cadi/CadiException.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/CadiException.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
/**
\r
* CADI Specific Exception
\r
\r
/**
\r
* CADI Specific Exception
\r
diff --git
a/core/src/main/java/com/att/cadi/CadiWrap.java
b/core/src/main/java/org/onap/aaf/cadi/CadiWrap.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/CadiWrap.java
rename to
core/src/main/java/org/onap/aaf/cadi/CadiWrap.java
index
64c565f
..
6cf5694
100644
(file)
--- a/
core/src/main/java/com/att/cadi/CadiWrap.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/CadiWrap.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.security.Principal;
\r
import java.util.ArrayList;
\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 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
\r
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/Capacitor.java
b/core/src/main/java/org/onap/aaf/cadi/Capacitor.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/Capacitor.java
rename to
core/src/main/java/org/onap/aaf/cadi/Capacitor.java
index
73fd83c
..
a7aa4f6
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Capacitor.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Capacitor.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.nio.ByteBuffer;
\r
import java.util.ArrayList;
\r
\r
import java.nio.ByteBuffer;
\r
import java.util.ArrayList;
\r
diff --git
a/core/src/main/java/com/att/cadi/CmdLine.java
b/core/src/main/java/org/onap/aaf/cadi/CmdLine.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/CmdLine.java
rename to
core/src/main/java/org/onap/aaf/cadi/CmdLine.java
index
89685e2
..
b387c7a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/CmdLine.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/CmdLine.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.BufferedReader;
\r
import java.io.File;
\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 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
\r
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/Connector.java
b/core/src/main/java/org/onap/aaf/cadi/Connector.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Connector.java
rename to
core/src/main/java/org/onap/aaf/cadi/Connector.java
index
ab96010
..
0a55b0d
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Connector.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Connector.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
public interface Connector {
\r
public Lur newLur() throws CadiException;
\r
\r
public interface Connector {
\r
public Lur newLur() throws CadiException;
\r
diff --git
a/core/src/main/java/com/att/cadi/CredVal.java
b/core/src/main/java/org/onap/aaf/cadi/CredVal.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/CredVal.java
rename to
core/src/main/java/org/onap/aaf/cadi/CredVal.java
index
4fe0a28
..
324746b
100644
(file)
--- a/
core/src/main/java/com/att/cadi/CredVal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/CredVal.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
/**
\r
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/GetCred.java
b/core/src/main/java/org/onap/aaf/cadi/GetCred.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/GetCred.java
rename to
core/src/main/java/org/onap/aaf/cadi/GetCred.java
index
d2c99f2
..
c0917a5
100644
(file)
--- a/
core/src/main/java/com/att/cadi/GetCred.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/GetCred.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
public interface GetCred {
\r
byte[] getCred();
\r
\r
public interface GetCred {
\r
byte[] getCred();
\r
diff --git
a/core/src/main/java/com/att/cadi/Hash.java
b/core/src/main/java/org/onap/aaf/cadi/Hash.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Hash.java
rename to
core/src/main/java/org/onap/aaf/cadi/Hash.java
index
b4e114f
..
9d8719a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Hash.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Hash.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.nio.ByteBuffer;
\r
import java.security.MessageDigest;
\r
\r
import java.nio.ByteBuffer;
\r
import java.security.MessageDigest;
\r
diff --git
a/core/src/main/java/com/att/cadi/Locator.java
b/core/src/main/java/org/onap/aaf/cadi/Locator.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Locator.java
rename to
core/src/main/java/org/onap/aaf/cadi/Locator.java
index
ab1a7f9
..
05b6442
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Locator.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Locator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
public interface Locator<T> {
\r
public T get(Locator.Item item) throws LocatorException;
\r
\r
public interface Locator<T> {
\r
public T get(Locator.Item item) throws LocatorException;
\r
diff --git
a/core/src/main/java/com/att/cadi/LocatorException.java
b/core/src/main/java/org/onap/aaf/cadi/LocatorException.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/LocatorException.java
rename to
core/src/main/java/org/onap/aaf/cadi/LocatorException.java
index
9c3b804
..
43127ec
100644
(file)
--- a/
core/src/main/java/com/att/cadi/LocatorException.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/LocatorException.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
public class LocatorException extends Exception {
\r
/**
\r
\r
public class LocatorException extends Exception {
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/Lur.java
b/core/src/main/java/org/onap/aaf/cadi/Lur.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Lur.java
rename to
core/src/main/java/org/onap/aaf/cadi/Lur.java
index
d8ae6a3
..
afbf2dd
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Lur.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Lur.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.security.Principal;
\r
import java.util.List;
\r
\r
import java.security.Principal;
\r
import java.util.List;
\r
diff --git
a/core/src/main/java/com/att/cadi/Permission.java
b/core/src/main/java/org/onap/aaf/cadi/Permission.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Permission.java
rename to
core/src/main/java/org/onap/aaf/cadi/Permission.java
index
adb80a1
..
ac0ec46
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Permission.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Permission.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
public interface Permission {
\r
public String permType();
\r
\r
public interface Permission {
\r
public String permType();
\r
diff --git
a/core/src/main/java/com/att/cadi/PropAccess.java
b/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/PropAccess.java
rename to
core/src/main/java/org/onap/aaf/cadi/PropAccess.java
index
d7c9d99
..
d866e85
100644
(file)
--- a/
core/src/main/java/com/att/cadi/PropAccess.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/PropAccess.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\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.Date;
\r
import java.util.List;
\r
import java.util.Map.Entry;
\r
-import java.util.Properties;
\r
\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
\r
public class PropAccess implements Access {
\r
private static final SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
\r
diff --git
a/core/src/main/java/com/att/cadi/Revalidator.java
b/core/src/main/java/org/onap/aaf/cadi/Revalidator.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/Revalidator.java
rename to
core/src/main/java/org/onap/aaf/cadi/Revalidator.java
index
5d492aa
..
68b2661
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Revalidator.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Revalidator.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
public interface Revalidator<TRANS> {
\r
\r
\r
public interface Revalidator<TRANS> {
\r
diff --git
a/core/src/main/java/com/att/cadi/SLF4JAccess.java
b/core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/SLF4JAccess.java
rename to
core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java
index
b222e35
..
33b7050
100644
(file)
--- a/
core/src/main/java/com/att/cadi/SLF4JAccess.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/SLF4JAccess.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.util.Properties;
\r
\r
\r
import java.util.Properties;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/SecuritySetter.java
b/core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/SecuritySetter.java
rename to
core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java
index
295148f
..
88c45b0
100644
(file)
--- a/
core/src/main/java/com/att/cadi/SecuritySetter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/SecuritySetter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
/**
\r
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/ServletContextAccess.java
b/core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/ServletContextAccess.java
rename to
core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java
index
2d1cfa1
..
6c288d5
100644
(file)
--- a/
core/src/main/java/com/att/cadi/ServletContextAccess.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/ServletContextAccess.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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 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
\r
public class ServletContextAccess extends PropAccess {
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/StrLur.java
b/core/src/main/java/org/onap/aaf/cadi/StrLur.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/StrLur.java
rename to
core/src/main/java/org/onap/aaf/cadi/StrLur.java
index
f191203
..
1a86c8e
100644
(file)
--- a/
core/src/main/java/com/att/cadi/StrLur.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/StrLur.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.util.List;
\r
\r
\r
import java.util.List;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/Symm.java
b/core/src/main/java/org/onap/aaf/cadi/Symm.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Symm.java
rename to
core/src/main/java/org/onap/aaf/cadi/Symm.java
index
1504c2d
..
beb0c40
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Symm.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Symm.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.ByteArrayInputStream;
\r
import java.io.ByteArrayOutputStream;
\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 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
\r
/**
\r
* Key Conversion, primarily "Base64"
\r
diff --git
a/core/src/main/java/com/att/cadi/Taf.java
b/core/src/main/java/org/onap/aaf/cadi/Taf.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/Taf.java
rename to
core/src/main/java/org/onap/aaf/cadi/Taf.java
index
4017866
..
d4b2211
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Taf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Taf.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
-import
com.att
.cadi.taf.TafResp;
\r
+import
org.onap.aaf
.cadi.taf.TafResp;
\r
\r
\r
/**
\r
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/Transmutate.java
b/core/src/main/java/org/onap/aaf/cadi/Transmutate.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/Transmutate.java
rename to
core/src/main/java/org/onap/aaf/cadi/Transmutate.java
index
1d6ff6f
..
950f28f
100644
(file)
--- a/
core/src/main/java/com/att/cadi/Transmutate.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/Transmutate.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.security.Principal;
\r
\r
\r
import java.security.Principal;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/TrustChecker.java
b/core/src/main/java/org/onap/aaf/cadi/TrustChecker.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/TrustChecker.java
rename to
core/src/main/java/org/onap/aaf/cadi/TrustChecker.java
index
60b9a17
..
feade74
100644
(file)
--- a/
core/src/main/java/com/att/cadi/TrustChecker.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/TrustChecker.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
\r
import javax.servlet.http.HttpServletRequest;
\r
\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
\r
/**
\r
* Change to another Principal based on Trust of caller and User Chain (if desired)
\r
diff --git
a/core/src/main/java/com/att/cadi/User.java
b/core/src/main/java/org/onap/aaf/cadi/User.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/User.java
rename to
core/src/main/java/org/onap/aaf/cadi/User.java
index
bde3488
..
372e9bc
100644
(file)
--- a/
core/src/main/java/com/att/cadi/User.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/User.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.security.Principal;
\r
import java.util.HashMap;
\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 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
\r
/**
\r
* Class to hold info from the User Perspective.
\r
diff --git
a/core/src/main/java/com/att/cadi/UserChain.java
b/core/src/main/java/org/onap/aaf/cadi/UserChain.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/UserChain.java
rename to
core/src/main/java/org/onap/aaf/cadi/UserChain.java
index
df493c5
..
ac04792
100644
(file)
--- a/
core/src/main/java/com/att/cadi/UserChain.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/UserChain.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
/**
\r
* Interface to add a User Chain String to Principal
\r
\r
/**
\r
* Interface to add a User Chain String to Principal
\r
diff --git
a/core/src/main/java/com/att/cadi/config/Config.java
b/core/src/main/java/org/onap/aaf/cadi/config/Config.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/config/Config.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/Config.java
index
ada6117
..
4128665
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/Config.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.config;
\r
+package
org.onap.aaf
.cadi.config;
\r
\r
import java.io.IOException;
\r
import java.lang.reflect.Constructor;
\r
\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
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 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
/**
\r
* Create a Consistent Configuration mechanism, even when configuration styles are as vastly different as
\r
* Properties vs JavaBeans vs FilterConfigs...
\r
diff --git
a/core/src/main/java/com/att/cadi/config/Get.java
b/core/src/main/java/org/onap/aaf/cadi/config/Get.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/config/Get.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/Get.java
index
7a2eab5
..
ea06c87
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/Get.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/Get.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public interface Get {
\r
public String get(String name, String def, boolean print);
\r
diff --git
a/core/src/main/java/com/att/cadi/config/GetAccess.java
b/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/config/GetAccess.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
index
1df9b0e
..
dc5e4ef
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/GetAccess.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class GetAccess extends PropAccess {
\r
private final Get getter;
\r
diff --git
a/core/src/main/java/com/att/cadi/config/MultiGet.java
b/core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/config/MultiGet.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java
index
83cd21d
..
551018c
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/MultiGet.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/MultiGet.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.config;
\r
+package
org.onap.aaf
.cadi.config;
\r
\r
public class MultiGet implements Get {
\r
private Get[] getters;
\r
\r
public class MultiGet implements Get {
\r
private Get[] getters;
\r
diff --git
a/core/src/main/java/com/att/cadi/config/SecurityInfo.java
b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/config/SecurityInfo.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java
index
6d0f3c2
..
4301d53
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/SecurityInfo.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/SecurityInfo.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.config;
\r
+package
org.onap.aaf
.cadi.config;
\r
\r
import java.io.File;
\r
import java.io.FileInputStream;
\r
\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 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
\r
public class SecurityInfo {
\r
private static final String SECURITY_ALGO = "RSA";
\r
diff --git
a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
b/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/config/SecurityInfoC.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
index
2b0ec43
..
e631928
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/SecurityInfoC.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
\r
public class SecurityInfoC<CLIENT> extends SecurityInfo {
\r
diff --git
a/core/src/main/java/com/att/cadi/config/UsersDump.java
b/core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/config/UsersDump.java
rename to
core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
index
992b365
..
e0893e6
100644
(file)
--- a/
core/src/main/java/com/att/cadi/config/UsersDump.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/config/UsersDump.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.config;
\r
+package
org.onap.aaf
.cadi.config;
\r
\r
import java.io.ByteArrayOutputStream;
\r
import java.io.File;
\r
\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 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
\r
public class UsersDump {
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/AUTHZ.java
b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/filter/AUTHZ.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java
index
ab32a98
..
49a1634
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/AUTHZ.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/AUTHZ.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import static java.lang.annotation.ElementType.TYPE;
\r
import static java.lang.annotation.RetentionPolicy.RUNTIME;
\r
\r
import static java.lang.annotation.ElementType.TYPE;
\r
import static java.lang.annotation.RetentionPolicy.RUNTIME;
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
b/core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java
index
c1ad627
..
871dee3
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/AUTHZServlet.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import java.io.IOException;
\r
\r
\r
import java.io.IOException;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/AccessGetter.java
b/core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/filter/AccessGetter.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java
index
37d2c04
..
596afd2
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/AccessGetter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/AccessGetter.java
@@
-20,10
+20,10
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
\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
\r
public class AccessGetter implements Get {
\r
private final Access access;
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/CadiAccess.java
b/core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/filter/CadiAccess.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java
index
e9bc5a8
..
2ccd29a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/CadiAccess.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/CadiAccess.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import java.io.FileInputStream;
\r
import java.io.IOException;
\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
\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
\r
public class CadiAccess implements Access {
\r
// constants for a couple of very commonly used strings.
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/CadiFilter.java
b/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/filter/CadiFilter.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
index
da24f44
..
0b8bb8f
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/CadiFilter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import java.io.IOException;
\r
import java.lang.reflect.Constructor;
\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 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.Prop
Access;
\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.ServletContext
Access;
\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
\r
/**
\r
* CadiFilter
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
b/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
similarity index 90%
rename from
core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
index
6969b8c
..
a3df1c0
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import java.io.IOException;
\r
import java.util.ArrayList;
\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 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
\r
/**
\r
* Encapsulate common HTTP Manipulation Behavior. It will appropriately set
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/FCGet.java
b/core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/filter/FCGet.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java
index
b8f95da
..
e6912e7
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/FCGet.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/FCGet.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import javax.servlet.FilterConfig;
\r
import javax.servlet.ServletContext;
\r
\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
\r
/*
\r
* A private method to query the Filter config and if not exists, return the default. This
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
b/core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/filter/MapPermConverter.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java
index
09b6f93
..
933e6f9
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/MapPermConverter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/MapPermConverter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import java.util.HashMap;
\r
import java.util.Map;
\r
\r
import java.util.HashMap;
\r
import java.util.Map;
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
b/core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/filter/NullPermConverter.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java
index
d73008e
..
223e1a4
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/NullPermConverter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/NullPermConverter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
\r
/**
\r
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/PathFilter.java
b/core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/filter/PathFilter.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java
index
328977d
..
87e3c78
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/PathFilter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/PathFilter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
import java.io.IOException;
\r
\r
\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 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
\r
/**
\r
* PathFilter
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/PermConverter.java
b/core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/filter/PermConverter.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java
index
ba098c4
..
8f71e29
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/PermConverter.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/PermConverter.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
\r
/**
\r
* Convert a simplistic, single string Permission into an Enterprise Scoped Perm
\r
\r
/**
\r
* Convert a simplistic, single string Permission into an Enterprise Scoped Perm
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
b/core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/filter/RolesAllowed.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java
index
97a8f54
..
0a5873e
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/RolesAllowed.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/RolesAllowed.java
@@
-31,7
+31,7
@@
* POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation
\r
*
\r
*/
\r
* POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation
\r
*
\r
*/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
import static java.lang.annotation.ElementType.TYPE;
\r
import static java.lang.annotation.RetentionPolicy.RUNTIME;
\r
\r
import static java.lang.annotation.ElementType.TYPE;
\r
import static java.lang.annotation.RetentionPolicy.RUNTIME;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/filter/ServletImpl.java
b/core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/filter/ServletImpl.java
rename to
core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java
index
13a251c
..
f581c5f
100644
(file)
--- a/
core/src/main/java/com/att/cadi/filter/ServletImpl.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/filter/ServletImpl.java
@@
-31,7
+31,7
@@
* POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation
\r
*
\r
*/
\r
* POJOs like Jetty by simply adding the Roles Allowed in a similar Annotation
\r
*
\r
*/
\r
-package
com.att
.cadi.filter;
\r
+package
org.onap.aaf
.cadi.filter;
\r
import static java.lang.annotation.ElementType.TYPE;
\r
import static java.lang.annotation.RetentionPolicy.RUNTIME;
\r
\r
import static java.lang.annotation.ElementType.TYPE;
\r
import static java.lang.annotation.RetentionPolicy.RUNTIME;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java
index
443d7e7
..
32e4816
100644
(file)
--- a/
core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/lur/ConfigPrincipal.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur;
\r
+package
org.onap.aaf
.cadi.lur;
\r
\r
import java.io.IOException;
\r
import java.security.Principal;
\r
\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
\r
public class ConfigPrincipal implements Principal, GetCred {
\r
private String name;
\r
diff --git
a/core/src/main/java/com/att/cadi/lur/EpiLur.java
b/core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/lur/EpiLur.java
rename to
core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java
index
1eff70e
..
0e612e9
100644
(file)
--- a/
core/src/main/java/com/att/cadi/lur/EpiLur.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/lur/EpiLur.java
@@
-20,16
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur;
\r
+package
org.onap.aaf
.cadi.lur;
\r
\r
import java.security.Principal;
\r
import java.util.List;
\r
\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
\r
/**
\r
* EpiLUR
\r
diff --git
a/core/src/main/java/com/att/cadi/lur/LocalLur.java
b/core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/lur/LocalLur.java
rename to
core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java
index
5980769
..
4086b51
100644
(file)
--- a/
core/src/main/java/com/att/cadi/lur/LocalLur.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/lur/LocalLur.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur;
\r
+package
org.onap.aaf
.cadi.lur;
\r
\r
import java.io.IOException;
\r
import java.security.Principal;
\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 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.Leve
l;
\r
-import
com.att.cadi.CredVal
;
\r
-import
com.att.cadi.Hash
;
\r
-import
com.att.cadi.Permission
;
\r
-import
com.att.cadi.StrLu
r;
\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.CredVa
l;
\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.Use
r;
\r
+import
org.onap.aaf.cadi.Access.Level
;
\r
+import
org.onap.aaf
.cadi.config.Config;
\r
\r
\r
/**
\r
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/lur/LocalPermission.java
b/core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/lur/LocalPermission.java
rename to
core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java
index
b44f840
..
cccb74c
100644
(file)
--- a/
core/src/main/java/com/att/cadi/lur/LocalPermission.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/lur/LocalPermission.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur;
\r
+package
org.onap.aaf
.cadi.lur;
\r
\r
\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
\r
public class LocalPermission implements Permission {
\r
private String key;
\r
diff --git
a/core/src/main/java/com/att/cadi/lur/NullLur.java
b/core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/lur/NullLur.java
rename to
core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java
index
7b01f5a
..
94080df
100644
(file)
--- a/
core/src/main/java/com/att/cadi/lur/NullLur.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/lur/NullLur.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur;
\r
+package
org.onap.aaf
.cadi.lur;
\r
\r
import java.security.Principal;
\r
import java.util.List;
\r
\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
\r
public class NullLur implements Lur {
\r
private static final Permission NULL = new Permission() {
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java
index
800628d
..
e84caeb
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/BasicPrincipal.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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.ByteArrayInputStream;
\r
import java.io.ByteArrayOutputStream;
\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 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
\r
public class BasicPrincipal extends BearerPrincipal implements GetCred {
\r
private static byte[] basic = "Basic ".getBytes();
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java
index
0d215a5
..
08793c5
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/BearerPrincipal.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\r
import java.security.Principal;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
b/core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java
index
e3ccb42
..
3694584
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/CSPPrincipal_T.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\r
import java.security.Principal;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java
index
de1ebaf
..
9a33dc6
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/CachedBasicPrincipal.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\r
/**
\r
* Cached Principals need to be able to revalidate in the Background
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java
index
e2a6400
..
b55f86a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
public class TGuardPrincipal extends BearerPrincipal {
\r
\r
\r
public class TGuardPrincipal extends BearerPrincipal {
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
b/core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java
index
cfd8564
..
235c74c
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/TGuardPrincipal_T.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\r
import java.security.Principal;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
b/core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java
index
744560f
..
4add242
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/TrustPrincipal.java
@@
-20,11
+20,11
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\r
public class TrustPrincipal extends BearerPrincipal implements UserChain {
\r
private final String name;
\r
diff --git
a/core/src/main/java/com/att/cadi/principal/X509Principal.java
b/core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/principal/X509Principal.java
rename to
core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java
index
89a8dc2
..
2f3fd28
100644
(file)
--- a/
core/src/main/java/com/att/cadi/principal/X509Principal.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/principal/X509Principal.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import java.security.cert.CertificateEncodingException;
\r
import java.security.cert.X509Certificate;
\r
import java.util.regex.Pattern;
\r
\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
\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
diff --git
a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/taf/AbsTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java
index
f57b975
..
6a7f15e
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/AbsTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/AbsTafResp.java
@@
-20,11
+20,11
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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.security.Principal;
\r
\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
\r
/**
\r
* AbsTafResp
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/EpiTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/taf/EpiTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java
index
613f317
..
7cb40ed
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/EpiTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/EpiTaf.java
@@
-20,10
+20,10
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
\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
\r
/**
\r
* EpiTAF
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
index
3036f07
..
05832f7
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/HttpEpiTaf.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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.net.URI;
\r
import java.security.Principal;
\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 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.Locato
r;
\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.TrustChecke
r;
\r
+import
org.onap.aaf.cadi.CachedPrincipal.Resp
;
\r
+import
org.onap.aaf.cadi.Taf.LifeForm
;
\r
\r
/**
\r
* HttpEpiTaf
\r
\r
/**
\r
* HttpEpiTaf
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/HttpTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java
similarity index 92%
rename from
core/src/main/java/com/att/cadi/taf/HttpTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java
index
ad22872
..
325de6a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/HttpTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/HttpTaf.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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 javax.servlet.http.HttpServletRequest;
\r
import javax.servlet.http.HttpServletResponse;
\r
\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
\r
/**
\r
* A TAF which is in a specific HTTP environment in which the engine implements
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
index
8a6acad
..
b6bb385
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/LoginPageTafResp.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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.net.URI;
\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
\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
\r
public class LoginPageTafResp extends AbsTafResp {
\r
private final HttpServletResponse httpResp;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/NullTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/taf/NullTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java
index
0a6f4bb
..
fb1b930
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/NullTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/NullTaf.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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 javax.servlet.http.HttpServletRequest;
\r
import javax.servlet.http.HttpServletResponse;
\r
\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
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/NullTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/taf/NullTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java
index
8dcfc1e
..
97e49e0
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/NullTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/NullTafResp.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
\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
\r
/**
\r
* A Null Pattern for setting responses to "Deny" before configuration is setup.
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/taf/PuntTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java
index
8951145
..
10c401a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/PuntTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/PuntTafResp.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
\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
\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
diff --git
a/core/src/main/java/com/att/cadi/taf/Redirectable.java
b/core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/taf/Redirectable.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java
index
4ef31bc
..
6e20bab
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/Redirectable.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/Redirectable.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
public interface Redirectable extends TafResp {
\r
/**
\r
\r
public interface Redirectable extends TafResp {
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/TafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/taf/TafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java
index
140ac13
..
cb0915a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/TafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/TafResp.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
\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
\r
/**
\r
* Response from Taf objects, which inform users what has happened and/or what should be done
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java
similarity index 93%
rename from
core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java
index
29a299f
..
2ab4a62
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/TrustNotTafResp.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
\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
\r
public class TrustNotTafResp implements TafResp {
\r
private final TafResp delegate;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/taf/TrustTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java
index
25c665b
..
cd4c92f
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/TrustTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/TrustTafResp.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\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
\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
\r
public class TrustTafResp implements TafResp {
\r
private final TafResp delegate;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
similarity index 88%
rename from
core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
index
f954a00
..
f6cc3a7
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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 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 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.CachedPrincip
al;
\r
-import
com.att.cadi.CachedPrincipal.Resp
;
\r
-import
com.att.cadi.CredVa
l;
\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.CredV
al;
\r
+import
org.onap.aaf.cadi.Taf
;
\r
+import
org.onap.aaf.cadi.Access.Leve
l;
\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
\r
/**
\r
* BasicHttpTaf
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java
index
1d43054
..
45eab48
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTafResp.java
@@
-20,16
+20,16
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class BasicHttpTafResp extends AbsTafResp implements TafResp {
\r
private HttpServletResponse httpResp;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
b/core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java
index
5d9624a
..
1d84d67
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/cert/CertIdentity.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.taf.cert;
\r
+package
org.onap.aaf
.cadi.taf.cert;
\r
\r
import java.security.Principal;
\r
import java.security.cert.CertificateException;
\r
\r
import java.security.Principal;
\r
import java.security.cert.CertificateException;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java
similarity index 89%
rename from
core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java
index
8148a4e
..
f301fc2
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/cert/X509HttpTafResp.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class X509HttpTafResp extends AbsTafResp implements TafResp {
\r
private RESP status;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java
similarity index 90%
rename from
core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java
index
6bef245
..
36217cc
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/cert/X509Taf.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.taf.cert;
\r
+package
org.onap.aaf
.cadi.taf.cert;
\r
\r
import java.io.ByteArrayInputStream;
\r
import java.io.ByteArrayOutputStream;
\r
\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 javax.servlet.http.HttpServletRequest;
\r
import javax.servlet.http.HttpServletResponse;
\r
\r
-import
com.att
.cadi.Access;
\r
-import
com.att.cadi.Access.Leve
l;
\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.CachedPrincipa
l;
\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
\r
public class X509Taf implements HttpTaf {
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java
index
6bb9252
..
c55b7eb
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTaf.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.taf.dos;
\r
+package
org.onap.aaf
.cadi.taf.dos;
\r
\r
import java.io.BufferedReader;
\r
import java.io.File;
\r
\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 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
\r
public class DenialOfServiceTaf implements HttpTaf {
\r
private static Map<String, Counter> deniedIP=null, deniedID=null;
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java
index
1b4efed
..
ac6c01a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/dos/DenialOfServiceTafResp.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.taf.dos;
\r
+package
org.onap.aaf
.cadi.taf.dos;
\r
\r
import java.io.IOException;
\r
\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
\r
public class DenialOfServiceTafResp extends AbsTafResp {
\r
private RESP ect; // Homage to Arethra Franklin
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java
similarity index 90%
rename from
core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java
index
67754a9
..
af9554f
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTaf.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.taf.localhost;
\r
+package
org.onap.aaf
.cadi.taf.localhost;
\r
\r
import java.net.InetAddress;
\r
import java.net.NetworkInterface;
\r
\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 javax.servlet.http.HttpServletRequest;
\r
import javax.servlet.http.HttpServletResponse;
\r
\r
-import
com.att
.cadi.Access;
\r
-import
com.att.cadi.Access.Leve
l;
\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.CachedPrincipa
l;
\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
\r
/**
\r
* Implement the ability to utilize LocalHost as a TAF.
\r
diff --git
a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
b/core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java
similarity index 91%
rename from
core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
rename to
core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java
index
2a074d1
..
bda5484
100644
(file)
--- a/
core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/taf/localhost/LocalhostTafResp.java
@@
-20,12
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\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
\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
\r
public class LocalhostTafResp implements TafResp {
\r
private RESP action;
\r
diff --git
a/core/src/main/java/com/att/cadi/util/Chmod.java
b/core/src/main/java/org/onap/aaf/cadi/util/Chmod.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/Chmod.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/Chmod.java
index
ddde50b
..
f999a11
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/Chmod.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/Chmod.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
import java.io.File;
\r
import java.io.IOException;
\r
\r
import java.io.File;
\r
import java.io.IOException;
\r
diff --git
a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
b/core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/JsonOutputStream.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java
index
33deed0
..
546292e
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/JsonOutputStream.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/JsonOutputStream.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
import java.io.IOException;
\r
import java.io.OutputStream;
\r
\r
import java.io.IOException;
\r
import java.io.OutputStream;
\r
diff --git
a/core/src/main/java/com/att/cadi/util/MaskFormatException.java
b/core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/MaskFormatException.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java
index
fa3f220
..
551eae9
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/MaskFormatException.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/MaskFormatException.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
@SuppressWarnings("serial")
\r
public class MaskFormatException extends Exception {
\r
\r
@SuppressWarnings("serial")
\r
public class MaskFormatException extends Exception {
\r
diff --git
a/core/src/main/java/com/att/cadi/util/MyConsole.java
b/core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/MyConsole.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java
index
4083dea
..
de1c882
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/MyConsole.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/MyConsole.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
public interface MyConsole {
\r
public String readLine(String fmt, Object ... args);
\r
\r
public interface MyConsole {
\r
public String readLine(String fmt, Object ... args);
\r
diff --git
a/core/src/main/java/com/att/cadi/util/NetMask.java
b/core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/NetMask.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
index
9707047
..
b19f150
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/NetMask.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/NetMask.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
/*
\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
\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
diff --git
a/core/src/main/java/com/att/cadi/util/Split.java
b/core/src/main/java/org/onap/aaf/cadi/util/Split.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/util/Split.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/Split.java
index
07332dd
..
c3b37dc
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/Split.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/Split.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
/**
\r
* Split by Char, optional Trim
\r
\r
/**
\r
* Split by Char, optional Trim
\r
diff --git
a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
b/core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/SubStandardConsole.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java
index
8a44568
..
b2a29e6
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/SubStandardConsole.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/SubStandardConsole.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
import java.io.BufferedReader;
\r
import java.io.IOException;
\r
\r
import java.io.BufferedReader;
\r
import java.io.IOException;
\r
diff --git
a/core/src/main/java/com/att/cadi/util/TheConsole.java
b/core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/TheConsole.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java
index
05fcd9b
..
3a6b291
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/TheConsole.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/TheConsole.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
public class TheConsole implements MyConsole {
\r
@Override
\r
\r
public class TheConsole implements MyConsole {
\r
@Override
\r
diff --git
a/core/src/main/java/com/att/cadi/util/UserChainManip.java
b/core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java
similarity index 94%
rename from
core/src/main/java/com/att/cadi/util/UserChainManip.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java
index
9f6eeec
..
5f945f3
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/UserChainManip.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/UserChainManip.java
@@
-20,9
+20,9
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
\r
-import
com.att
.cadi.UserChain;
\r
+import
org.onap.aaf
.cadi.UserChain;
\r
\r
public class UserChainManip {
\r
/**
\r
\r
public class UserChainManip {
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/util/Vars.java
b/core/src/main/java/org/onap/aaf/cadi/util/Vars.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/util/Vars.java
rename to
core/src/main/java/org/onap/aaf/cadi/util/Vars.java
index
8d0b27e
..
af8cf86
100644
(file)
--- a/
core/src/main/java/com/att/cadi/util/Vars.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/util/Vars.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.util;
\r
+package
org.onap.aaf
.cadi.util;
\r
\r
import java.util.List;
\r
\r
\r
import java.util.List;
\r
\r
diff --git
a/core/src/main/java/com/att/cadi/wsse/Action.java
b/core/src/main/java/org/onap/aaf/cadi/wsse/Action.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/wsse/Action.java
rename to
core/src/main/java/org/onap/aaf/cadi/wsse/Action.java
index
0ed99c0
..
e95337f
100644
(file)
--- a/
core/src/main/java/com/att/cadi/wsse/Action.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/wsse/Action.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.wsse;
\r
+package
org.onap.aaf
.cadi.wsse;
\r
\r
/**
\r
* Interface to specify an action deep within a parsing tree on a local object
\r
\r
/**
\r
* Interface to specify an action deep within a parsing tree on a local object
\r
diff --git
a/core/src/main/java/com/att/cadi/wsse/Match.java
b/core/src/main/java/org/onap/aaf/cadi/wsse/Match.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/wsse/Match.java
rename to
core/src/main/java/org/onap/aaf/cadi/wsse/Match.java
index
e1c1078
..
bffe447
100644
(file)
--- a/
core/src/main/java/com/att/cadi/wsse/Match.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/wsse/Match.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.wsse;
\r
+package
org.onap.aaf
.cadi.wsse;
\r
\r
import javax.xml.namespace.QName;
\r
import javax.xml.stream.XMLStreamException;
\r
\r
import javax.xml.namespace.QName;
\r
import javax.xml.stream.XMLStreamException;
\r
diff --git
a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
b/core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/wsse/WSSEParser.java
rename to
core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java
index
4c7ba90
..
760020a
100644
(file)
--- a/
core/src/main/java/com/att/cadi/wsse/WSSEParser.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/wsse/WSSEParser.java
@@
-20,14
+20,14
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.wsse;
\r
+package
org.onap.aaf
.cadi.wsse;
\r
\r
import java.io.IOException;
\r
import java.io.InputStream;
\r
\r
import javax.xml.stream.XMLStreamException;
\r
\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
\r
\r
/**
\r
diff --git
a/core/src/main/java/com/att/cadi/wsse/XEvent.java
b/core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java
similarity index 95%
rename from
core/src/main/java/com/att/cadi/wsse/XEvent.java
rename to
core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java
index
51a2734
..
e5af256
100644
(file)
--- a/
core/src/main/java/com/att/cadi/wsse/XEvent.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/wsse/XEvent.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.wsse;
\r
+package
org.onap.aaf
.cadi.wsse;
\r
\r
import javax.xml.namespace.QName;
\r
import javax.xml.stream.events.XMLEvent;
\r
\r
import javax.xml.namespace.QName;
\r
import javax.xml.stream.events.XMLEvent;
\r
diff --git
a/core/src/main/java/com/att/cadi/wsse/XReader.java
b/core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
similarity index 96%
rename from
core/src/main/java/com/att/cadi/wsse/XReader.java
rename to
core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
index
833eb60
..
8fa8113
100644
(file)
--- a/
core/src/main/java/com/att/cadi/wsse/XReader.java
+++ b/
core/src/main/java/org/onap/aaf/cadi/wsse/XReader.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.wsse;
\r
+package
org.onap.aaf
.cadi.wsse;
\r
\r
import java.io.ByteArrayOutputStream;
\r
import java.io.IOException;
\r
\r
import java.io.ByteArrayOutputStream;
\r
import java.io.IOException;
\r
diff --git
a/core/src/test/java/com/att/cadi/JU_AES.java
b/core/src/test/java/org/onap/aaf/cadi/JU_AES.java
similarity index 94%
rename from
core/src/test/java/com/att/cadi/JU_AES.java
rename to
core/src/test/java/org/onap/aaf/cadi/JU_AES.java
index
fb2482a
..
11e40a6
100644
(file)
--- a/
core/src/test/java/com/att/cadi/JU_AES.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/JU_AES.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi;
\r
+package
org.onap.aaf
.cadi;
\r
\r
import java.io.ByteArrayInputStream;
\r
import java.io.ByteArrayOutputStream;
\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 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
\r
import junit.framework.Assert;
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
similarity index 88%
rename from
core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
rename to
core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
index
f11c74d
..
f050a6b
100644
(file)
--- a/
core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.lur.test;
\r
+package
org.onap.aaf
.cadi.lur.test;
\r
\r
import static junit.framework.Assert.assertEquals;
\r
import static junit.framework.Assert.assertFalse;
\r
\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
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
\r
public class JU_LocalLur {
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
b/core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java
similarity index 93%
rename from
core/src/test/java/com/att/cadi/lur/test/TestAccess.java
rename to
core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java
index
81d5092
..
8b1bab6
100644
(file)
--- a/
core/src/test/java/com/att/cadi/lur/test/TestAccess.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/lur/test/TestAccess.java
@@
-20,13
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
\r
public class TestAccess implements Access {
\r
private Symm symm;
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_Base64.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java
similarity index 95%
rename from
core/src/test/java/com/att/cadi/test/JU_Base64.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java
index
1a82298
..
4d49c92
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_Base64.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_Base64.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
import static org.junit.Assert.assertNotSame;
\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
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
\r
\r
public class JU_Base64 {
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java
similarity index 94%
rename from
core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java
index
5f299bb
..
e496076
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_BufferedServletInputStream.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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
\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
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
\r
public class JU_BufferedServletInputStream {
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java
similarity index 95%
rename from
core/src/test/java/com/att/cadi/test/JU_Capacitor.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java
index
5584911
..
9d11fe4
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_Capacitor.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_Capacitor.java
@@
-20,13
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 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
\r
public class JU_Capacitor {
\r
@Test
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_Hash.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java
similarity index 92%
rename from
core/src/test/java/com/att/cadi/test/JU_Hash.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java
index
e5d2d6b
..
92dd297
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_Hash.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_Hash.java
@@
-20,12
+20,11
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 org.junit.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
\r
import junit.framework.Assert;
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_Passcode.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java
similarity index 94%
rename from
core/src/test/java/com/att/cadi/test/JU_Passcode.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java
index
122ecf7
..
40ceaa1
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_Passcode.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_Passcode.java
@@
-20,16
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 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
\r
import junit.framework.Assert;
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java
similarity index 94%
rename from
core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java
index
65f5ebd
..
397b4b1
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_UserChainManip.java
@@
-20,13
+20,12
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 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
\r
public class JU_UserChainManip {
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/test/JU_Vars.java
b/core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java
similarity index 96%
rename from
core/src/test/java/com/att/cadi/test/JU_Vars.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java
index
e681622
..
47209cd
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/JU_Vars.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/JU_Vars.java
@@
-20,14
+20,13
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 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
\r
public class JU_Vars {
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/test/Test.java
b/core/src/test/java/org/onap/aaf/cadi/test/Test.java
similarity index 96%
rename from
core/src/test/java/com/att/cadi/test/Test.java
rename to
core/src/test/java/org/onap/aaf/cadi/test/Test.java
index
4fe9111
..
ad0c517
100644
(file)
--- a/
core/src/test/java/com/att/cadi/test/Test.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/test/Test.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.test;
\r
+package
org.onap.aaf
.cadi.test;
\r
import java.net.InetAddress;
\r
import java.net.UnknownHostException;
\r
\r
import java.net.InetAddress;
\r
import java.net.UnknownHostException;
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java
similarity index 93%
rename from
core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
rename to
core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java
index
65338ae
..
af45f55
100644
(file)
--- a/
core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_WSSE_Read.java
@@
-20,7
+20,7
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\r
******************************************************************************/
\r
-package
com.att
.cadi.wsse.test;
\r
+package
org.onap.aaf
.cadi.wsse.test;
\r
\r
import static junit.framework.Assert.assertEquals;
\r
import static junit.framework.Assert.assertNotNull;
\r
\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
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
\r
public class JU_WSSE_Read {
\r
\r
diff --git
a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
b/core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java
similarity index 92%
rename from
core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
rename to
core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java
index
ee69561
..
de8da8a
100644
(file)
--- a/
core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
+++ b/
core/src/test/java/org/onap/aaf/cadi/wsse/test/JU_XReader.java
@@
-20,16
+20,15
@@
* * ECOMP is a trademark and service mark of AT&T Intellectual Property.
\r
* *
\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 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
\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====================================================
<!--
============LICENSE_START====================================================
- * org.onap.aa
i
+ * org.onap.aa
f
* ===========================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* ===========================================================================
* 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.
* ===========================================================================
* 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>
-->
<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>
<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>
<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 -->
<project.dme2Version>3.1.200</project.dme2Version>
<!-- version>2.8.5.8</version -->
<!-- version>2.6.20</version -->
@@
-59,8
+58,13
@@
<!-- jetty-version>8.1.7.v20120910</jetty-version -->
<!-- jetty-version>7.2.0.v20101020</jetty-version -->
<!-- project.jettyVersion>9.0.3.v20130506</project.jettyVersion -->
<!-- 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>
</properties>
-
<!-- ============================================================== -->
<!-- Define the major contributors and developers of CADI -->
<!-- ============================================================== -->
<!-- ============================================================== -->
<!-- Define the major contributors and developers of CADI -->
<!-- ============================================================== -->
@@
-101,69
+105,69
@@
<dependencyManagement>
<dependencies>
<dependency>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>
com.att
.authz</groupId>
+ <groupId>
org.onap.aaf
.authz</groupId>
<artifactId>authz-client</artifactId>
<version>${project.authClientVersion}</version>
</dependency>
<dependency>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<artifactId>rosetta</artifactId>
<version>${project.innoVersion}</version>
</dependency>
@@
-389,17
+393,6
@@
</plugin>
</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>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@
-412,15
+405,7
@@
</formats>
</configuration>
</plugin>
</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>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
@@
-453,28
+438,61
@@
</lifecycleMappingMetadata>
</configuration>
</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>
</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>
</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>
</project>