From: sg481n Date: Mon, 18 Sep 2017 20:35:50 +0000 (-0400) Subject: Update AAF project version to release docker image X-Git-Tag: v1.0.1~35 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=refs%2Fchanges%2F23%2F13223%2F2 Update AAF project version to release docker image Removed deploy plugin from all pom's.Updated project version to 1.0.1-SNAPSHOT and modified few aaf property files to release docker image of aaf to nexts onap. Change-Id: Ic048da22d69b8030974b97bb118892d4b9328f21 Issue-id: AAF-60 Signed-off-by: sg481n --- diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml index c2c892e8..8b81eb63 100644 --- a/authz-batch/pom.xml +++ b/authz-batch/pom.xml @@ -9,7 +9,7 @@ com.att.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -36,6 +36,9 @@ false 1 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT @@ -43,25 +46,25 @@ org.onap.aaf.inno env - ${project.version} + ${project.innoVersion} org.onap.aaf.inno rosetta - ${project.version} + ${project.innoVersion} org.onap.aaf.cadi cadi-core - ${project.version} + ${project.cadiVersion} org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} @@ -143,13 +146,7 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - + maven-assembly-plugin diff --git a/authz-cass/pom.xml b/authz-cass/pom.xml index 1b25ab0d..eb95e2d4 100644 --- a/authz-cass/pom.xml +++ b/authz-cass/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -76,7 +76,7 @@ org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} @@ -118,10 +118,7 @@ org.apache.maven.plugins maven-jarsigner-plugin - - org.apache.maven.plugins - maven-deploy-plugin - + org.apache.maven.plugins diff --git a/authz-certman/pom.xml b/authz-certman/pom.xml index b346b0a9..f71d2564 100644 --- a/authz-certman/pom.xml +++ b/authz-certman/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -86,7 +86,7 @@ org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} @@ -116,14 +116,7 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - + org.apache.maven.plugins maven-javadoc-plugin diff --git a/authz-client/pom.xml b/authz-client/pom.xml index 6ef4852f..4151ab24 100644 --- a/authz-client/pom.xml +++ b/authz-client/pom.xml @@ -31,7 +31,7 @@ Authz Client Client and XSD Generated code for Authz org.onap.aaf.authz - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT jar https://github.com/att/AAF @@ -104,14 +104,7 @@ 1.6 - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - false - - + diff --git a/authz-cmd/aafcli.sh b/authz-cmd/aafcli.sh index e60f54ff..5d2f89ea 100644 --- a/authz-cmd/aafcli.sh +++ b/authz-cmd/aafcli.sh @@ -8,6 +8,6 @@ DME2REG=/opt/dme2reg #-DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG \ #com.att.cmd.AAFcli $* -CLASSPATH=/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc:/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/lib/authz-cmd-1.0.0-SNAPSHOT-jar-with-dependencies.jar +CLASSPATH=/opt/app/aaf/authz-service/etc:/opt/app/aaf/authz-service/lib/authz-cmd-1.0.1-SNAPSHOT-jar-with-dependencies.jar #java -cp $CLASSPATH -Dcadi_prop_files=../authz-service/src/main/sample/authAPI.props -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG com.att.cmd.AAFcli $* -java -cp $CLASSPATH -Dcadi_prop_files=/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/authAPI.props -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG org.onap.aaf.cmd.AAFcli $* +java -cp $CLASSPATH -Dcadi_prop_files=/opt/app/aaf/authz-service/etc/authAPI.props -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG org.onap.aaf.cmd.AAFcli $* diff --git a/authz-cmd/pom.xml b/authz-cmd/pom.xml index 1fc710b5..197414b9 100644 --- a/authz-cmd/pom.xml +++ b/authz-cmd/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -73,7 +73,7 @@ org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} @@ -123,16 +123,7 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - + org.apache.maven.plugins maven-javadoc-plugin diff --git a/authz-core/pom.xml b/authz-core/pom.xml index b6df8119..4dbb8d3e 100644 --- a/authz-core/pom.xml +++ b/authz-core/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -52,6 +52,7 @@ 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT java jacoco ${project.build.directory}/surefire-reports @@ -69,22 +70,22 @@ org.onap.aaf.inno env - ${project.version} + ${project.innoVersion} org.onap.aaf.inno log4j - ${project.version} + ${project.innoVersion} org.onap.aaf.inno rosetta - ${project.version} + ${project.innoVersion} org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} javax.servlet @@ -105,15 +106,7 @@ - - - org.apache.maven.plugins - maven-deploy-plugin - 2.6 - - false - - + org.apache.maven.plugins diff --git a/authz-defOrg/pom.xml b/authz-defOrg/pom.xml index f7b62a8d..efe54315 100644 --- a/authz-defOrg/pom.xml +++ b/authz-defOrg/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -55,6 +55,7 @@ false 0 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT java jacoco ${project.build.directory}/surefire-reports @@ -74,7 +75,7 @@ org.onap.aaf.cadi cadi-core - ${project.version} + ${project.cadiVersion} diff --git a/authz-fs/pom.xml b/authz-fs/pom.xml index e4545118..b93e30f4 100644 --- a/authz-fs/pom.xml +++ b/authz-fs/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -53,7 +53,8 @@ true 9 - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT java jacoco ${project.build.directory}/surefire-reports @@ -78,7 +79,7 @@ org.onap.aaf.cadi cadi-core - ${project.version} + ${project.cadiVersion} com.att.aft @@ -98,17 +99,8 @@ 2.3.1 - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - + org.apache.maven.plugins maven-javadoc-plugin diff --git a/authz-gui/pom.xml b/authz-gui/pom.xml index 9f1d897f..8621af4f 100644 --- a/authz-gui/pom.xml +++ b/authz-gui/pom.xml @@ -9,7 +9,7 @@ com.att.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -36,6 +36,8 @@ true 28 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT @@ -83,19 +85,19 @@ org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} org.onap.aaf.cadi cadi-tguard - ${project.version} + ${project.cadiVersion} org.onap.aaf.cadi cadi-client - ${project.version} + ${project.cadiVersion} @@ -106,7 +108,7 @@ org.onap.aaf.inno xgen - ${project.version} + ${project.innoVersion} @@ -146,13 +148,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.apache.maven.plugins diff --git a/authz-gw/pom.xml b/authz-gw/pom.xml index 8d62f9e2..00043f27 100644 --- a/authz-gw/pom.xml +++ b/authz-gw/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -53,7 +53,8 @@ true 30 - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT java jacoco ${project.build.directory}/surefire-reports @@ -85,7 +86,7 @@ org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} @@ -109,15 +110,7 @@ 2.3.1 - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - + org.apache.maven.plugins diff --git a/authz-service/pom.xml b/authz-service/pom.xml index f850e5d5..b6b4b2fa 100644 --- a/authz-service/pom.xml +++ b/authz-service/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -53,7 +53,8 @@ true 1 - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT ${basedir}/target/ nexus3.onap.org opt/app/aaf/${project.artifactId}/${project.version} @@ -113,14 +114,14 @@ org.onap.aaf.inno env - ${project.version} + ${project.innoVersion} org.onap.aaf.cadi cadi-core - ${project.version} + ${project.cadiVersion} @@ -131,12 +132,12 @@ org.onap.aaf.inno rosetta - ${project.version} + ${project.innoVersion} org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} @@ -224,7 +225,7 @@ copy-resources - ${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc + ${project.build.directory}/opt/app/aaf/authz-service/etc ${project.basedir}/src/main/resources/etc @@ -243,12 +244,12 @@ copy-resources - ${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib + ${project.build.directory}/opt/app/aaf/authz-service/lib ${project.basedir}/../authz-cmd/target - **/authz-cmd-1.0.0-SNAPSHOT-jar-with-dependencies.jar + **/*.jar @@ -261,7 +262,7 @@ copy-resources - ${project.build.directory}/opt/app/aaf/authz-service/${project.version} + ${project.build.directory}/opt/app/aaf/authz-service/ ${project.basedir}/../authz-cmd @@ -272,17 +273,17 @@ - + copy-resources-5 validate copy-resources - ${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc + ${project.build.directory}/opt/app/aaf/authz-service/etc/ - ${project.basedir}/../authz-cmd/etc + ${project.basedir}/src/main/config **/** @@ -290,6 +291,24 @@ + + copy-resources-6 + validate + + copy-resources + + + ${project.build.directory}/opt/app/aaf/authz-service/etc/data + + + ${project.basedir}/../opt/app/aaf/data + + **/** + + + + + @@ -304,7 +323,7 @@ copy-dependencies - ${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib + ${project.build.directory}/opt/app/aaf/authz-service/lib false false true @@ -350,14 +369,7 @@ 2.3.1 - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - + org.apache.maven.plugins diff --git a/authz-service/src/main/config/authAPI.props b/authz-service/src/main/config/authAPI.props deleted file mode 100644 index 6bc78699..00000000 --- a/authz-service/src/main/config/authAPI.props +++ /dev/null @@ -1,24 +0,0 @@ -## -## AUTHZ API (authz-service) Properties -## - -hostname=_HOSTNAME_ - -## DISCOVERY (DME2) Parameters on the Command Line -AFT_LATITUDE=_AFT_LATITUDE_ -AFT_LONGITUDE=_AFT_LONGITUDE_ -AFT_ENVIRONMENT=_AFT_ENVIRONMENT_ -DEPLOYED_VERSION=_ARTIFACT_VERSION_ - -## Pull in common/security properties - -cadi_prop_files=_COMMON_DIR_/com.att.aaf.common.props;_COMMON_DIR_/com.att.aaf.props - -##DME2 related parameters - -DMEServiceName=service=com.att.authz.AuthorizationService/version=_MAJOR_VER_._MINOR_VER_._PATCH_VER_/envContext=_ENV_CONTEXT_/routeOffer=_ROUTE_OFFER_ -AFT_DME2_PORT_RANGE=_AUTHZ_SERVICE_PORT_RANGE_ - - -CACHE_HIGH_COUNT=20000 -CACHE_CLEAN_INTERVAL=60000 \ No newline at end of file diff --git a/authz-service/src/main/config/log4j.properties b/authz-service/src/main/config/log4j.properties index 75507e7a..b4fa1166 100644 --- a/authz-service/src/main/config/log4j.properties +++ b/authz-service/src/main/config/log4j.properties @@ -88,3 +88,12 @@ log4j.logger.audit=INFO,AUDIT log4j.logger.trace=TRACE,TRACE +log4j.appender.SVR=org.apache.log4j.RollingFileAppender +log4j.appender.SVR.File=${user.home}/.aaf/authz-cmd.log +log4j.appender.SVR.MaxFileSize=10000KB +log4j.appender.SVR.MaxBackupIndex=1 +log4j.appender.SVR.layout=org.apache.log4j.PatternLayout +log4j.appender.SVR.layout.ConversionPattern=%d %p [%c] %m %n + +# General Apache libraries +log4j.rootLogger=WARN,SVR diff --git a/authz-service/src/main/resources/docker-compose/aafcli.sh b/authz-service/src/main/resources/docker-compose/aafcli.sh deleted file mode 100644 index 89e9a4ea..00000000 --- a/authz-service/src/main/resources/docker-compose/aafcli.sh +++ /dev/null @@ -1,9 +0,0 @@ -DIR=`pwd` -DME2REG=$DIR/../dme2reg -CLASSPATH=etc:target/authz-cmd-2.0.15-jar-with-dependencies.jar - -java -cp $CLASSPATH \ - -Dcadi_prop_files=../authz-service/src/main/sample/authAPI.props \ - -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG \ - com.att.cmd.AAFcli $* - diff --git a/authz-service/src/main/resources/docker-compose/docker-compose.yml b/authz-service/src/main/resources/docker-compose/docker-compose.yml index fce6824d..f79d368f 100644 --- a/authz-service/src/main/resources/docker-compose/docker-compose.yml +++ b/authz-service/src/main/resources/docker-compose/docker-compose.yml @@ -23,7 +23,7 @@ version: '2' services: aaf_container: - image: attos/aaf + image: onap/aaf/authz-service ports: - "8101:8101" @@ -33,7 +33,7 @@ services: # - ./authAPI.props:/opt/app/aaf/authz-service/2.0.15/etc/authAPI.props - ./wait_for_host_port.sh:/tmp/wait_for_host_port.sh - ./data2:/data - - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh + # - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh # - ./com.osaaf.common.props:/opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props # - ./cadi-core-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-1.3.0.jar # - ./cadi-aaf-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-1.3.0.jar diff --git a/authz-service/src/main/resources/docker-compose/runaafcli.sh b/authz-service/src/main/resources/docker-compose/runaafcli.sh deleted file mode 100644 index a4ce5182..00000000 --- a/authz-service/src/main/resources/docker-compose/runaafcli.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -DIR=`pwd` -#DME2REG=$DIR/../dme2reg -DME2REG=/opt/dme2reg -#CLASSPATH=etc:target/authz-cmd-2.0.15-jar-with-dependencies.jar -CLASSPATH=/opt/app/aaf/authz-service/2.0.15/etc:/opt/app/aaf/authz-service/2.0.15/lib/authz-cmd-2.0.15-jar-with-dependencies.jar -#java -cp $CLASSPATH -Dcadi_prop_files=../authz-service/src/main/sample/authAPI.props -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG com.att.cmd.AAFcli $* -java -cp $CLASSPATH -Dcadi_prop_files=/opt/app/aaf/authz-service/2.0.15/etc/authAPI.props -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG com.att.cmd.AAFcli $* diff --git a/authz-service/src/main/resources/docker-compose/startupaaf.sh b/authz-service/src/main/resources/docker-compose/startupaaf.sh index bc1f0b29..b45bba5e 100644 --- a/authz-service/src/main/resources/docker-compose/startupaaf.sh +++ b/authz-service/src/main/resources/docker-compose/startupaaf.sh @@ -1,9 +1,9 @@ # lji: this startup file shadows the existing extry point startup.sh file of the container # because we need to pass in the cassandra cluster location -LIB=/opt/app/aaf/authz-service/2.0.15/lib +LIB=/opt/app/aaf/authz-service/lib -ETC=/opt/app/aaf/authz-service/2.0.15/etc +ETC=/opt/app/aaf/authz-service/etc DME2REG=/opt/dme2reg echo "this is LIB" $LIB @@ -15,7 +15,7 @@ for FILE in `find $LIB -name *.jar`; do CLASSPATH=$CLASSPATH:$FILE done -FILEPATHS="/opt/app/aaf/common/com.osaaf.common.props /opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props" +FILEPATHS="/opt/app/aaf/authz-service/etc/com.osaaf.common.props /opt/app/aaf/authz-service/etc/com.osaaf.common.props" for FILEPATH in $FILEPATHS: do if [ -e ${FILEPATH} ]; then @@ -26,7 +26,9 @@ do done -java -classpath $CLASSPATH -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG com.att.authz.service.AuthAPI +java -classpath $CLASSPATH -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG org.onap.aaf.authz.service.AuthAPI # keet it running so we can check fs while sleep 2; do echo thinking; done + + diff --git a/authz-service/src/main/resources/docker/Dockerfile b/authz-service/src/main/resources/docker/Dockerfile index 6894ed8a..ae670f75 100644 --- a/authz-service/src/main/resources/docker/Dockerfile +++ b/authz-service/src/main/resources/docker/Dockerfile @@ -1,9 +1,9 @@ FROM openjdk:8-jdk ADD opt /opt/ -ADD authz-service-1.0.0-SNAPSHOT.jar /opt/app/aaf/authz-service/1.0.0-SNAPSHOT/lib/authz-service-1.0.0-SNAPSHOT.jar +ADD authz-service-1.0.1-SNAPSHOT.jar /opt/app/aaf/authz-service/lib/authz-service-1.0.1-SNAPSHOT.jar ADD startup.sh /startup.sh RUN chmod 777 /startup.sh -RUN chmod -R 777 /opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc +RUN chmod -R 777 /opt/app/aaf/authz-service/etc ENTRYPOINT ./startup.sh diff --git a/authz-service/src/main/resources/docker/authAPI.props b/authz-service/src/main/resources/docker/authAPI.props index f8c1b400..d1acfb07 100644 --- a/authz-service/src/main/resources/docker/authAPI.props +++ b/authz-service/src/main/resources/docker/authAPI.props @@ -15,94 +15,18 @@ DEPLOYED_VERSION=2.0.SAMPLE DMEServiceName=service=org.onap.aaf.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE #DME2 can limit Port Ranges with the following: -#AFT_DME2_PORT_RANGE=8101-8029,8100 +AFT_DME2_PORT_RANGE=8101-8101,8100 #DME2 picks any unused port in +1024 range #AFT_DME2_PORT=0 AFT_DME2_ALLOW_PORT_CACHING=false -aaf_root_ns=org.openecomp - -# Point to "Common" files, used between all the AAF Services. ... - -# DEVELOPER ONLY SETTING!!!!! DO NOT USE on ANY BOX other than your Developer box, and it -# would be better if you got a Cert for that, and remove this! There is nothing stupider than -# an unsecured Security Service. -cadi_trust_all_x509=true - -# Public (i.e. Verisign) Key stores. -# AFT_DME2_KEYSTORE= -# AFT_DME2_KEYSTORE_PASSWORD= -# AFT_DME2_KEY_PASSWORD= -# cadi_truststore= -# cadi_truststore_password= - -# Standard for this App/Machine -aaf_env=DEV -aaf_data_dir=../data -cadi_loglevel=WARN -aaf_id= -aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr - -aaf_conn_timeout=6000 -aaf_timeout=10000 -aaf_user_expires=600000 -aaf_clean_interval=45000 -aaf_refresh_trigger_count=3 -aaf_high_count=30000 - -# Basic Auth -aaf_default_realm=openecomp.org -#aaf_domain_support=.org -basic_realm=openecomp.org -basic_warn=false -aaf_root_ns=org.openecomp -localhost_deny=false -# Cassandra -# IP:Cass DataCenter:Latitude:Longitude,IP.... -cassandra.clusters=127.0.0.1 -cassandra.clusters.port=9042 -cassandra.clusters.user=authz -cassandra.clusters.password=authz -## Exceptions from Cassandra which require resetting the Cassandra Connections -cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed" - -# Consistency Settings -cassandra.writeConsistency.ns=LOCAL_QUORUM -cassandra.writeConsistency.perm=LOCAL_QUORUM -cassandra.writeConsistency.role=LOCAL_QUORUM -cassandra.writeConsistency.user_role=LOCAL_QUORUM -cassandra.writeConsistency.cred=LOCAL_QUORUM -cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM - -## Supported Plugin Organizational Units -Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg - -## Email Server settings for Def Organization. -#Sender's email ID needs to be mentioned -com.osaaf.mailFromUserId=mailid@bogus.com -com.osaaf.supportEmail=support@bogus.com -com.osaaf.mailHost=smtp.bogus.com - -# Standard AAF DME2 Props -AFT_DME2_REMOVE_PERSISTENT_CACHE_ON_STARTUP=TRUE -AFT_DME2_DISABLE_PERSISTENT_CACHE=TRUE -AFT_DME2_DISABLE_PERSISTENT_CACHE_LOAD=TRUE - -## SSL OPTIONAL ONLY IN DEVELOPMENT PC/Local... WHATEVER YOU DO, don't use this on any box than your local PC -AFT_DME2_SSL_ENABLE=false -# for when you turn on SSL... Only TLSv1.1+ is secure as of 2016 -AFT_DME2_SSL_WANT_CLIENT_AUTH=TRUE -AFT_DME2_SSL_INCLUDE_PROTOCOLS=TLSv1.1,TLSv1.2 -AFT_DME2_SSL_VALIDATE_CERTS=FALSE -AFT_DME2_CLIENT_IGNORE_SSL_CONFIG=false +# Point to "Common" files, used between all the AAF Services. ... -## Extra CA Trusts, for Certifiate Manager to build truststore with external CAs -cm_trust_cas=VerisignG3_CA.cer;VerisignG4_CA.cer;VerisignG5_CA.cer #cadi_prop_files=com.osaaf.common.props;com.osaaf.props -cadi_prop_files=opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/com.osaaf.common.props;opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/com.osaaf.props +cadi_prop_files=opt/app/aaf/authz-service/etc/com.osaaf.common.props:opt/app/aaf/authz-service/etc/com.osaaf.props CACHE_HIGH_COUNT=40000 CACHE_CLEAN_INTERVAL=60000 diff --git a/authz-service/src/main/resources/docker/com.osaaf.common.props b/authz-service/src/main/resources/docker/com.osaaf.common.props index 5bf127ce..e27b594d 100644 --- a/authz-service/src/main/resources/docker/com.osaaf.common.props +++ b/authz-service/src/main/resources/docker/com.osaaf.common.props @@ -17,7 +17,7 @@ cadi_trust_all_x509=true # Standard for this App/Machine aaf_env=DEV -aaf_data_dir=../data +aaf_data_dir=opt/app/aaf/authz-service/etc/data cadi_loglevel=WARN aaf_id= aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr @@ -56,7 +56,7 @@ cassandra.writeConsistency.cred=LOCAL_QUORUM cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM ## Supported Plugin Organizational Units -Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg +Organization.org=org.onap.aaf.osaaf.defOrg.DefaultOrg ## Email Server settings for Def Organization. #Sender's email ID needs to be mentioned diff --git a/authz-service/src/main/resources/docker/startup.sh b/authz-service/src/main/resources/docker/startup.sh index 7b18f9dc..b45bba5e 100644 --- a/authz-service/src/main/resources/docker/startup.sh +++ b/authz-service/src/main/resources/docker/startup.sh @@ -1,7 +1,9 @@ +# lji: this startup file shadows the existing extry point startup.sh file of the container +# because we need to pass in the cassandra cluster location -LIB=/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/lib +LIB=/opt/app/aaf/authz-service/lib -ETC=/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc +ETC=/opt/app/aaf/authz-service/etc DME2REG=/opt/dme2reg echo "this is LIB" $LIB @@ -12,10 +14,21 @@ CLASSPATH=$ETC for FILE in `find $LIB -name *.jar`; do CLASSPATH=$CLASSPATH:$FILE done -java -classpath $CLASSPATH -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG org.onap.aaf.authz.service.AuthAPI +FILEPATHS="/opt/app/aaf/authz-service/etc/com.osaaf.common.props /opt/app/aaf/authz-service/etc/com.osaaf.common.props" +for FILEPATH in $FILEPATHS: +do + if [ -e ${FILEPATH} ]; then + if [ -z `grep "cassandra.clusters=$CASSANDRA_CLUSTER" $FILEPATH` ]; then + echo "cassandra.clusters=$CASSANDRA_CLUSTER" >> $FILEPATH; + fi + fi +done +java -classpath $CLASSPATH -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG org.onap.aaf.authz.service.AuthAPI +# keet it running so we can check fs +while sleep 2; do echo thinking; done diff --git a/authz-service/src/main/resources/etc/authAPI.props b/authz-service/src/main/resources/etc/authAPI.props index f0dbc8be..d1acfb07 100644 --- a/authz-service/src/main/resources/etc/authAPI.props +++ b/authz-service/src/main/resources/etc/authAPI.props @@ -15,42 +15,18 @@ DEPLOYED_VERSION=2.0.SAMPLE DMEServiceName=service=org.onap.aaf.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE #DME2 can limit Port Ranges with the following: -#AFT_DME2_PORT_RANGE=8101-8029,8100 +AFT_DME2_PORT_RANGE=8101-8101,8100 #DME2 picks any unused port in +1024 range #AFT_DME2_PORT=0 AFT_DME2_ALLOW_PORT_CACHING=false -aaf_root_ns=org.openecomp - -# Point to "Common" files, used between all the AAF Services. ... - - -# Cassandra -# IP:Cass DataCenter:Latitude:Longitude,IP.... -cassandra.clusters=127.0.0.1 -cassandra.clusters.port=9042 -cassandra.clusters.user=authz -cassandra.clusters.password=authz -## Exceptions from Cassandra which require resetting the Cassandra Connections -cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed" - -# Consistency Settings -cassandra.writeConsistency.ns=LOCAL_QUORUM -cassandra.writeConsistency.perm=LOCAL_QUORUM -cassandra.writeConsistency.role=LOCAL_QUORUM -cassandra.writeConsistency.user_role=LOCAL_QUORUM -cassandra.writeConsistency.cred=LOCAL_QUORUM -cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM - -## Supported Plugin Organizational Units -Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg - +# Point to "Common" files, used between all the AAF Services. ... #cadi_prop_files=com.osaaf.common.props;com.osaaf.props -cadi_prop_files=opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/com.osaaf.common.props;opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/com.osaaf.props +cadi_prop_files=opt/app/aaf/authz-service/etc/com.osaaf.common.props:opt/app/aaf/authz-service/etc/com.osaaf.props CACHE_HIGH_COUNT=40000 CACHE_CLEAN_INTERVAL=60000 diff --git a/authz-service/src/main/resources/etc/com.osaaf.common.props b/authz-service/src/main/resources/etc/com.osaaf.common.props index 5bf127ce..e27b594d 100644 --- a/authz-service/src/main/resources/etc/com.osaaf.common.props +++ b/authz-service/src/main/resources/etc/com.osaaf.common.props @@ -17,7 +17,7 @@ cadi_trust_all_x509=true # Standard for this App/Machine aaf_env=DEV -aaf_data_dir=../data +aaf_data_dir=opt/app/aaf/authz-service/etc/data cadi_loglevel=WARN aaf_id= aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr @@ -56,7 +56,7 @@ cassandra.writeConsistency.cred=LOCAL_QUORUM cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM ## Supported Plugin Organizational Units -Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg +Organization.org=org.onap.aaf.osaaf.defOrg.DefaultOrg ## Email Server settings for Def Organization. #Sender's email ID needs to be mentioned diff --git a/authz-service/start.sh b/authz-service/start.sh index 7b18f9dc..8b7b693a 100644 --- a/authz-service/start.sh +++ b/authz-service/start.sh @@ -1,8 +1,8 @@ -LIB=/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/lib +LIB=/media/sf_Users/sg481n/AAF-DOC/authz/authz-service/target/opt/app/aaf/authz-service/lib -ETC=/opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc -DME2REG=/opt/dme2reg +ETC=/media/sf_Users/sg481n/AAF-DOC/authz/authz-service/target/opt/app/aaf/authz-service/etc +DME2REG=/media/sf_Users/sg481n/AAF-DOC/authz/authz-service/target/opt/dme2reg echo "this is LIB" $LIB echo "this is ETC" $ETC diff --git a/authz-test/pom.xml b/authz-test/pom.xml index f838d175..7da863fa 100644 --- a/authz-test/pom.xml +++ b/authz-test/pom.xml @@ -27,7 +27,7 @@ org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ../pom.xml @@ -55,7 +55,8 @@ false 0 - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT java jacoco ${project.build.directory}/surefire-reports @@ -75,7 +76,7 @@ org.onap.aaf.cadi cadi-aaf - ${project.version} + ${project.cadiVersion} diff --git a/pom.xml b/pom.xml index f3d83c7d..d685e116 100644 --- a/pom.xml +++ b/pom.xml @@ -26,10 +26,17 @@ 4.0.0 org.onap.aaf.authz parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT aaf-authz pom https://github.com/att/AAF + + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + BSD License @@ -82,14 +89,7 @@ 1.8 - - org.apache.maven.plugins - maven-deploy-plugin - 2.6 - - false - - + org.apache.maven.plugins diff --git a/version.properties b/version.properties index 7bdcb459..921ea4fc 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch}