From a9d2108ed04172d2a54a8a317350946c83b0bbde Mon Sep 17 00:00:00 2001 From: sg481n Date: Sat, 23 Sep 2017 14:26:06 +0000 Subject: [PATCH] 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 --- LICENSE | 44 ++++--- authz-batch/pom.xml | 134 ++++++++++++--------- authz-cass/pom.xml | 33 +---- authz-certman/pom.xml | 34 +----- authz-client/pom.xml | 41 +------ authz-cmd/pom.xml | 33 +---- authz-core/pom.xml | 33 +---- authz-defOrg/pom.xml | 47 +++----- authz-fs/pom.xml | 32 +---- authz-gui/pom.xml | 44 +++++-- authz-gw/pom.xml | 48 +++----- authz-service/pom.xml | 80 ++++-------- authz-test/pom.xml | 32 +---- .../AAF-API-Documentation.rst | 0 docs/index.rst | 8 +- pom.xml | 50 +++----- 16 files changed, 246 insertions(+), 447 deletions(-) rename docs/{ => AAF-API-Documentation}/AAF-API-Documentation.rst (100%) diff --git a/LICENSE b/LICENSE index cd88bf02..b8850837 100644 --- a/LICENSE +++ b/LICENSE @@ -1,23 +1,39 @@ - \ 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 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT + UTF-8 + false + 3.1.200 + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -67,31 +82,6 @@ ${project.cadiVersion} - - - prg.onap.aaf.authz @@ -128,20 +118,7 @@ org.slf4j slf4j-log4j12 - - + @@ -226,22 +203,69 @@ - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -119,10 +119,10 @@ maven-jarsigner-plugin - - + org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -230,33 +230,6 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -120,6 +120,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -131,7 +132,7 @@ - + @@ -231,32 +232,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -104,15 +104,6 @@ src/main/xsd - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - @@ -159,6 +150,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -268,33 +260,6 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -127,6 +127,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -138,7 +139,7 @@ - + @@ -238,33 +239,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - 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 @@ - org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -122,7 +122,7 @@ - + @@ -221,34 +221,7 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -93,6 +93,22 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + + + + attach-javadocs + + jar + + + + org.sonatype.plugins nexus-staging-maven-plugin @@ -174,33 +190,6 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -103,6 +103,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -211,32 +212,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ true 28 + UTF-8 + false + 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT + 3.1.200 + java + jacoco + ${project.build.directory}/surefire-reports + ${project.build.directory}/coverage-reports/jacoco.exec + ${project.build.directory}/coverage-reports/jacoco-it.exec + true + ${project.version} + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -152,6 +168,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -163,7 +180,7 @@ - + @@ -241,14 +258,23 @@ - - - - + - - - - + + + ecomp-releases + AAF Release Repository + ${nexusproxy}${releaseNexusPath} + + + ecomp-snapshots + AAF Snapshot Repository + ${nexusproxy}${snapshotNexusPath} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -111,7 +111,22 @@ 2.3.1 - + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-source-plugin @@ -207,32 +222,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -144,33 +144,7 @@ - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - copy-docker-file - package - - copy-resources - - - ${dockerLocation} - true - - - ${basedir}/src/main/resources/docker - true - - **/* - - - - - - - + com.spotify docker-maven-plugin @@ -201,6 +175,26 @@ maven-resources-plugin 2.7 + + copy-docker-file + package + + copy-resources + + + ${dockerLocation} + true + + + ${basedir}/src/main/resources/docker + true + + **/* + + + + + copy-resources-1 validate @@ -375,6 +369,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -487,32 +482,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + 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 @@ /content/repositories/snapshots/ /content/repositories/releases/ /content/repositories/staging/ - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} @@ -143,6 +143,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -252,32 +253,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + diff --git a/docs/AAF-API-Documentation.rst b/docs/AAF-API-Documentation/AAF-API-Documentation.rst similarity index 100% rename from docs/AAF-API-Documentation.rst rename to 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 @@ pom https://github.com/att/AAF - - org.onap.oparent - oparent - 1.0.0-SNAPSHOT - + + org.onap.oparent + oparent + 0.1.1 + @@ -121,6 +121,11 @@ **/JU_CachingFileAccess.java **/JU_DefaultOrg.java + **/JU_FileServer.java + **/JU_DirectAAFLur.java + **/JU_AuthAPI.java + **/JU_GwAPI.java + @@ -198,9 +203,10 @@ - + org.apache.maven.plugins maven-javadoc-plugin + 2.10.4 false @@ -213,7 +219,8 @@ - + + org.apache.maven.plugins @@ -528,32 +535,5 @@ dav:${nexusproxy}${sitePath} - - - onap-plugin-snapshots - https://nexus.onap.org/content/repositories/snapshots/ - - - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - onap-jar-snapshots - https://nexus.onap.org/content/repositories/snapshots - - - spring-repo - Spring repo - https://artifacts.alfresco.com/nexus/content/repositories/public/ - - - repository.jboss.org-public - JBoss.org Maven repository - https://repository.jboss.org/nexus/content/groups/public - - + -- 2.16.6