From 6c11793dc8682bc3e1e47309e2ba39e200599fec Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Tue, 3 Apr 2018 15:07:58 -0400
Subject: [PATCH] Fix raw artifact push path

Previously all raw artifacts (sh, yaml, etc) are uploaded to raw repo
under the same location.  This change instead pushes to a path reflecting
an artifact's module.

Issue-ID: DCAEGEN2-206
Change-Id: I28c76583b5a6793b384b4955962d23e564ed4d49
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 heat/pom.xml        | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 mvn-phase-script.sh |   8 +--
 pom.xml             |   5 +-
 3 files changed, 165 insertions(+), 6 deletions(-)
 create mode 100644 heat/pom.xml

diff --git a/heat/pom.xml b/heat/pom.xml
new file mode 100644
index 0000000..e21db72
--- /dev/null
+++ b/heat/pom.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!--
+================================================================================
+Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.dcaegen2.deployments</groupId>
+    <artifactId>deployments</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.onap.dcaegen2.deployments</groupId>
+  <artifactId>heat</artifactId>
+  <name>dcaegen2-deployments-heat</name>
+  <version>1.0.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <sonar.skip>true</sonar.skip>
+  </properties>
+  <build>
+    <finalName>${project.artifactId}-${project.version}</finalName>
+    <plugins>
+      <!-- plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.4.1</version>
+        <configuration>
+          <descriptors>
+            <descriptor>assembly/dep.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin -->
+      <!-- now we configure custom action (calling a script) at various lifecycle phases -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>clean phase script</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>clean</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>generate-sources script</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>generate-sources</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>compile script</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>compile</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>package script</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>package</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>test script</id>
+            <phase>test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>test</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>install script</id>
+            <phase>install</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>install</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>deploy script</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.artifactId}</argument>
+                <argument>deploy</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index b9f99eb..9897d5e 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -86,11 +86,11 @@ deploy)
   k8s-bootstrap-container|tca-cdap-container|cm-container|redis-cluster-container)
     build_and_push_docker
     ;;
-  scripts|cloud_init)
+  scripts|cloud_init|heat)
     # upload all sh file under the root of module 
-    upload_files_of_extension_recursively sh
-    upload_files_of_extension_recursively py
-    upload_files_of_extension_recursively yaml
+    upload_files_of_extension_recursively sh $MVN_PROJECT_MODULEID
+    upload_files_of_extension_recursively py $MVN_PROJECT_MODULEID
+    upload_files_of_extension_recursively yaml $MVN_PROJECT_MODULEID
     ;;
   *)
     echo "====> unknown mvn project module"
diff --git a/pom.xml b/pom.xml
index 2a5f941..ce585ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,13 +36,14 @@ limitations under the License.
   <packaging>pom</packaging>
 
   <modules>
-     <module>bootstrap</module>
+     <module>heat</module>
      <module>scripts</module>
      <module>cloud_init</module>
+     <module>bootstrap</module>
      <module>redis-cluster-container</module>
-     <module>tca-cdap-container</module>
      <module>cm-container</module>
      <module>k8s-bootstrap-container</module>
+     <module>tca-cdap-container</module>
   </modules>
 
   <properties>
-- 
2.16.6