diff options
| author |   sg481n <sg481n@att.com> | 2017-08-25 01:57:24 -0400 |
|---|---|---|
| committer | sg481n <sg481n@att.com> | 2017-08-25 01:57:37 -0400 |
| commit | 62c4eb45e157d502463d797c1353802ca8e1e307 (patch) | |
| tree | f79566b55c2535fd4be51b52cb4e5cb258391114 /aaf | |
| parent | a623b7658783e9a66f6131821de9447d58951cfe (diff) | |
Update project structure for aaf/cadi
Update project structure from com.att to org.onap
and add distribution management and staging plugin.
Issue-id: AAF-22
Change-Id: Idf2b591139e38921ad28782a51486714a05dee92
Signed-off-by: sg481n <sg481n@att.com>
Diffstat (limited to 'aaf')
| -rw-r--r-- | aaf/pom.xml | 78 | ||||
| -rw-r--r-- | aaf/src/main/java/Examples.java | 41 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java (renamed from aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java) | 4 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java (renamed from aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java) | 10 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java (renamed from aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java) | 45 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java (renamed from aaf/src/main/java/com/att/cadi/aaf/PermEval.java) | 4 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java (renamed from aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java) | 29 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java (renamed from aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java) | 15 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java (renamed from aaf/src/main/java/com/att/cadi/aaf/client/Examples.java) | 14 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java (renamed from aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java) | 10 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java (renamed from aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java) | 6 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java) | 27 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java) | 51 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java) | 31 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java) | 39 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java) | 31 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java) | 36 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java) | 25 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java (renamed from aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java) | 27 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java (renamed from aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java) | 15 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java (renamed from aaf/src/main/java/com/att/cadi/cm/CertException.java) | 2 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java (renamed from aaf/src/main/java/com/att/cadi/cm/CmAgent.java) | 38 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java (renamed from aaf/src/main/java/com/att/cadi/cm/Factory.java) | 11 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java (renamed from aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java) | 7 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java (renamed from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java) | 9 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java (renamed from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java) | 13 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java (renamed from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java) | 4 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java (renamed from aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java) | 13 | ||||
| -rw-r--r-- | aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java (renamed from aaf/src/main/java/com/att/cadi/sso/AAFSSO.java) | 18 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java (renamed from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java) | 21 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java (renamed from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java) | 31 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java (renamed from aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java) | 5 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java (renamed from aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java) | 20 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java (renamed from aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java) | 8 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/content/JU_Content.java (renamed from aaf/src/test/java/com/att/aaf/content/JU_Content.java) | 8 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/example/CadiTest.java (renamed from aaf/src/test/java/com/att/aaf/example/CadiTest.java) | 14 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java (renamed from aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java) | 10 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java (renamed from aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java) | 16 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java (renamed from aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java) | 16 | ||||
| -rw-r--r-- | aaf/src/test/java/org/onap/aaf/example/X509Test.java (renamed from aaf/src/test/java/com/att/aaf/example/X509Test.java) | 14 |
40 files changed, 427 insertions, 389 deletions
diff --git a/aaf/pom.xml b/aaf/pom.xml index ca4f30a..4545082 100644 --- a/aaf/pom.xml +++ b/aaf/pom.xml @@ -22,7 +22,7 @@ -->
<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">
<parent>
- <groupId>com.att.cadi</groupId>
+ <groupId>org.onap.aaf.cadi</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -34,19 +34,29 @@ <url>https://github.com/att/AAF</url>
<description>CADI</description>
<artifactId>cadi-aaf</artifactId>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <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/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+ </properties>
+
<dependencies>
<dependency>
- <groupId>com.att.authz</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>authz-client</artifactId>
- </dependency>
+ </dependency>
<dependency>
- <groupId>com.att.cadi</groupId>
+ <groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-client</artifactId>
</dependency>
<dependency>
- <groupId>com.att.cadi</groupId>
+ <groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-client</artifactId>
</dependency>
@@ -88,7 +98,7 @@ <classifier>tests</classifier>
<archive>
<manifest>
- <mainClass>com.att.cadi.cm.CmAgent</mainClass>
+ <mainClass>org.onap.aaf.cadi.cm.CmAgent</mainClass>
</manifest>
<manifestEntries>
@@ -182,7 +192,61 @@ </execution>
</executions>
</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>
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>AAF Release Repository</name>
+ <url>${nexusproxy}${releaseNexusPath}</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>AAF Snapshot Repository</name>
+ <url>${nexusproxy}${snapshotNexusPath}</url>
+ </snapshotRepository>
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${nexusproxy}${sitePath}</url>
+ </site>
+ </distributionManagement>
+<pluginRepositories>
+ <pluginRepository>
+ <id>onap-plugin-snapshots</id>
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Maven 2 repository 2</name>
+ <url>http://repo2.maven.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>onap-jar-snapshots</id>
+ <url>https://nexus.onap.org/content/repositories/snapshots</url>
+ </repository>
+ <repository>
+ <id>spring-repo</id>
+ <name>Spring repo</name>
+ <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>
+ </repository>
+ <repository>
+ <id>repository.jboss.org-public</id>
+ <name>JBoss.org Maven repository</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ </repository>
+ </repositories>
</project>
diff --git a/aaf/src/main/java/Examples.java b/aaf/src/main/java/Examples.java deleted file mode 100644 index 7ea379b..0000000 --- a/aaf/src/main/java/Examples.java +++ /dev/null @@ -1,41 +0,0 @@ -/*******************************************************************************
- * ============LICENSE_START====================================================
- * * org.onap.aaf
- * * ===========================================================================
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * ===========================================================================
- * * Licensed under the Apache License, Version 2.0 (the "License");
- * * you may not use this file except in compliance with the License.
- * * You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- * * ============LICENSE_END====================================================
- * *
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * *
- ******************************************************************************/
-import com.att.rosetta.env.RosettaEnv;
-
-public class Examples {
- public static void main(String[] args) {
- if(args.length<1) {
- System.out.println("Usage: Examples <name> [\"optional\" - will show optional fields]");
- } else {
- boolean options = args.length>1&&"optional".equals(args[1]);
- try {
- RosettaEnv env = new RosettaEnv();
- System.out.println(com.att.cadi.aaf.client.Examples.print(env, args[0], options));
- } catch (Exception e) {
- System.out.println(e.getMessage());
- }
- }
- }
-
-
-}
diff --git a/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java index 79dd9ee..7cefc26 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFPermission.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf;
+package org.onap.aaf.cadi.aaf;
-import com.att.cadi.Permission;
+import org.onap.aaf.cadi.Permission;
/**
* A Class that understands the AAF format of Permission (name/type/action)
diff --git a/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java index c7f0e2c..2d1b88f 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/AAFTransmutate.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf;
+package org.onap.aaf.cadi.aaf;
import java.security.Principal;
import java.util.regex.Pattern;
-import com.att.cadi.Transmutate;
-import com.att.cadi.lur.ConfigPrincipal;
-import com.att.cadi.principal.BasicPrincipal;
-import com.att.cadi.principal.CSPPrincipal_T;
+import org.onap.aaf.cadi.Transmutate;
+import org.onap.aaf.cadi.lur.ConfigPrincipal;
+import org.onap.aaf.cadi.principal.BasicPrincipal;
+import org.onap.aaf.cadi.principal.CSPPrincipal_T;
/**
* AAFTransmutate
diff --git a/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java index 7508522..daac0c3 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/ConnectivityTest.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf;
+package org.onap.aaf.cadi.aaf;
import java.io.IOException;
import java.io.PrintStream;
@@ -33,29 +33,30 @@ import java.net.URI; import java.net.UnknownHostException;
import java.util.Date;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.SecuritySetter;
+import org.onap.aaf.cadi.TrustChecker;
+import org.onap.aaf.cadi.Locator.Item;
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.http.HBasicAuthSS;
+import org.onap.aaf.cadi.http.HClient;
+import org.onap.aaf.cadi.http.HX509SS;
+import org.onap.aaf.cadi.locator.DME2Locator;
+import org.onap.aaf.cadi.locator.PropertyLocator;
+
import com.att.aft.dme2.api.DME2Client;
import com.att.aft.dme2.api.DME2Manager;
-import com.att.cadi.CadiException;
-import com.att.cadi.Locator;
-import com.att.cadi.Locator.Item;
-import com.att.cadi.LocatorException;
-import com.att.cadi.Lur;
-import com.att.cadi.PropAccess;
-import com.att.cadi.SecuritySetter;
-import com.att.cadi.TrustChecker;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.aaf.v2_0.AAFConDME2;
-import com.att.cadi.client.Future;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.http.HBasicAuthSS;
-import com.att.cadi.http.HClient;
-import com.att.cadi.http.HX509SS;
-import com.att.cadi.locator.DME2Locator;
-import com.att.cadi.locator.PropertyLocator;
-import com.att.inno.env.APIException;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaEnv;
import aaf.v2_0.Perms;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/PermEval.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java index 448f60a..896d153 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/PermEval.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/PermEval.java @@ -20,9 +20,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf;
+package org.onap.aaf.cadi.aaf;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.inno.env.util.Split;
public class PermEval {
diff --git a/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java index e029765..cf2b3a9 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/cert/AAFListedCertIdentity.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.cert;
+package org.onap.aaf.cadi.aaf.cert;
import java.security.Principal;
@@ -37,18 +37,19 @@ import java.util.TreeMap; import javax.servlet.http.HttpServletRequest;
import javax.xml.datatype.XMLGregorianCalendar;
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.Hash;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.client.Future;
-import com.att.cadi.config.Config;
-import com.att.cadi.principal.X509Principal;
-import com.att.cadi.taf.cert.CertIdentity;
-import com.att.cadi.taf.cert.X509Taf;
-import com.att.inno.env.APIException;
-import com.att.inno.env.util.Chrono;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Hash;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.principal.X509Principal;
+import org.onap.aaf.cadi.taf.cert.CertIdentity;
+import org.onap.aaf.cadi.taf.cert.X509Taf;
+
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.util.Chrono;
+import org.onap.aaf.inno.env.util.Split;
import aaf.v2_0.Certs;
import aaf.v2_0.Certs.Cert;
@@ -127,7 +128,7 @@ public class AAFListedCertIdentity implements CertIdentity { userLookup.add(s);
}
for(String authMech : authMechanisms) {
- Future<Users> fusr = aafcon.client(AAF_VERSION).read("/authz/users/perm/com.att.aaf.trust/"+authMech+"/authenticate", Users.class, aafcon.usersDF);
+ Future<Users> fusr = aafcon.client(AAF_VERSION).read("/authz/users/perm/org.onap.aaf.trust/"+authMech+"/authenticate", Users.class, aafcon.usersDF);
if(fusr.get(5000)) {
List<User> users = fusr.value.getUser();
if(users.isEmpty()) {
diff --git a/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java index 4b619c6..c49113d 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/ErrMessage.java @@ -20,18 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.client;
+package org.onap.aaf.cadi.aaf.client;
import java.io.PrintStream;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.util.Vars;
+
import aaf.v2_0.Error;
-import com.att.cadi.client.Future;
-import com.att.cadi.util.Vars;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data.TYPE;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaEnv;
public class ErrMessage {
private RosettaDF<Error> errDF;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java index d469805..8867862 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/client/Examples.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.client;
+package org.onap.aaf.cadi.aaf.client;
import java.lang.reflect.InvocationTargetException;
@@ -51,12 +51,12 @@ import aaf.v2_0.UserRoles; import aaf.v2_0.Users;
import aaf.v2_0.Users.User;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data;
-import com.att.inno.env.Data.TYPE;
-import com.att.inno.env.util.Chrono;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.inno.env.util.Chrono;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaEnv;
public class Examples {
public static <C> String print(RosettaEnv env, String nameOrContentType, boolean optional) throws APIException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
diff --git a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java index ad75dc5..8871969 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertMarshal.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.marshal;
+package org.onap.aaf.cadi.aaf.marshal;
import javax.xml.datatype.XMLGregorianCalendar;
import aaf.v2_0.Certs.Cert;
-import com.att.rosetta.marshal.FieldDateTime;
-import com.att.rosetta.marshal.FieldHexBinary;
-import com.att.rosetta.marshal.FieldString;
-import com.att.rosetta.marshal.ObjMarshal;
+import org.onap.aaf.rosetta.marshal.FieldDateTime;
+import org.onap.aaf.rosetta.marshal.FieldHexBinary;
+import org.onap.aaf.rosetta.marshal.FieldString;
+import org.onap.aaf.rosetta.marshal.ObjMarshal;
public class CertMarshal extends ObjMarshal<Cert> {
public CertMarshal() {
diff --git a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java index 3a27a9c..70a1c96 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/marshal/CertsMarshal.java @@ -20,15 +20,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.marshal;
+package org.onap.aaf.cadi.aaf.marshal;
import java.util.List;
import aaf.v2_0.Certs;
import aaf.v2_0.Certs.Cert;
-import com.att.rosetta.marshal.ObjArray;
-import com.att.rosetta.marshal.ObjMarshal;
+import org.onap.aaf.rosetta.marshal.ObjArray;
+import org.onap.aaf.rosetta.marshal.ObjMarshal;
public class CertsMarshal extends ObjMarshal<Certs> {
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 index 33005a3..6d6d947 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java @@ -20,23 +20,24 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.io.IOException;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.GetCred;
+import org.onap.aaf.cadi.Hash;
+import org.onap.aaf.cadi.User;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.lur.ConfigPrincipal;
+
import com.att.aft.dme2.api.DME2Exception;
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CadiException;
-import com.att.cadi.GetCred;
-import com.att.cadi.Hash;
-import com.att.cadi.User;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.client.Future;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.config.Config;
-import com.att.cadi.lur.ConfigPrincipal;
-import com.att.inno.env.APIException;
+import org.onap.aaf.inno.env.APIException;
public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
private AAFCon<CLIENT> con;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java index a9d53f3..3ec6fed 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.net.URI;
import java.security.Principal;
@@ -30,30 +30,31 @@ import java.util.concurrent.ConcurrentHashMap; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.CadiException;
-import com.att.cadi.CadiWrap;
-import com.att.cadi.Connector;
-import com.att.cadi.LocatorException;
-import com.att.cadi.Lur;
-import com.att.cadi.PropAccess;
-import com.att.cadi.SecuritySetter;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.marshal.CertsMarshal;
-import com.att.cadi.client.AbsBasicAuth;
-import com.att.cadi.client.Future;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.client.Retryable;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.lur.EpiLur;
-import com.att.cadi.principal.BasicPrincipal;
-import com.att.cadi.util.Vars;
-import com.att.inno.env.APIException;
-import com.att.inno.env.Data.TYPE;
-import com.att.inno.env.util.Split;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.CadiWrap;
+import org.onap.aaf.cadi.Connector;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.SecuritySetter;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.marshal.CertsMarshal;
+import org.onap.aaf.cadi.client.AbsBasicAuth;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.lur.EpiLur;
+import org.onap.aaf.cadi.principal.BasicPrincipal;
+import org.onap.aaf.cadi.util.Vars;
+
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.inno.env.util.Split;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaEnv;
import aaf.v2_0.Certs;
import aaf.v2_0.Error;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java index 6fce97a..2757efc 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConDME2.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.io.IOException;
import java.net.ConnectException;
@@ -30,23 +30,24 @@ import java.security.GeneralSecurityException; import java.security.Principal;
import java.util.Properties;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.SecuritySetter;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.dme2.DME2BasicAuth;
+import org.onap.aaf.cadi.dme2.DME2TransferSS;
+import org.onap.aaf.cadi.dme2.DME2x509SS;
+import org.onap.aaf.cadi.dme2.DRcli;
+import org.onap.aaf.cadi.principal.BasicPrincipal;
+
import com.att.aft.dme2.api.DME2Client;
import com.att.aft.dme2.api.DME2Exception;
import com.att.aft.dme2.api.DME2Manager;
-import com.att.cadi.CadiException;
-import com.att.cadi.LocatorException;
-import com.att.cadi.PropAccess;
-import com.att.cadi.SecuritySetter;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.client.Retryable;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.dme2.DME2BasicAuth;
-import com.att.cadi.dme2.DME2TransferSS;
-import com.att.cadi.dme2.DME2x509SS;
-import com.att.cadi.dme2.DRcli;
-import com.att.cadi.principal.BasicPrincipal;
-import com.att.inno.env.APIException;
+import org.onap.aaf.inno.env.APIException;
public class AAFConDME2 extends AAFCon<DME2Client>{
private DME2Manager manager;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java index e126f08..5a38b0c 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -28,24 +28,25 @@ import java.net.URI; import java.security.GeneralSecurityException;
import java.security.Principal;
-import com.att.cadi.CadiException;
-import com.att.cadi.Locator;
-import com.att.cadi.Locator.Item;
-import com.att.cadi.LocatorException;
-import com.att.cadi.PropAccess;
-import com.att.cadi.SecuritySetter;
-import com.att.cadi.client.AbsTransferSS;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.client.Retryable;
-import com.att.cadi.config.Config;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.http.HBasicAuthSS;
-import com.att.cadi.http.HMangr;
-import com.att.cadi.http.HRcli;
-import com.att.cadi.http.HTransferSS;
-import com.att.cadi.http.HX509SS;
-import com.att.cadi.principal.BasicPrincipal;
-import com.att.inno.env.APIException;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.LocatorException;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.SecuritySetter;
+import org.onap.aaf.cadi.Locator.Item;
+import org.onap.aaf.cadi.client.AbsTransferSS;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.http.HBasicAuthSS;
+import org.onap.aaf.cadi.http.HMangr;
+import org.onap.aaf.cadi.http.HRcli;
+import org.onap.aaf.cadi.http.HTransferSS;
+import org.onap.aaf.cadi.http.HX509SS;
+import org.onap.aaf.cadi.principal.BasicPrincipal;
+
+import org.onap.aaf.inno.env.APIException;
public class AAFConHttp extends AAFCon<HttpURLConnection> {
private final HMangr hman;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java index 7188224..520d7ab 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java @@ -20,28 +20,29 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.net.ConnectException;
import java.net.URISyntaxException;
import java.security.Principal;
import java.util.Map;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.User;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.client.Retryable;
+import org.onap.aaf.cadi.lur.LocalPermission;
+
import com.att.aft.dme2.api.DME2Exception;
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.Access;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.CadiException;
-import com.att.cadi.Permission;
-import com.att.cadi.User;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.client.Future;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.client.Retryable;
-import com.att.cadi.lur.LocalPermission;
-import com.att.inno.env.APIException;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.util.Split;
import aaf.v2_0.Perm;
import aaf.v2_0.Perms;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java index 4e189ce..fb92108 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTaf.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.io.IOException;
import java.security.Principal;
@@ -28,23 +28,23 @@ import java.security.Principal; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachedPrincipal;
-import com.att.cadi.CachedPrincipal.Resp;
-import com.att.cadi.GetCred;
-import com.att.cadi.Hash;
-import com.att.cadi.Taf.LifeForm;
-import com.att.cadi.User;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.client.Future;
-import com.att.cadi.client.Rcli;
-import com.att.cadi.principal.BasicPrincipal;
-import com.att.cadi.principal.CachedBasicPrincipal;
-import com.att.cadi.taf.HttpTaf;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TafResp.RESP;
-import com.att.cadi.taf.basic.BasicHttpTafResp;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.CachedPrincipal;
+import org.onap.aaf.cadi.GetCred;
+import org.onap.aaf.cadi.Hash;
+import org.onap.aaf.cadi.User;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CachedPrincipal.Resp;
+import org.onap.aaf.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.client.Rcli;
+import org.onap.aaf.cadi.principal.BasicPrincipal;
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;
+import org.onap.aaf.cadi.taf.HttpTaf;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TafResp.RESP;
+import org.onap.aaf.cadi.taf.basic.BasicHttpTafResp;
public class AAFTaf<CLIENT> extends AbsUserCache<AAFPermission> implements HttpTaf {
// private static final String INVALID_AUTH_TOKEN = "Invalid Auth Token";
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java index 5ee3199..c7644a5 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java @@ -20,21 +20,22 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import javax.servlet.http.HttpServletRequest ;
-import com.att.cadi.Access;
-import com.att.cadi.Lur;
-import com.att.cadi.TrustChecker;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.config.Config;
-import com.att.cadi.principal.TrustPrincipal;
-import com.att.cadi.taf.TafResp;
-import com.att.cadi.taf.TrustNotTafResp;
-import com.att.cadi.taf.TrustTafResp;
-import com.att.inno.env.Env;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.TrustChecker;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.principal.TrustPrincipal;
+import org.onap.aaf.cadi.taf.TafResp;
+import org.onap.aaf.cadi.taf.TrustNotTafResp;
+import org.onap.aaf.cadi.taf.TrustTafResp;
+
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.util.Split;
public class AAFTrustChecker implements TrustChecker {
private final String tag, id;
diff --git a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java index 297ad8a..5bcf527 100644 --- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLur.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.aaf.v2_0;
+package org.onap.aaf.cadi.aaf.v2_0;
import java.net.URISyntaxException;
import java.security.Principal;
@@ -28,19 +28,20 @@ import java.util.ArrayList; import java.util.Date;
import java.util.List;
+import org.onap.aaf.cadi.AbsUserCache;
+import org.onap.aaf.cadi.CachingLur;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.StrLur;
+import org.onap.aaf.cadi.Transmutate;
+import org.onap.aaf.cadi.User;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.AAFTransmutate;
+import org.onap.aaf.cadi.config.Config;
+
import com.att.aft.dme2.api.DME2Exception;
-import com.att.cadi.AbsUserCache;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CachingLur;
-import com.att.cadi.Permission;
-import com.att.cadi.StrLur;
-import com.att.cadi.Transmutate;
-import com.att.cadi.User;
-import com.att.cadi.config.Config;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.AAFTransmutate;
-import com.att.inno.env.APIException;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.inno.env.APIException;
+import org.onap.aaf.inno.env.util.Split;
public abstract class AbsAAFLur<PERM extends Permission> extends AbsUserCache<PERM> implements StrLur, CachingLur<PERM> {
protected static final byte[] BLANK_PASSWORD = new byte[0];
diff --git a/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java index 512be78..af50682 100644 --- a/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.File;
import java.io.FileOutputStream;
@@ -34,12 +34,13 @@ import java.util.HashMap; import java.util.List;
import java.util.Map;
-import com.att.cadi.CadiException;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
-import com.att.cadi.util.Chmod;
-import com.att.inno.env.Trans;
-import com.att.inno.env.util.Chrono;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.util.Chmod;
+
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.util.Chrono;
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
diff --git a/aaf/src/main/java/com/att/cadi/cm/CertException.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java index ce38c21..bac4a17 100644 --- a/aaf/src/main/java/com/att/cadi/cm/CertException.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
public class CertException extends Exception {
diff --git a/aaf/src/main/java/com/att/cadi/cm/CmAgent.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java index 0240962..15ed5d0 100644 --- a/aaf/src/main/java/com/att/cadi/cm/CmAgent.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.File;
import java.io.FileInputStream;
@@ -36,25 +36,27 @@ import java.util.HashMap; import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
+
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.aaf.client.ErrMessage;
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.http.HBasicAuthSS;
+import org.onap.aaf.cadi.sso.AAFSSO;
+
import java.util.Properties;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Symm;
-import com.att.cadi.aaf.client.ErrMessage;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.client.Future;
-import com.att.cadi.config.Config;
-import com.att.cadi.http.HBasicAuthSS;
-import com.att.cadi.sso.AAFSSO;
-import com.att.inno.env.Data.TYPE;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
-import com.att.inno.env.util.Chrono;
-import com.att.inno.env.util.Split;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.inno.env.Data.TYPE;
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.util.Chrono;
+import org.onap.aaf.inno.env.util.Split;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaEnv;
import certman.v1_0.Artifacts;
import certman.v1_0.Artifacts.Artifact;
diff --git a/aaf/src/main/java/com/att/cadi/cm/Factory.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java index 85b5dfb..1d488de 100644 --- a/aaf/src/main/java/com/att/cadi/cm/Factory.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -60,10 +60,11 @@ import java.util.List; import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
-import com.att.cadi.Symm;
-import com.att.inno.env.Env;
-import com.att.inno.env.TimeTaken;
-import com.att.inno.env.Trans;
+import org.onap.aaf.cadi.Symm;
+
+import org.onap.aaf.inno.env.Env;
+import org.onap.aaf.inno.env.TimeTaken;
+import org.onap.aaf.inno.env.Trans;
public class Factory {
private static final String PRIVATE_KEY_HEADER = "PRIVATE KEY";
diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java index 60434c3..a89b901 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java @@ -20,13 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
-import com.att.cadi.CadiException;
-import com.att.inno.env.Trans;
+import org.onap.aaf.cadi.CadiException;
+
+import org.onap.aaf.inno.env.Trans;
public interface PlaceArtifact {
public boolean place(Trans trans, CertInfo cert, Artifact arti) throws CadiException;
diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java index c9145ec..eaefd58 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java @@ -20,16 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.File;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.util.Chmod;
+
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
-import com.att.cadi.CadiException;
-import com.att.cadi.util.Chmod;
-import com.att.inno.env.Trans;
+import org.onap.aaf.inno.env.Trans;
public class PlaceArtifactInFiles extends ArtifactDir {
@Override
diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java index 61374e9..ddda1db 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.File;
import java.security.KeyStore;
@@ -29,11 +29,12 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate;
import java.util.Collection;
-import com.att.cadi.CadiException;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
-import com.att.cadi.util.Chmod;
-import com.att.inno.env.Trans;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.util.Chmod;
+
+import org.onap.aaf.inno.env.Trans;
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java index 4c2c900..162d745 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java @@ -20,14 +20,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.PrintStream;
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
-import com.att.inno.env.Trans;
+import org.onap.aaf.inno.env.Trans;
public class PlaceArtifactOnStream implements PlaceArtifact {
private PrintStream out;
diff --git a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java index 714b233..d1b3141 100644 --- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java @@ -20,15 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.cm;
+package org.onap.aaf.cadi.cm;
import java.io.File;
-import com.att.cadi.CadiException;
-import com.att.cadi.util.Chmod;
-import com.att.inno.env.Trans;
-import com.att.inno.env.util.Chrono;
-import com.att.inno.env.util.Split;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.util.Chmod;
+
+import org.onap.aaf.inno.env.Trans;
+import org.onap.aaf.inno.env.util.Chrono;
+import org.onap.aaf.inno.env.util.Split;
import certman.v1_0.Artifacts.Artifact;
import certman.v1_0.CertInfo;
diff --git a/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java b/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java index 4f66dd2..ed3254b 100644 --- a/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java +++ b/aaf/src/main/java/org/onap/aaf/cadi/sso/AAFSSO.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.sso;
+package org.onap.aaf.cadi.sso;
import java.io.File;
import java.io.FileInputStream;
@@ -33,14 +33,14 @@ import java.util.ArrayList; import java.util.List;
import java.util.Properties;
-import com.att.cadi.Access.Level;
-import com.att.cadi.CadiException;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
-import com.att.cadi.util.MyConsole;
-import com.att.cadi.util.SubStandardConsole;
-import com.att.cadi.util.TheConsole;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.util.MyConsole;
+import org.onap.aaf.cadi.util.SubStandardConsole;
+import org.onap.aaf.cadi.util.TheConsole;
public class AAFSSO {
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java index d5f92c1..69c9688 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_JMeter.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
import java.io.BufferedReader;
import java.io.File;
@@ -35,16 +35,15 @@ import java.util.Properties; import org.junit.BeforeClass;
import org.junit.Test;
-
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.aaf.v2_0.AAFTaf;
-import com.att.cadi.config.Config;
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.principal.CachedBasicPrincipal;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.aaf.v2_0.AAFTaf;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.principal.CachedBasicPrincipal;
import junit.framework.Assert;
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java index f85a4e2..bd4e162 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
import static org.junit.Assert.assertEquals;
@@ -50,21 +50,20 @@ import javax.servlet.http.Part; import org.junit.BeforeClass;
import org.junit.Test;
-
-import com.att.cadi.CadiException;
-import com.att.cadi.Lur;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.Symm;
-import com.att.cadi.Taf.LifeForm;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.aaf.v2_0.AAFTaf;
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.lur.ConfigPrincipal;
-import com.att.cadi.lur.LocalPermission;
-import com.att.cadi.taf.TafResp;
+import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Lur;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.Taf.LifeForm;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.aaf.v2_0.AAFTaf;
+import org.onap.aaf.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.lur.ConfigPrincipal;
+import org.onap.aaf.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.taf.TafResp;
public class JU_Lur2_0Call {
private static AAFConHttp aaf;
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java index 8dee6cf..d60eedb 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_PermEval.java @@ -20,14 +20,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
import static org.junit.Assert.*;
import org.junit.AfterClass;
import org.junit.Test;
-
-import com.att.cadi.aaf.PermEval;
+import org.onap.aaf.cadi.aaf.PermEval;
public class JU_PermEval {
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java index c4f5f7c..ef9dc36 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/MultiThreadPermHit.java @@ -20,21 +20,21 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
-import com.att.cadi.Access;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.config.Config;
-import com.att.cadi.locator.PropertyLocator;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.locator.PropertyLocator;
public class MultiThreadPermHit {
public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java index 7d83625..2af452d 100644 --- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java +++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/TestAccess.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.cadi.lur.aaf.test;
+package org.onap.aaf.cadi.lur.aaf.test;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
-import com.att.cadi.Access;
-import com.att.cadi.Symm;
-import com.att.cadi.config.Config;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.config.Config;
public class TestAccess implements Access {
private Symm symm;
diff --git a/aaf/src/test/java/com/att/aaf/content/JU_Content.java b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java index 80215c9..6691f84 100644 --- a/aaf/src/test/java/com/att/aaf/content/JU_Content.java +++ b/aaf/src/test/java/org/onap/aaf/content/JU_Content.java @@ -20,7 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.aaf.content;
+package org.onap.aaf.content;
import java.io.StringReader;
@@ -30,9 +30,9 @@ import org.junit.Test; import aaf.v2_0.Error;
-import com.att.rosetta.env.RosettaDF;
-import com.att.rosetta.env.RosettaData;
-import com.att.rosetta.env.RosettaEnv;
+import org.onap.aaf.rosetta.env.RosettaDF;
+import org.onap.aaf.rosetta.env.RosettaData;
+import org.onap.aaf.rosetta.env.RosettaEnv;
public class JU_Content {
diff --git a/aaf/src/test/java/com/att/aaf/example/CadiTest.java b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java index f50d6ac..34ed858 100644 --- a/aaf/src/test/java/com/att/aaf/example/CadiTest.java +++ b/aaf/src/test/java/org/onap/aaf/example/CadiTest.java @@ -20,17 +20,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
import java.net.HttpURLConnection;
import java.net.URI;
-import com.att.cadi.Access;
-import com.att.cadi.PropAccess;
-import com.att.cadi.client.Future;
-import com.att.cadi.config.SecurityInfoC;
-import com.att.cadi.http.HClient;
-import com.att.cadi.http.HX509SS;
+import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.config.SecurityInfoC;
+import org.onap.aaf.cadi.http.HClient;
+import org.onap.aaf.cadi.http.HX509SS;
public class CadiTest {
public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java index 53f8c8e..65972cd 100644 --- a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java +++ b/aaf/src/test/java/org/onap/aaf/example/ExampleAuthCheck.java @@ -20,12 +20,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.locator.DNSLocator;
public class ExampleAuthCheck {
public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java index 5f6179e..f83b15b 100644 --- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java +++ b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0.java @@ -20,19 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFCon;
-import com.att.cadi.aaf.v2_0.AAFConDME2;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
public class ExamplePerm2_0 {
public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java index 5ebbe9f..f6024a5 100644 --- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java +++ b/aaf/src/test/java/org/onap/aaf/example/ExamplePerm2_0_DME2.java @@ -20,19 +20,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
-import com.att.cadi.Permission;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.AAFPermission;
-import com.att.cadi.aaf.v2_0.AAFAuthn;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.Permission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.locator.DNSLocator;
public class ExamplePerm2_0_DME2 {
public static void main(String args[]) {
diff --git a/aaf/src/test/java/com/att/aaf/example/X509Test.java b/aaf/src/test/java/org/onap/aaf/example/X509Test.java index 517393f..ad5d4b2 100644 --- a/aaf/src/test/java/com/att/aaf/example/X509Test.java +++ b/aaf/src/test/java/org/onap/aaf/example/X509Test.java @@ -20,16 +20,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.
* *
******************************************************************************/
-package com.att.aaf.example;
+package org.onap.aaf.example;
import java.security.Principal;
-import com.att.cadi.PropAccess;
-import com.att.cadi.aaf.v2_0.AAFConHttp;
-import com.att.cadi.aaf.v2_0.AAFLurPerm;
-import com.att.cadi.client.Future;
-import com.att.cadi.locator.DNSLocator;
-import com.att.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
+import org.onap.aaf.cadi.client.Future;
+import org.onap.aaf.cadi.locator.DNSLocator;
+import org.onap.aaf.cadi.lur.LocalPermission;
public class X509Test {
public static void main(String args[]) {
|