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>

7 files changed, 96 insertions, 52 deletions

diff --git a/cass/pom.xml b/cass/pom.xml
index 4e07ae8..9af30fa 100644
--- a/cass/pom.xml
+++ b/cass/pom.xml
@@ -22,7 +22,7 @@
 -->

 <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,10 +34,18 @@
 	<url>https://github.com/att/AAF</url>

 	<description>CADI</description>

 	<artifactId>cadi-cass</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.cadi</groupId>

+			<groupId>org.onap.aaf.cadi</groupId>

 			<artifactId>cadi-aaf</artifactId>

 		</dependency>

 		

@@ -96,19 +104,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>

-			<serverId>ossrhdme</serverId>

-			<nexusUrl>https://oss.sonatype.org/</nexusUrl>

-			<autoReleaseAfterClose>true</autoReleaseAfterClose>

-			</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>	

+	</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/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
index e847bd0..30d979a 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticatedUser.java
@@ -20,13 +20,12 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.aaf.cass;

+package org.onap.aaf.cadi.aaf.cass;

 

 import java.security.Principal;

 

 import org.apache.cassandra.auth.AuthenticatedUser;

-

-import com.att.cadi.Access;

+import org.onap.aaf.cadi.Access;

 

 public class AAFAuthenticatedUser extends AuthenticatedUser implements Principal {

 	private boolean anonymous = false, supr=false, local=false;

diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
index 631a3fa..6b8b29d 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthenticator.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.aaf.cass;

+package org.onap.aaf.cadi.aaf.cass;

 

 import java.io.IOException;

 import java.io.UnsupportedEncodingException;

@@ -34,11 +34,10 @@ import org.apache.cassandra.auth.ISaslAwareAuthenticator;
 import org.apache.cassandra.exceptions.AuthenticationException;

 import org.apache.cassandra.exceptions.InvalidRequestException;

 import org.apache.cassandra.exceptions.RequestExecutionException;

-

-import com.att.cadi.Access.Level;

-import com.att.cadi.CredVal.Type;

-import com.att.cadi.Symm;

-import com.att.cadi.config.Config;

+import org.onap.aaf.cadi.Symm;

+import org.onap.aaf.cadi.Access.Level;

+import org.onap.aaf.cadi.CredVal.Type;

+import org.onap.aaf.cadi.config.Config;

 

 public class AAFAuthenticator extends AAFBase implements ISaslAwareAuthenticator  {

 

diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
index 650e570..bea0e86 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFAuthorizer.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.aaf.cass;

+package org.onap.aaf.cadi.aaf.cass;

 

 import java.util.ArrayList;

 import java.util.HashSet;

@@ -33,10 +33,9 @@ import org.apache.cassandra.auth.Permission;
 import org.apache.cassandra.auth.PermissionDetails;

 import org.apache.cassandra.exceptions.RequestExecutionException;

 import org.apache.cassandra.exceptions.RequestValidationException;

-

-import com.att.cadi.Access.Level;

-import com.att.cadi.aaf.v2_0.AbsAAFLur;

-import com.att.cadi.lur.LocalPermission;

+import org.onap.aaf.cadi.Access.Level;

+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;

+import org.onap.aaf.cadi.lur.LocalPermission;

 

 public class AAFAuthorizer extends AAFBase implements IAuthorizer {

 	// Returns every permission on the resource granted to the user.

diff --git a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
index 4d82a6b..e422234 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
+++ b/cass/src/main/java/org/onap/aaf/cadi/aaf/cass/AAFBase.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.aaf.cass;

+package org.onap.aaf.cadi.aaf.cass;

 

 import java.io.File;

 import java.io.FileInputStream;

@@ -34,18 +34,17 @@ import org.apache.cassandra.auth.DataResource;
 import org.apache.cassandra.auth.IAuthenticator;

 import org.apache.cassandra.config.DatabaseDescriptor;

 import org.apache.cassandra.exceptions.ConfigurationException;

-

-import com.att.cadi.Access;

-import com.att.cadi.Access.Level;

-import com.att.cadi.Lur;

-import com.att.cadi.SLF4JAccess;

-import com.att.cadi.aaf.v2_0.AAFAuthn;

-import com.att.cadi.aaf.v2_0.AAFCon;

-import com.att.cadi.aaf.v2_0.AbsAAFLur;

-import com.att.cadi.config.Config;

-import com.att.cadi.lur.EpiLur;

-import com.att.cadi.lur.LocalLur;

-import com.att.cadi.aaf.AAFPermission;

+import org.onap.aaf.cadi.Access;

+import org.onap.aaf.cadi.Lur;

+import org.onap.aaf.cadi.SLF4JAccess;

+import org.onap.aaf.cadi.Access.Level;

+import org.onap.aaf.cadi.aaf.AAFPermission;

+import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;

+import org.onap.aaf.cadi.aaf.v2_0.AAFCon;

+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;

+import org.onap.aaf.cadi.config.Config;

+import org.onap.aaf.cadi.lur.EpiLur;

+import org.onap.aaf.cadi.lur.LocalLur;

 

 public abstract class AAFBase {

 	protected static final Set<IAuthenticator.Option> options;

diff --git a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
index 0eb95be..bedfa25 100644
--- a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
+++ b/cass/src/test/java/org/onap/aaf/cadi/aaf/cass/test/JU_CASS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.cadi.aaf.cass.test;

+package org.onap.aaf.cadi.aaf.cass.test;

 

 import java.util.HashMap;

 import java.util.Map;

@@ -33,9 +33,8 @@ import org.junit.AfterClass;
 import org.junit.Assert;

 import org.junit.BeforeClass;

 import org.junit.Test;

-

-import com.att.cadi.aaf.cass.AAFAuthenticator;

-import com.att.cadi.aaf.cass.AAFAuthorizer;

+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;

+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;

 

 public class JU_CASS {

 

diff --git a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
index 9eca242..f5ee310 100644
--- a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java
+++ b/cass/src/test/java/org/onap/aaf/cass/JU_CASS.java
@@ -20,7 +20,7 @@
  * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

  * *

  ******************************************************************************/

-package com.att.aaf.cass;

+package org.onap.aaf.cass;

 

 import java.util.HashMap;

 import java.util.Map;

@@ -33,9 +33,8 @@ import org.junit.AfterClass;
 import org.junit.Assert;

 import org.junit.BeforeClass;

 import org.junit.Test;

-

-import com.att.cadi.aaf.cass.AAFAuthenticator;

-import com.att.cadi.aaf.cass.AAFAuthorizer;

+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticator;

+import org.onap.aaf.cadi.aaf.cass.AAFAuthorizer;

 

 public class JU_CASS {