From e407c61c8834f714175d2dc9761ae1b99ee0a1ea Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
Date: Sat, 10 Nov 2018 18:02:29 -0500
Subject: Controller Blueprints Microservice

Change Application Properties and Docker Blueprint model load Parameters.

Change-Id: I799cbab4388916c8e07e9453d93214e788a16fa2
Issue-ID: CCSDK-660
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
---
 ms/controllerblueprints/distribution/pom.xml                     | 2 +-
 .../distribution/src/main/dc/docker-compose.yaml                 | 2 +-
 ms/controllerblueprints/distribution/src/main/docker/Dockerfile  | 2 +-
 .../distribution/src/main/docker/distribution.xml                | 9 ++-------
 4 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'ms/controllerblueprints/distribution')

diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index d3bff091b..33690024b 100644
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -94,7 +94,7 @@
             <plugin>
                 <!--build the final artifact for docker deployment -->
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <!-- <skipAssembly>${skip.assembly}</skipAssembly>-->
                     <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index 3c1464699..dd2190843 100644
--- a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
      image: mariadb:latest
      container_name: cb-mariadb
      ports:
-       - "3307:3306"
+       - "3306:3306"
      volumes:
        - ~/vm_mysql:/var/lib/mysql
      restart: always
diff --git a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
index a2f453f24..6de589dac 100644
--- a/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
+++ b/ms/controllerblueprints/distribution/src/main/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN (mkdir -p /source /opt/app/onap) && (tar -xzf /source.tar.gz -C /source) \
 && (mv /source/@project.build.finalName@ /source/app) \
 && (cp -rf /source/app/opt/app/onap/lib /opt/app/onap/) \
 && (cp -rf /source/app/etc /) \
-&& (cp -rf /source/app/load /) \
+&& (cp -rf /source/app/model-catalog /) \
 && (rm -rf /source)
 
 ENTRYPOINT /startService.sh
diff --git a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
index f2f3cb0be..c929f98ef 100644
--- a/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
+++ b/ms/controllerblueprints/distribution/src/main/docker/distribution.xml
@@ -48,11 +48,6 @@
             <outputDirectory>./</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../application/src/main/groovy</directory>
-            <outputDirectory>src/main/groovy</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
         <fileSet>
             <directory>${project.basedir}/../application/src/main/resources</directory>
             <outputDirectory>src/main/resources</outputDirectory>
@@ -64,8 +59,8 @@
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../application/load</directory>
-            <outputDirectory>load</outputDirectory>
+            <directory>${project.basedir}/../../../components/model-catalog</directory>
+            <outputDirectory>./model-catalog</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>
-- 
cgit 1.2.3-korg