Update License & modify properties in aaf/authz

Updated license file & sitepath modified and O-parent latest added to
parent pom of aaf/authz,Javadocs plugin version added & duplicate staging plugin
removed.

Issue-id: AAF-59
Change-Id: I13a843d1b1868a12b0f0387ff2ba99e516c7601f
Signed-off-by: sg481n <sg481n@att.com>

16 files changed, 246 insertions, 447 deletions

diff --git a/LICENSE b/LICENSE
index cd88bf02..b8850837 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,23 +1,39 @@
-<!--
- ============LICENSE_START====================================================
-* org.onap.aaf
-* ===========================================================================
+/*
+* ============LICENSE_START==========================================
+* ===================================================================
 * 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.
+* ===================================================================
+*
+* Unless otherwise specified, all software contained herein is licensed
+* under the Apache License, Version 2.0 (the "License");
+* you may not use this software 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.
+*
+*
+*
+* Unless otherwise specified, all documentation contained herein is licensed
+* under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+* you may not use this documentation 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
+*
+*             https://creativecommons.org/licenses/by/4.0/
+*
+* Unless required by applicable law or agreed to in writing, documentation
 * 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====================================================
+*
+* ============LICENSE_END============================================
 *
 * ECOMP is a trademark and service mark of AT&T Intellectual Property.
 *
-
--->
\ No newline at end of file
+*/
\ No newline at end of file
diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml
index 8b81eb63..af456a33 100644
--- a/authz-batch/pom.xml
+++ b/authz-batch/pom.xml
@@ -39,6 +39,21 @@
 		<project.interfaceVersion>1.0.0-SNAPSHOT</project.interfaceVersion>
 		<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
 		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<skipTests>false</skipTests>
+		<project.dme2Version>3.1.200</project.dme2Version>
+		<sonar.language>java</sonar.language>
+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+		<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/authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	
 	<dependencies>
@@ -67,31 +82,6 @@
 			<version>${project.cadiVersion}</version>
 	    </dependency>
 
-
-
-		<!--  <dependency>
-			<groupId>com.att.authz</groupId>
-			<artifactId>authz-att</artifactId>
-			<exclusions>
-				<exclusion> 
- 					<groupId>javax.servlet</groupId>
-        			<artifactId>servlet-api</artifactId>
-        		</exclusion>
-        		<exclusion>
-        			<groupId>org.onap.aaf.cadi</groupId>
-        			<artifactId>cadi-aaf</artifactId>
-        		</exclusion>
-        		<exclusion>
-			        <groupId>org.onap.aaf.cadi</groupId>
-			        <artifactId>cadi-core</artifactId>
-			    </exclusion>
-			    <exclusion>
-		        	<groupId>org.onap.aaf.cadi</groupId>
-		        	<artifactId>cadi-client</artifactId>
-		        </exclusion>
-		    </exclusions>
-        		
-		</dependency>   -->
 		
 		<dependency>
 			<groupId>prg.onap.aaf.authz</groupId>
@@ -128,20 +118,7 @@
 	    		<groupId>org.slf4j</groupId>
 	    		<artifactId>slf4j-log4j12</artifactId>
 	  	</dependency>
-	  	
-	  	<!-- Data Migration 
-	  	         <dependency>
-	    <groupId>com.oracle</groupId>
-	    <artifactId>ojdbc6</artifactId>
-	    <version>11.2.0</version>
-	  </dependency>
-	  
-	  <dependency>
-	    <groupId>com.opencsv</groupId>
-	    <artifactId>opencsv</artifactId>
-	    <version>3.3</version>
-	  </dependency>
-	  	-->
+
 	</dependencies>
 
 	<build>
@@ -226,22 +203,69 @@
 		      </executions>
 		    </plugin>
 	
-
-	<plugin>
-	    <groupId>org.apache.maven.plugins</groupId>
-	    <artifactId>maven-gpg-plugin</artifactId>
-	    <version>1.5</version>
-	    <executions>
-		<execution>
-		    <id>sign-artifacts</id>
-		    <phase>verify</phase>
-		    <goals>
-			<goal>sign</goal>
-		    </goals>
-		</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>		
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.7.201606060606</version>
+				<configuration>
+					<dumpOnExit>true</dumpOnExit>
+					<includes>
+						<include>org.onap.aaf.*</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<id>pre-unit-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+						<id>pre-integration-test</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+							<!-- <append>true</append> -->
+						</configuration>
+					</execution>
+					<execution>
+                        <goals>
+                            <goal>merge</goal>
+                        </goals>
+                        <phase>post-integration-test</phase>
+                        <configuration>
+                            <fileSets>
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                    <directory>${project.build.directory}/coverage-reports</directory>
+                                    <includes>
+                                        <include>*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+                        </configuration>
+                    </execution>
+				</executions>
+			</plugin>
+				
 		
 			</plugins>
 	</build>
diff --git a/authz-cass/pom.xml b/authz-cass/pom.xml
index eb95e2d4..7c99385e 100644
--- a/authz-cass/pom.xml
+++ b/authz-cass/pom.xml
@@ -64,7 +64,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 	<dependencies>

 		<dependency>

@@ -119,10 +119,10 @@
 				<artifactId>maven-jarsigner-plugin</artifactId>

 			</plugin>

 			

-		

-		<plugin>

+			<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -230,33 +230,6 @@
 			<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/authz-certman/pom.xml b/authz-certman/pom.xml
index f71d2564..1473a1c8 100644
--- a/authz-certman/pom.xml
+++ b/authz-certman/pom.xml
@@ -66,7 +66,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 		

 	<dependencies>

@@ -120,6 +120,7 @@
 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -131,7 +132,7 @@
 					</goals>

 				</execution>

 			</executions>

-		</plugin> 

+		</plugin>  

 	   

 	   

 	       <plugin>

@@ -231,32 +232,5 @@
 			<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/authz-client/pom.xml b/authz-client/pom.xml
index 492d7716..6e822e00 100644
--- a/authz-client/pom.xml
+++ b/authz-client/pom.xml
@@ -73,7 +73,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 	

 	<dependencies>

@@ -104,15 +104,6 @@
 						<schemaDirectory>src/main/xsd</schemaDirectory>

 					</configuration>

 				</plugin>

-				<plugin>

-					<groupId>org.apache.maven.plugins</groupId>

-					<artifactId>maven-compiler-plugin</artifactId>

-					<configuration>

-						<source>1.6</source>

-						<target>1.6</target>

-					</configuration>

-				</plugin>

-				

 

 				<!--This plugin's configuration is used to store Eclipse m2e settings 

 					only. It has no influence on the Maven build itself. -->

@@ -159,6 +150,7 @@
 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -268,33 +260,6 @@
 			<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/authz-cmd/pom.xml b/authz-cmd/pom.xml
index 197414b9..23066374 100644
--- a/authz-cmd/pom.xml
+++ b/authz-cmd/pom.xml
@@ -66,7 +66,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

   </properties>

   

   <dependencies>

@@ -127,6 +127,7 @@
 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -138,7 +139,7 @@
 					</goals>

 				</execution>

 			</executions>

-		</plugin> 

+		</plugin>  

 	   

 	   

 	       <plugin>

@@ -238,33 +239,5 @@
 			<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/authz-core/pom.xml b/authz-core/pom.xml
index 4dbb8d3e..36c72e64 100644
--- a/authz-core/pom.xml
+++ b/authz-core/pom.xml
@@ -107,10 +107,10 @@
 		<pluginManagement>

 			<plugins>

 

-				

 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -122,7 +122,7 @@
 					</goals>

 				</execution>

 			</executions>

-		</plugin> 

+		</plugin>  

 	   

 	   

 	       <plugin>

@@ -221,34 +221,7 @@
 			<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/authz-defOrg/pom.xml b/authz-defOrg/pom.xml
index efe54315..86bd4b25 100644
--- a/authz-defOrg/pom.xml
+++ b/authz-defOrg/pom.xml
@@ -67,7 +67,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 </properties>

 

   

@@ -93,6 +93,22 @@
 	<build>

 		<pluginManagement>

 		<plugins>

+		<plugin>

+			<groupId>org.apache.maven.plugins</groupId>

+			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

+			<configuration>

+			<failOnError>false</failOnError>

+			</configuration>

+			<executions>

+				<execution>

+					<id>attach-javadocs</id>

+					<goals>

+						<goal>jar</goal>

+					</goals>

+				</execution>

+			</executions>

+		</plugin> 

 		 <plugin>

 				<groupId>org.sonatype.plugins</groupId>

 				<artifactId>nexus-staging-maven-plugin</artifactId>

@@ -174,33 +190,6 @@
 			<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/authz-fs/pom.xml b/authz-fs/pom.xml
index b93e30f4..14d0997b 100644
--- a/authz-fs/pom.xml
+++ b/authz-fs/pom.xml
@@ -66,7 +66,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 	

 		

@@ -103,6 +103,7 @@
 			<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -211,32 +212,5 @@
 			<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/authz-gui/pom.xml b/authz-gui/pom.xml
index 8621af4f..0aee3c60 100644
--- a/authz-gui/pom.xml
+++ b/authz-gui/pom.xml
@@ -36,8 +36,24 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<project.swmVersion>28</project.swmVersion>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<skipTests>false</skipTests>
+		<project.interfaceVersion>1.0.0-SNAPSHOT</project.interfaceVersion>
 		<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
 		<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
+		<project.dme2Version>3.1.200</project.dme2Version>
+		<sonar.language>java</sonar.language>
+		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+		<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+		<sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+		<sonar.projectVersion>${project.version}</sonar.projectVersion>
+		<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/authz/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 	
 		
@@ -152,6 +168,7 @@
 		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>2.10.4</version>
 			<configuration>
 			<failOnError>false</failOnError>
 			</configuration>
@@ -163,7 +180,7 @@
 					</goals>
 				</execution>
 			</executions>
-		</plugin> 
+		</plugin>  
 	   
 	   
 	       <plugin>
@@ -241,14 +258,23 @@
                         </configuration>
                     </execution>
 				</executions>
-			</plugin>
-			
-	
-		
+			</plugin>					
 		</plugins>
-		<pluginManagement>
-			<plugins/>
-		</pluginManagement>
 	</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>
 </project>
diff --git a/authz-gw/pom.xml b/authz-gw/pom.xml
index 00043f27..64f9ab5e 100644
--- a/authz-gw/pom.xml
+++ b/authz-gw/pom.xml
@@ -66,7 +66,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 		

 	<dependencies>

@@ -111,7 +111,22 @@
 					<version>2.3.1</version>

 				</plugin>

 

-	   

+	   <plugin>

+			<groupId>org.apache.maven.plugins</groupId>

+			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

+			<configuration>

+			<failOnError>false</failOnError>

+			</configuration>

+			<executions>

+				<execution>

+					<id>attach-javadocs</id>

+					<goals>

+						<goal>jar</goal>

+					</goals>

+				</execution>

+			</executions>

+		</plugin> 

 	       <plugin>

 		      <groupId>org.apache.maven.plugins</groupId>

 		      <artifactId>maven-source-plugin</artifactId>

@@ -207,32 +222,5 @@
 			<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/authz-service/pom.xml b/authz-service/pom.xml
index d589b815..34760557 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -69,7 +69,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 	</properties>

 	

 		

@@ -144,33 +144,7 @@
    <profile>	

 	<build>

 	    <plugins>

-		<plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-resources-plugin</artifactId>

-                <version>2.7</version>

-                <executions>

-                    <execution>

-                        <id>copy-docker-file</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>copy-resources</goal>

-                        </goals>

-                        <configuration>

-                            <outputDirectory>${dockerLocation}</outputDirectory>

-                            <overwrite>true</overwrite>

-                            <resources>

-                                <resource>

-                                    <directory>${basedir}/src/main/resources/docker</directory>

-                                    <filtering>true</filtering>

-                                    <includes>

-                                        <include>**/*</include>

-                                    </includes>

-                                </resource>

-                            </resources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

+		

 			<plugin>

                 <groupId>com.spotify</groupId>

                 <artifactId>docker-maven-plugin</artifactId>

@@ -201,6 +175,26 @@
     <artifactId>maven-resources-plugin</artifactId>

     <version>2.7</version>

     <executions>

+	 <execution>

+                        <id>copy-docker-file</id>

+                        <phase>package</phase>

+                        <goals>

+                            <goal>copy-resources</goal>

+                        </goals>

+                        <configuration>

+                            <outputDirectory>${dockerLocation}</outputDirectory>

+                            <overwrite>true</overwrite>

+                            <resources>

+                                <resource>

+                                    <directory>${basedir}/src/main/resources/docker</directory>

+                                    <filtering>true</filtering>

+                                    <includes>

+                                        <include>**/*</include>

+                                    </includes>

+                                </resource>

+                            </resources>

+                        </configuration>

+                    </execution>

       <execution>

         <id>copy-resources-1</id>

         <phase>validate</phase>

@@ -375,6 +369,7 @@
 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -487,32 +482,5 @@
 			<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/authz-test/pom.xml b/authz-test/pom.xml
index 7da863fa..17cb314f 100644
--- a/authz-test/pom.xml
+++ b/authz-test/pom.xml
@@ -68,7 +68,7 @@
 		<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>

+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>

 

 	</properties>

 	

@@ -143,6 +143,7 @@
 		<plugin>

 			<groupId>org.apache.maven.plugins</groupId>

 			<artifactId>maven-javadoc-plugin</artifactId>

+			<version>2.10.4</version>

 			<configuration>

 			<failOnError>false</failOnError>

 			</configuration>

@@ -252,32 +253,5 @@
 			<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/docs/AAF-API-Documentation.rst b/docs/AAF-API-Documentation/AAF-API-Documentation.rst
index 05d516ec..05d516ec 100644
--- a/docs/AAF-API-Documentation.rst
+++ b/docs/AAF-API-Documentation/AAF-API-Documentation.rst
diff --git a/docs/index.rst b/docs/index.rst
index 6f90b146..03195bd6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -2,7 +2,7 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 
-AAF - Application Authorization FrameworK
+AAF - Application Authorization Framework
 ==================================================
 .. The purpose of AAF (Application Authorization Framework) is to organize software authorizations so that applications, tools and services can match the access needed to perform job functions.  
 
@@ -15,14 +15,16 @@ To be effective during a computer transaction, Security must not only be secure,
 
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
+   
+   AAF-API-Documentation/AAF-API-Documentation
 
    
 Introduction
 ------------
 AAF contains some elements of Role Based Authorization, but includes Attribute Based Authorization elements as well. 
 
-.. image:: aaf-om.jpeg
+.. image:: aaf-object-model.jpeg
    :height: 600 px
    :width: 800 px
    :scale: 100 %
diff --git a/pom.xml b/pom.xml
index 6089e173..33d432e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,11 @@
 	<packaging>pom</packaging>
 	<url>https://github.com/att/AAF</url>
 	
-	<parent>
-		<groupId>org.onap.oparent</groupId>
-		<artifactId>oparent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
+	<parent>             
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>0.1.1</version>
+    </parent>
 	
 	<licenses>
 		<license>
@@ -121,6 +121,11 @@
 					  <exclude>**/JU_CachingFileAccess.java</exclude>
 					  <!-- <exclude>**/AbsServiceTest.java</exclude> -->
 					  <exclude>**/JU_DefaultOrg.java</exclude>
+					  <exclude>**/JU_FileServer.java</exclude>
+					  <exclude>**/JU_DirectAAFLur.java</exclude>
+					  <exclude>**/JU_AuthAPI.java</exclude>
+					  <exclude>**/JU_GwAPI.java</exclude>
+					  
 					  <!-- <exclude>**/JU_Perm_2_0*.java</exclude> -->
 					  <!-- <exclude>**/JU_Role_2_0*.java</exclude>				   -->
 					</excludes>
@@ -198,9 +203,10 @@
 					</configuration>
 				</plugin>
 				
-							<plugin>
+		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>2.10.4</version>
 			<configuration>
 			<failOnError>false</failOnError>
 			</configuration>
@@ -213,7 +219,8 @@
 				</execution>
 			</executions>
 		</plugin> 
-	   
+
+
 	   
 	       <plugin>
 		      <groupId>org.apache.maven.plugins</groupId>
@@ -528,32 +535,5 @@
 			<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>