From: Dan Timoney <dtimoney@att.com>
Date: Thu, 4 Apr 2019 13:19:10 +0000 (+0000)
Subject: Merge "add aafshiro feature config files"
X-Git-Tag: 1.5.1~51
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b50f3b91a0f24bc9468825c7ffbd0ea8c2630868;hp=-c;p=sdnc%2Foam.git

Merge "add aafshiro feature config files"

Former-commit-id: 8495f9a3c6060699a915c9afc38f503620f911d9
---

b50f3b91a0f24bc9468825c7ffbd0ea8c2630868
diff --combined installation/sdnc/pom.xml
index 4f59aaa9,0a748e3e..d187ddcf
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@@ -17,7 -17,8 +17,8 @@@
      <description>Creates SDN Controller Docker container</description>
  
      <properties>
-         <image.name>onap/sdnc-image</image.name>
+         <image.name>onap/sdnc-aaf-image</image.name>
+         <standalone.image.name>onap/sdnc-image</standalone.image.name>
          <sdnc.project.version>${project.version}</sdnc.project.version>
          <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
          <sdnc.northbound.version>1.5.1-SNAPSHOT</sdnc.northbound.version>
@@@ -84,23 -85,6 +85,6 @@@
                  <artifactId>docker-maven-plugin</artifactId>
                  <version>0.28.0</version>
                  <inherited>false</inherited>
-                 <configuration>
-                     <images>
-                         <image>
-                             <name>${image.name}</name>
-                             <build>
-                                 <cleanup>try</cleanup>
-                                 <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                 <dockerFile>Dockerfile</dockerFile>
-                                 <tags>
-                                     <tag>${project.docker.latestminortag.version}</tag>
-                                     <tag>${project.docker.latestfulltag.version}</tag>
-                                     <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                 </tags>
-                             </build>
-                         </image>
-                     </images>
-                 </configuration>
                  <executions>
                      <execution>
                          <id>generate-images</id>
@@@ -108,21 -92,100 +92,100 @@@
                          <goals>
                              <goal>build</goal>
                          </goals>
+                         <configuration>
+                            <images>
+                             <image>
+                              <name>${image.name}</name>
+                              <build>
+                               <cleanup>try</cleanup>
+                               <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                               <dockerFile>Dockerfile</dockerFile>
+                               <tags>
+                                  <tag>${project.docker.latestminortag.version}</tag>
+                                  <tag>${project.docker.latestfulltag.version}</tag>
+                                  <tag>${project.docker.latesttagtimestamp.version}</tag>
+                               </tags>
+                              </build>
+                             </image>
+                            </images>
+                           </configuration>
                      </execution>
- 
                      <execution>
-                         <id>push-images</id>
-                         <phase>${docker.push.phase}</phase>
-                         <goals>
-                             <goal>build</goal>
-                             <goal>push</goal>
-                         </goals>
-                     </execution>
+                       <id>push-images</id>
+                       <phase>${docker.push.phase}</phase>
+                       <goals>
+                        <goal>build</goal>
+                        <goal>push</goal>
+                       </goals>
+                        <configuration>
+                         <images>
+                          <image>
+                           <name>${image.name}</name>
+                           <build>
+                            <cleanup>try</cleanup>
+                            <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                            <dockerFile>Dockerfile</dockerFile>
+                            <tags>
+                               <tag>${project.docker.latestminortag.version}</tag>
+                               <tag>${project.docker.latestfulltag.version}</tag>
+                               <tag>${project.docker.latesttagtimestamp.version}</tag>
+                            </tags>
+                           </build>
+                          </image>
+                         </images>
+                        </configuration>
+                    </execution>
+                    <execution>
+                      <id>generate-standalone-images</id>
+                      <phase>package</phase>
+                      <goals>
+                       <goal>build</goal>
+                      </goals>
+                      <configuration>
+                       <images>
+                        <image>
+                         <name>${standalone.image.name}</name>
+                         <build>
+                          <cleanup>try</cleanup>
+                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                          <dockerFile>standalone.Dockerfile</dockerFile>
+                          <tags>
+                              <tag>${project.docker.latestminortag.version}</tag>
+                              <tag>${project.docker.latestfulltag.version}</tag>
+                              <tag>${project.docker.latesttagtimestamp.version}</tag>
+                          </tags>
+                         </build>
+                        </image>
+                       </images>
+                      </configuration>
+                    </execution>
+                    <execution>
+                      <id>push-standalone-images</id>
+                      <phase>${docker.push.phase}</phase>
+                      <goals>
+                       <goal>build</goal>
+                       <goal>push</goal>
+                      </goals>
+                      <configuration>
+                        <images>
+                         <image>
+                          <name>${standalone.image.name}</name>
+                          <build>
+                           <cleanup>try</cleanup>
+                           <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                           <dockerFile>standalone.Dockerfile</dockerFile>
+                           <tags>
+                              <tag>${project.docker.latestminortag.version}</tag>
+                              <tag>${project.docker.latestfulltag.version}</tag>
+                              <tag>${project.docker.latesttagtimestamp.version}</tag>
+                           </tags>
+                          </build>
+                         </image>
+                        </images>
+                      </configuration>
+                   </execution>
                  </executions>
              </plugin>
- 
- 
- 
              <plugin>
                  <artifactId>maven-resources-plugin</artifactId>
                  <version>2.6</version>
@@@ -140,6 -203,7 +203,7 @@@
                                      <directory>src/main/docker</directory>
                                      <includes>
                                          <include>Dockerfile</include>
+                                         <include>standalone.Dockerfile</include>
                                      </includes>
                                      <filtering>true</filtering>
                                  </resource>
@@@ -157,8 -221,8 +221,8 @@@
                              <resources>
                                  <resource>
                                      <directory>src/main/scripts</directory>
- 				    <includes>
- 					<include>*.py</include>
+                                     <includes>
+                                         <include>*.py</include>
                                          <include>*.sh</include>
                                      </includes>
                                      <filtering>false</filtering>
@@@ -179,8 -243,8 +243,8 @@@
                                      <directory>src/main/resources</directory>
                                      <includes>
                                          <include>idmlight.db.mv.db</include>
-                                         <include>AAF_RootCA.cer</include>
                                          <include>truststoreONAPall.jks</include>
+                                         <include>aaa-app-config.xml</include>
                                      </includes>
                                      <filtering>false</filtering>
                                  </resource>
@@@ -219,6 -283,8 +283,8 @@@
                                      <directory>../src/main/properties</directory>
                                      <includes>
                                          <include>*.properties</include>
+                                         <include>*.props</include>
+                                         <include>*.csv</include>
                                      </includes>
                                      <filtering>false</filtering>
                                  </resource>
@@@ -238,6 -304,8 +304,8 @@@
                                      <directory>../src/main/stores</directory>
                                      <includes>
                                          <include>*.jks</include>
+                                         <include>*.keyfile</include>
+                                         <include>*.p12</include>
                                      </includes>
                                      <filtering>false</filtering>
                                  </resource>
@@@ -280,24 -348,6 +348,24 @@@
                              </artifactItems>
                          </configuration>
                      </execution>
 +                    <execution>
 +                        <id>unpack migration utility</id>
 +                        <phase>generate-sources</phase>
 +                        <goals>
 +                            <goal>unpack</goal>
 +                        </goals>
 +                        <configuration>
 +                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data-migrator</outputDirectory>
 +                            <artifactItems>
 +                                <artifactItem>
 +                                    <groupId>org.onap.sdnc.oam</groupId>
 +                                    <artifactId>data-migrator</artifactId>
 +                                    <version>1.5.0-SNAPSHOT</version>
 +                                    <type>zip</type>
 +                                </artifactItem>
 +                            </artifactItems>
 +                        </configuration>
 +                    </execution>
                  </executions>
              </plugin>
              <plugin>
@@@ -305,7 -355,6 +373,6 @@@
                  <groupId>org.codehaus.mojo</groupId>
                  <version>1.5.0</version>
                  <executions>
- 
                      <execution>
                          <id>change shell permissions</id>
                          <phase>process-sources</phase>
@@@ -329,7 -378,6 +396,6 @@@
                  </executions>
              </plugin>
          </plugins>
- 
      </build>
      <organization>
          <name>ONAP</name>