From 65279626aae2c414f023a85feb9e3fee41e7215c Mon Sep 17 00:00:00 2001
From: Brinda Santh <brindasanth@in.ibm.com>
Date: Fri, 6 Sep 2019 14:37:04 -0400
Subject: Refactor distribution  module to application.

Change-Id: If6451215e1d1c3b1b5963bbe5c6cda1532f01ac5
Issue-ID: CCSDK-1697
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
---
 .../distribution/src/main/docker/Dockerfile        | 18 -------
 .../distribution/src/main/docker/distribution.xml  | 62 ----------------------
 .../distribution/src/main/docker/run.source        | 12 -----
 .../distribution/src/main/docker/startService.sh   | 10 ----
 4 files changed, 102 deletions(-)
 delete mode 100755 ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile
 delete mode 100755 ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml
 delete mode 100755 ms/blueprintsprocessor/distribution/src/main/docker/run.source
 delete mode 100644 ms/blueprintsprocessor/distribution/src/main/docker/startService.sh

(limited to 'ms/blueprintsprocessor/distribution/src/main/docker')

diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile
deleted file mode 100755
index dab0a4c01..000000000
--- a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM omahoco1/alpine-java-python
-
-ENV HTTP_PROXY  ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-
-# add entrypoint
-COPY run.source /etc/run.source
-COPY startService.sh /startService.sh
-RUN chmod 777 /startService.sh && dos2unix /startService.sh
-
-# add application
-COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz
-RUN tar -xzf /source.tar.gz -C /tmp \
- && cp -rf /tmp/@project.build.finalName@/opt / \
- && rm -rf /source.tar.gz \
- && rm -rf /tmp/@project.build.finalName@
-
-ENTRYPOINT /startService.sh
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml b/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml
deleted file mode 100755
index ba799ea7f..000000000
--- a/ms/blueprintsprocessor/distribution/src/main/docker/distribution.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © 2018-2019 Bell Canada.
-  ~ Modifications Copyright © 2019 IBM.
-  ~
-  ~ 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.
-  -->
-
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <!-- create a tar.gz file containing the projects dependencies -->
-    <id>${assembly.id}</id>
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/opt/app/onap/lib</outputDirectory>
-            <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
-            <excludes>
-                <exclude>org.slf4j:slf4j-simple</exclude>
-                <exclude>org.apache.karaf.*</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/../application/src/main/resources</directory>
-            <includes>
-                <include>application.properties</include>
-                <include>logback.xml</include>
-            </includes>
-            <outputDirectory>/opt/app/onap/config</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../../../components/model-catalog</directory>
-            <outputDirectory>/opt/app/onap/model-catalog</outputDirectory>
-            <includes>
-                <include>blueprint-model/service-blueprint/**</include>
-                <include>definition-type/starter-type/**</include>
-                <include>resource-dictionary/starter-dictionary/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/../../../components/scripts/python</directory>
-            <outputDirectory>/opt/app/onap/scripts/jython</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/run.source b/ms/blueprintsprocessor/distribution/src/main/docker/run.source
deleted file mode 100755
index e84dacd6b..000000000
--- a/ms/blueprintsprocessor/distribution/src/main/docker/run.source
+++ /dev/null
@@ -1,12 +0,0 @@
-java -classpath "/etc:${APP_HOME}/lib/*:/lib/*:/src:/schema:/generated-sources:${APP_CONFIG_HOME}:${APP_HOME}" \
--DappName=${APPLICATIONNAME} -DappVersion=${BUNDLEVERSION} \
--DrouteOffer=${ROUTEOFFER} \
--DVERSION_ROUTEOFFER_ENVCONTEXT=${BUNDLEVERSION}/${STICKYSELECTORKEY}/${ENVCONTEXT} \
--DSecurityFilePath=/etc \
--DREST_NAME_NORMALIZER_PATTERN_FILE=/etc/PatternInputs.txt \
--Dms_name=org.onap.ccsdk.cds.blueprintsprocessor \
--Dlogging.config=${APP_CONFIG_HOME}/logback.xml \
--Djava.security.egd=file:/dev/./urandom \
--DAPPNAME=${APP_NAME} -DAPPENV=${APP_ENV} -DAPPVERSION=${APP_VERSION} -DNAMESPACE=${NAMESPACE} \
--Dspring.config.location=${APP_CONFIG_HOME}/ \
-org.onap.ccsdk.cds.blueprintsprocessor.BlueprintProcessorApplication
diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/startService.sh b/ms/blueprintsprocessor/distribution/src/main/docker/startService.sh
deleted file mode 100644
index 14d772e41..000000000
--- a/ms/blueprintsprocessor/distribution/src/main/docker/startService.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-nodeName=BlueprintsProcessor_1.0.0_$(cat /proc/self/cgroup | grep docker | sed s/\\//\\n/g | tail -1)
-
-echo "APP Config HOME : ${APP_CONFIG_HOME}"
-export APP_HOME=/opt/app/onap
-
-keytool -import -noprompt -trustcacerts -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -alias ONAP -import -file $APP_CONFIG_HOME/ONAP_RootCA.cer
-
-source /etc/run.source
-- 
cgit 1.2.3-korg