<parent>
<groupId>com.att.authz</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<maven.test.failure.ignore>false</maven.test.failure.ignore>
<project.swmVersion>1</project.swmVersion>
+ <project.interfaceVersion>1.0.0-SNAPSHOT</project.interfaceVersion>
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
</properties>
<dependencies>
<dependency>
<groupId>org.onap.aaf.inno</groupId>
<artifactId>env</artifactId>
- <version>${project.version}</version>
+ <version>${project.innoVersion}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.inno</groupId>
<artifactId>rosetta</artifactId>
- <version>${project.version}</version>
+ <version>${project.innoVersion}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-core</artifactId>
- <version>${project.version}</version>
+ <version>${project.cadiVersion}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-aaf</artifactId>
- <version>${project.version}</version>
+ <version>${project.cadiVersion}</version>
</dependency>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
<dependency>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-jarsigner-plugin</artifactId>\r
</plugin>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- </plugin>\r
+ \r
\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<dependency> \r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
<dependency>\r
\r
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->\r
\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <configuration>\r
- <skip>true</skip>\r
- </configuration>\r
- </plugin>\r
- \r
+ \r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-javadoc-plugin</artifactId>\r
<name>Authz Client</name>\r
<description>Client and XSD Generated code for Authz</description>\r
<groupId>org.onap.aaf.authz</groupId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<packaging>jar</packaging>\r
<url>https://github.com/att/AAF</url>\r
<licenses>\r
<target>1.6</target>\r
</configuration>\r
</plugin>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <version>2.5</version>\r
- <configuration>\r
- <skip>false</skip>\r
- </configuration>\r
- </plugin>\r
+ \r
\r
<!--This plugin's configuration is used to store Eclipse m2e settings \r
only. It has no influence on the Maven build itself. -->\r
#-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 $*
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
<dependency>\r
</execution>\r
</executions>\r
</plugin>\r
- \r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <configuration>\r
- <skip>true</skip>\r
- </configuration>\r
- </plugin>\r
- \r
- \r
+ \r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-javadoc-plugin</artifactId>\r
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
</developers>\r
<properties>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
<sonar.language>java</sonar.language>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<dependency>\r
<groupId>org.onap.aaf.inno</groupId>\r
<artifactId>env</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.innoVersion}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.onap.aaf.inno</groupId>\r
<artifactId>log4j</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.innoVersion}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.onap.aaf.inno</groupId>\r
<artifactId>rosetta</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.innoVersion}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
<exclusions>\r
<exclusion> \r
<groupId>javax.servlet</groupId>\r
</plugins>\r
<pluginManagement>\r
<plugins>\r
- \r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <version>2.6</version>\r
- <configuration>\r
- <skip>false</skip>\r
- </configuration>\r
- </plugin>\r
+\r
\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<maven.test.failure.ignore>false</maven.test.failure.ignore>\r
<project.swmVersion>0</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
<sonar.language>java</sonar.language>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-core</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
<dependency>\r
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<properties>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>9</project.swmVersion>\r
- <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
<sonar.language>java</sonar.language>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<dependency> \r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-core</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
<dependency>\r
<groupId>com.att.aft</groupId>\r
</configuration>\r
<version>2.3.1</version>\r
</plugin>\r
-\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <configuration>\r
- <skip>true</skip>\r
- </configuration>\r
- </plugin>\r
- \r
\r
- <plugin>\r
+ <plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-javadoc-plugin</artifactId>\r
<configuration>\r
<parent>
<groupId>com.att.authz</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<project.swmVersion>28</project.swmVersion>
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
</properties>
<dependency>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-aaf</artifactId>
- <version>${project.version}</version>
+ <version>${project.cadiVersion}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-tguard</artifactId>
- <version>${project.version}</version>
+ <version>${project.cadiVersion}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.cadi</groupId>
<artifactId>cadi-client</artifactId>
- <version>${project.version}</version>
+ <version>${project.cadiVersion}</version>
</dependency>
<dependency>
<dependency>
<groupId>org.onap.aaf.inno</groupId>
<artifactId>xgen</artifactId>
- <version>${project.version}</version>
+ <version>${project.innoVersion}</version>
</dependency>
</dependencies>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<properties>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>30</project.swmVersion>\r
- <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
<sonar.language>java</sonar.language>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<dependency> \r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
\r
</configuration>\r
<version>2.3.1</version>\r
</plugin>\r
- \r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <configuration>\r
- <skip>true</skip>\r
- </configuration>\r
- </plugin> \r
- \r
+\r
\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<properties>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>1</project.swmVersion>\r
- <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
<dockerLocation>${basedir}/target/</dockerLocation>\r
<docker.registry>nexus3.onap.org</docker.registry>\r
<distFilesRootDirPath>opt/app/aaf/${project.artifactId}/${project.version}</distFilesRootDirPath>\r
<dependency > \r
<groupId>org.onap.aaf.inno</groupId>\r
<artifactId>env</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.innoVersion}</version>\r
</dependency>\r
\r
\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-core</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
<dependency>\r
<dependency>\r
<groupId>org.onap.aaf.inno</groupId>\r
<artifactId>rosetta</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.innoVersion}</version>\r
</dependency>\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency> \r
</dependencies>\r
\r
<goal>copy-resources</goal>\r
</goals>\r
<configuration>\r
- <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc</outputDirectory>\r
+ <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc</outputDirectory>\r
<resources>\r
<resource>\r
<directory>${project.basedir}/src/main/resources/etc</directory>\r
<goal>copy-resources</goal>\r
</goals>\r
<configuration>\r
- <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib</outputDirectory>\r
+ <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>\r
<resources>\r
<resource>\r
<directory>${project.basedir}/../authz-cmd/target</directory>\r
<includes>\r
- <include>**/authz-cmd-1.0.0-SNAPSHOT-jar-with-dependencies.jar</include>\r
+ <include>**/*.jar</include>\r
</includes>\r
</resource>\r
</resources>\r
<goal>copy-resources</goal>\r
</goals>\r
<configuration>\r
- <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}</outputDirectory>\r
+ <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/</outputDirectory>\r
<resources>\r
<resource>\r
<directory>${project.basedir}/../authz-cmd</directory>\r
</resources>\r
</configuration>\r
</execution>\r
- <execution>\r
+ <execution>\r
<id>copy-resources-5</id>\r
<phase>validate</phase>\r
<goals>\r
<goal>copy-resources</goal>\r
</goals>\r
<configuration>\r
- <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/etc</outputDirectory>\r
+ <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc/</outputDirectory>\r
<resources>\r
<resource>\r
- <directory>${project.basedir}/../authz-cmd/etc</directory>\r
+ <directory>${project.basedir}/src/main/config</directory>\r
<includes>\r
<include>**/**</include>\r
</includes>\r
</resources>\r
</configuration>\r
</execution>\r
+ <execution>\r
+ <id>copy-resources-6</id>\r
+ <phase>validate</phase>\r
+ <goals>\r
+ <goal>copy-resources</goal>\r
+ </goals>\r
+ <configuration>\r
+ <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/etc/data</outputDirectory>\r
+ <resources>\r
+ <resource>\r
+ <directory>${project.basedir}/../opt/app/aaf/data</directory>\r
+ <includes>\r
+ <include>**/**</include>\r
+ </includes>\r
+ </resource>\r
+ </resources>\r
+ </configuration>\r
+ </execution>\r
</executions>\r
</plugin>\r
<plugin>\r
<goal>copy-dependencies</goal>\r
</goals>\r
<configuration>\r
- <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/${project.version}/lib</outputDirectory>\r
+ <outputDirectory>${project.build.directory}/opt/app/aaf/authz-service/lib</outputDirectory>\r
<overWriteReleases>false</overWriteReleases>\r
<overWriteSnapshots>false</overWriteSnapshots>\r
<overWriteIfNewer>true</overWriteIfNewer>\r
</configuration>\r
<version>2.3.1</version>\r
</plugin>\r
-\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <configuration>\r
- <skip>true</skip>\r
- </configuration>\r
- </plugin> \r
+ \r
\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
+++ /dev/null
-##
-## 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
log4j.logger.trace=TRACE,TRACE\r
\r
\r
+log4j.appender.SVR=org.apache.log4j.RollingFileAppender \r
+log4j.appender.SVR.File=${user.home}/.aaf/authz-cmd.log\r
+log4j.appender.SVR.MaxFileSize=10000KB\r
+log4j.appender.SVR.MaxBackupIndex=1\r
+log4j.appender.SVR.layout=org.apache.log4j.PatternLayout \r
+log4j.appender.SVR.layout.ConversionPattern=%d %p [%c] %m %n\r
+\r
+# General Apache libraries\r
+log4j.rootLogger=WARN,SVR\r
+++ /dev/null
-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 $*
-
version: '2'\r
services:\r
aaf_container:\r
- image: attos/aaf\r
+ image: onap/aaf/authz-service\r
ports:\r
- "8101:8101"\r
\r
# - ./authAPI.props:/opt/app/aaf/authz-service/2.0.15/etc/authAPI.props\r
- ./wait_for_host_port.sh:/tmp/wait_for_host_port.sh\r
- ./data2:/data\r
- - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh\r
+ # - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh\r
# - ./com.osaaf.common.props:/opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props\r
# - ./cadi-core-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-1.3.0.jar\r
# - ./cadi-aaf-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-1.3.0.jar\r
+++ /dev/null
-#!/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 $*
# 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
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
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
+
+
FROM openjdk:8-jdk \r
ADD opt /opt/\r
-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\r
+ADD authz-service-1.0.1-SNAPSHOT.jar /opt/app/aaf/authz-service/lib/authz-service-1.0.1-SNAPSHOT.jar\r
ADD startup.sh /startup.sh\r
RUN chmod 777 /startup.sh\r
-RUN chmod -R 777 /opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc\r
+RUN chmod -R 777 /opt/app/aaf/authz-service/etc\r
ENTRYPOINT ./startup.sh\r
\r
\r
DMEServiceName=service=org.onap.aaf.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE\r
\r
#DME2 can limit Port Ranges with the following:\r
-#AFT_DME2_PORT_RANGE=8101-8029,8100\r
+AFT_DME2_PORT_RANGE=8101-8101,8100\r
#DME2 picks any unused port in +1024 range\r
#AFT_DME2_PORT=0\r
AFT_DME2_ALLOW_PORT_CACHING=false\r
-aaf_root_ns=org.openecomp\r
-\r
-# Point to "Common" files, used between all the AAF Services. ... \r
-\r
-# DEVELOPER ONLY SETTING!!!!! DO NOT USE on ANY BOX other than your Developer box, and it\r
-# would be better if you got a Cert for that, and remove this! There is nothing stupider than\r
-# an unsecured Security Service.\r
-cadi_trust_all_x509=true\r
-\r
-# Public (i.e. Verisign) Key stores.\r
-# AFT_DME2_KEYSTORE=\r
-# AFT_DME2_KEYSTORE_PASSWORD=\r
-# AFT_DME2_KEY_PASSWORD=\r
-# cadi_truststore=\r
-# cadi_truststore_password=\r
-\r
-# Standard for this App/Machine\r
-aaf_env=DEV\r
-aaf_data_dir=../data\r
-cadi_loglevel=WARN\r
-aaf_id=<osaaf's Application Identity>\r
-aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr\r
-\r
-aaf_conn_timeout=6000\r
-aaf_timeout=10000\r
-aaf_user_expires=600000\r
-aaf_clean_interval=45000\r
-aaf_refresh_trigger_count=3\r
-aaf_high_count=30000\r
-\r
-# Basic Auth\r
-aaf_default_realm=openecomp.org\r
-#aaf_domain_support=.org\r
-basic_realm=openecomp.org\r
-basic_warn=false\r
-aaf_root_ns=org.openecomp\r
-localhost_deny=false\r
\r
\r
-# Cassandra\r
-# IP:Cass DataCenter:Latitude:Longitude,IP....\r
-cassandra.clusters=127.0.0.1\r
-cassandra.clusters.port=9042\r
-cassandra.clusters.user=authz\r
-cassandra.clusters.password=authz\r
-## Exceptions from Cassandra which require resetting the Cassandra Connections\r
-cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed"\r
-\r
-# Consistency Settings\r
-cassandra.writeConsistency.ns=LOCAL_QUORUM\r
-cassandra.writeConsistency.perm=LOCAL_QUORUM\r
-cassandra.writeConsistency.role=LOCAL_QUORUM\r
-cassandra.writeConsistency.user_role=LOCAL_QUORUM\r
-cassandra.writeConsistency.cred=LOCAL_QUORUM\r
-cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM\r
-\r
-## Supported Plugin Organizational Units\r
-Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg\r
-\r
-## Email Server settings for Def Organization.\r
-#Sender's email ID needs to be mentioned\r
-com.osaaf.mailFromUserId=mailid@bogus.com\r
-com.osaaf.supportEmail=support@bogus.com\r
-com.osaaf.mailHost=smtp.bogus.com\r
-\r
-# Standard AAF DME2 Props\r
-AFT_DME2_REMOVE_PERSISTENT_CACHE_ON_STARTUP=TRUE\r
-AFT_DME2_DISABLE_PERSISTENT_CACHE=TRUE\r
-AFT_DME2_DISABLE_PERSISTENT_CACHE_LOAD=TRUE\r
-\r
-## SSL OPTIONAL ONLY IN DEVELOPMENT PC/Local... WHATEVER YOU DO, don't use this on any box than your local PC\r
-AFT_DME2_SSL_ENABLE=false\r
-# for when you turn on SSL... Only TLSv1.1+ is secure as of 2016\r
-AFT_DME2_SSL_WANT_CLIENT_AUTH=TRUE\r
-AFT_DME2_SSL_INCLUDE_PROTOCOLS=TLSv1.1,TLSv1.2\r
-AFT_DME2_SSL_VALIDATE_CERTS=FALSE\r
-AFT_DME2_CLIENT_IGNORE_SSL_CONFIG=false\r
+# Point to "Common" files, used between all the AAF Services. ... \r
\r
-## Extra CA Trusts, for Certifiate Manager to build truststore with external CAs\r
-cm_trust_cas=VerisignG3_CA.cer;VerisignG4_CA.cer;VerisignG5_CA.cer\r
\r
\r
#cadi_prop_files=com.osaaf.common.props;com.osaaf.props\r
-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\r
+cadi_prop_files=opt/app/aaf/authz-service/etc/com.osaaf.common.props:opt/app/aaf/authz-service/etc/com.osaaf.props\r
CACHE_HIGH_COUNT=40000\r
CACHE_CLEAN_INTERVAL=60000\r
\r
# 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=<osaaf's Application Identity>
aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr
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
+# 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
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
DMEServiceName=service=org.onap.aaf.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE\r
\r
#DME2 can limit Port Ranges with the following:\r
-#AFT_DME2_PORT_RANGE=8101-8029,8100\r
+AFT_DME2_PORT_RANGE=8101-8101,8100\r
#DME2 picks any unused port in +1024 range\r
#AFT_DME2_PORT=0\r
AFT_DME2_ALLOW_PORT_CACHING=false\r
-aaf_root_ns=org.openecomp\r
-\r
-# Point to "Common" files, used between all the AAF Services. ... \r
-\r
-\r
\r
\r
-# Cassandra\r
-# IP:Cass DataCenter:Latitude:Longitude,IP....\r
-cassandra.clusters=127.0.0.1\r
-cassandra.clusters.port=9042\r
-cassandra.clusters.user=authz\r
-cassandra.clusters.password=authz\r
-## Exceptions from Cassandra which require resetting the Cassandra Connections\r
-cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed"\r
-\r
-# Consistency Settings\r
-cassandra.writeConsistency.ns=LOCAL_QUORUM\r
-cassandra.writeConsistency.perm=LOCAL_QUORUM\r
-cassandra.writeConsistency.role=LOCAL_QUORUM\r
-cassandra.writeConsistency.user_role=LOCAL_QUORUM\r
-cassandra.writeConsistency.cred=LOCAL_QUORUM\r
-cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM\r
-\r
-## Supported Plugin Organizational Units\r
-Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg\r
-\r
+# Point to "Common" files, used between all the AAF Services. ... \r
\r
\r
\r
#cadi_prop_files=com.osaaf.common.props;com.osaaf.props\r
-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\r
+cadi_prop_files=opt/app/aaf/authz-service/etc/com.osaaf.common.props:opt/app/aaf/authz-service/etc/com.osaaf.props\r
CACHE_HIGH_COUNT=40000\r
CACHE_CLEAN_INTERVAL=60000\r
\r
# 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=<osaaf's Application Identity>
aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr
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
-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
<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<properties>\r
<maven.test.failure.ignore>false</maven.test.failure.ignore>\r
<project.swmVersion>0</project.swmVersion>\r
- <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
<sonar.language>java</sonar.language>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<dependency>\r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-aaf</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
\r
<dependency>\r
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>aaf-authz</name>
<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>
+
<licenses>
<license>
<name>BSD License</name>
<target>1.8</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
\r
major=1\r
minor=0\r
-patch=0\r
+patch=1\r
\r
base_version=${major}.${minor}.${patch}\r
\r