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 <sg481n@att.com>

diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml
index c2c892e..8b81eb6 100644 (file)
--- a/authz-batch/pom.xml
+++ b/authz-batch/pom.xml
@@ -9,7 +9,7 @@
        <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>
                
@@ -36,6 +36,9 @@
        <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>
@@ -43,25 +46,25 @@
                <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>
 
 
@@ -143,13 +146,7 @@
 
        <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>

diff --git a/authz-cass/pom.xml b/authz-cass/pom.xml
index 1b25ab0..eb95e2d 100644 (file)
--- a/authz-cass/pom.xml
+++ b/authz-cass/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -76,7 +76,7 @@
                <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
@@ -118,10 +118,7 @@
                                <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

diff --git a/authz-certman/pom.xml b/authz-certman/pom.xml
index b346b0a..f71d256 100644 (file)
--- a/authz-certman/pom.xml
+++ b/authz-certman/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -86,7 +86,7 @@
                <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
@@ -116,14 +116,7 @@
                            \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

diff --git a/authz-client/pom.xml b/authz-client/pom.xml
index 6ef4852..4151ab2 100644 (file)
--- a/authz-client/pom.xml
+++ b/authz-client/pom.xml
@@ -31,7 +31,7 @@
        <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
@@ -104,14 +104,7 @@
                                                <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

diff --git a/authz-cmd/aafcli.sh b/authz-cmd/aafcli.sh
index e60f54f..5d2f89e 100644 (file)
--- 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 1fc710b..197414b 100644 (file)
--- a/authz-cmd/pom.xml
+++ b/authz-cmd/pom.xml
@@ -27,7 +27,7 @@
   <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
@@ -73,7 +73,7 @@
     <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
@@ -123,16 +123,7 @@
                                        </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

diff --git a/authz-core/pom.xml b/authz-core/pom.xml
index b6df811..4dbb8d3 100644 (file)
--- a/authz-core/pom.xml
+++ b/authz-core/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -52,6 +52,7 @@
        </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
@@ -69,22 +70,22 @@
                <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
@@ -105,15 +106,7 @@
                </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

diff --git a/authz-defOrg/pom.xml b/authz-defOrg/pom.xml
index f7b62a8..efe5431 100644 (file)
--- a/authz-defOrg/pom.xml
+++ b/authz-defOrg/pom.xml
@@ -27,7 +27,7 @@
   <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
@@ -55,6 +55,7 @@
     <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
@@ -74,7 +75,7 @@
     <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

diff --git a/authz-fs/pom.xml b/authz-fs/pom.xml
index e454511..b93e30f 100644 (file)
--- a/authz-fs/pom.xml
+++ b/authz-fs/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -53,7 +53,8 @@
        <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
@@ -78,7 +79,7 @@
         <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
@@ -98,17 +99,8 @@
                                        </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

diff --git a/authz-gui/pom.xml b/authz-gui/pom.xml
index 9f1d897..8621af4 100644 (file)
--- a/authz-gui/pom.xml
+++ b/authz-gui/pom.xml
@@ -9,7 +9,7 @@
        <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>
                
@@ -36,6 +36,8 @@
        <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>
        
                
@@ -83,19 +85,19 @@
                <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>
@@ -106,7 +108,7 @@
                <dependency>
                        <groupId>org.onap.aaf.inno</groupId>
                        <artifactId>xgen</artifactId>
-                       <version>${project.version}</version>
+                       <version>${project.innoVersion}</version>
                </dependency>
                
        </dependencies>
@@ -146,13 +148,6 @@
                      </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>

diff --git a/authz-gw/pom.xml b/authz-gw/pom.xml
index 8d62f9e..00043f2 100644 (file)
--- a/authz-gw/pom.xml
+++ b/authz-gw/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -53,7 +53,8 @@
        <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
@@ -85,7 +86,7 @@
                <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
@@ -109,15 +110,7 @@
                                        </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

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index f850e5d..b6b4b2f 100644 (file)
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -53,7 +53,8 @@
        <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
@@ -113,14 +114,14 @@
         <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
@@ -131,12 +132,12 @@
                <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
@@ -224,7 +225,7 @@
           <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
@@ -243,12 +244,12 @@
           <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
@@ -261,7 +262,7 @@
           <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
@@ -272,17 +273,17 @@
           </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
@@ -290,6 +291,24 @@
           </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
@@ -304,7 +323,7 @@
                                                        <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
@@ -350,14 +369,7 @@
                                        </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

diff --git a/authz-service/src/main/config/authAPI.props b/authz-service/src/main/config/authAPI.props
deleted file mode 100644 (file)
index 6bc7869..0000000
--- 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 75507e7..b4fa116 100644 (file)
--- 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\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

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 (file)
index 89e9a4e..0000000
--- 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 fce6824..f79d368 100644 (file)
--- 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'\r
 services:\r
   aaf_container:\r
-    image: attos/aaf\r
+    image: onap/aaf/authz-service\r
     ports:\r
       - "8101:8101"\r
 \r
@@ -33,7 +33,7 @@ services:
     # - ./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

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 (file)
index a4ce518..0000000
--- 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 bc1f0b2..b45bba5 100644 (file)
--- 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 6894ed8..ae670f7 100644 (file)
--- a/authz-service/src/main/resources/docker/Dockerfile
+++ b/authz-service/src/main/resources/docker/Dockerfile
@@ -1,9 +1,9 @@
 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

diff --git a/authz-service/src/main/resources/docker/authAPI.props b/authz-service/src/main/resources/docker/authAPI.props
index f8c1b40..d1acfb0 100644 (file)
--- 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\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

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 5bf127c..e27b594 100644 (file)
--- 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=<osaaf's Application Identity>
 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 7b18f9d..b45bba5 100644 (file)
--- 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 f0dbc8b..d1acfb0 100644 (file)
--- 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\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

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 5bf127c..e27b594 100644 (file)
--- 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=<osaaf's Application Identity>
 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 7b18f9d..8b7b693 100644 (file)
--- 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 f838d17..7da863f 100644 (file)
--- a/authz-test/pom.xml
+++ b/authz-test/pom.xml
@@ -27,7 +27,7 @@
        <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
@@ -55,7 +55,8 @@
        <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
@@ -75,7 +76,7 @@
                <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

diff --git a/pom.xml b/pom.xml
index f3d83c7..d685e11 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,10 +26,17 @@
        <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>
@@ -82,14 +89,7 @@
                                                <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>

diff --git a/version.properties b/version.properties
index 7bdcb45..921ea4f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 \r
 major=1\r
 minor=0\r
-patch=0\r
+patch=1\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r