From 036b2f01da6d51d8b466e48b4cfc8692a224bfe3 Mon Sep 17 00:00:00 2001
From: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Date: Fri, 18 Sep 2020 11:46:25 +0200
Subject: [PATCH] [OOM-CMPv2] Rename module and docker image

Rename: oom-truststore-merger -> oom-certservice-post-processor

Issue-ID: DCAEGEN2-2253
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: Ide128ffcab5fb3c45b646dca95512735efccb2ad
---
 README.md                                              |  2 +-
 certServicePostProcessor/Dockerfile                    | 10 +++++-----
 certServicePostProcessor/README.md                     | 14 +++++++-------
 certServicePostProcessor/pom.xml                       |  6 +++---
 certServicePostProcessor/src/main/resources/log4j2.xml |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 9e29a64a..04c3009d 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ More information about the project and all its functionalities you can find unde
 Project consists of three submodules:
 1. oom-certservice-api
 2. oom-certservice-client
-3. oom-truststore-merger
+3. oom-certservice-post-processor
 
 Detailed information about submodules can be found in ```README.md``` in their directories.
 
diff --git a/certServicePostProcessor/Dockerfile b/certServicePostProcessor/Dockerfile
index 8f0f2481..27fa1830 100644
--- a/certServicePostProcessor/Dockerfile
+++ b/certServicePostProcessor/Dockerfile
@@ -2,15 +2,15 @@ FROM docker.io/openjdk:11-jre-slim
 
 ARG VERSION=${version}
 
-RUN groupadd onap && useradd -g onap truststoreMerger
+RUN groupadd onap && useradd -g onap postProcessor
 
-RUN chown -R truststoreMerger:onap /var/log
+RUN chown -R postProcessor:onap /var/log
 
-USER truststoreMerger:onap
+USER postProcessor:onap
 
-COPY target/oom-truststore-merger-${VERSION}.jar ./opt/onap/oom/truststoremerger/oom-truststore-merger.jar
+COPY target/oom-certservice-post-processor-${VERSION}.jar /opt/onap/oom/cert-service/post-processor/oom-certservice-post-processor.jar
 
 #Run as root allow to manage certificates provided by other containers. It should be change in future
 USER root
 
-ENTRYPOINT ["java","-jar","./opt/onap/oom/truststoremerger/oom-truststore-merger.jar"]
+ENTRYPOINT ["java","-jar","/opt/onap/oom/cert-service/post-processor/oom-certservice-post-processor.jar"]
diff --git a/certServicePostProcessor/README.md b/certServicePostProcessor/README.md
index 5a2c2b47..7078ad8b 100644
--- a/certServicePostProcessor/README.md
+++ b/certServicePostProcessor/README.md
@@ -1,4 +1,4 @@
-# Truststore merger
+# Certificate Post Processor
 
 ### Project building
 ```
@@ -17,7 +17,7 @@ mvn clean install -P docker
 
 ### Nexus container image
 ```
-nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-truststore-merger:latest
+nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest
 ```
 
 ### Running application as standalone docker container
@@ -41,10 +41,10 @@ KEYSTORE_DESTINATION_PATHS env (optional) indicates paths (separated by ":") to
 Execute below command in order to run app as docker container
 ```
 docker run \
-    --name oom-truststore-merger \
+    --name oom-certservice-post-processor \
     --env-file ./config.env \
     --mount type=bind,src=<src_path>,dst=/var/certs \
-onap/org.onap.oom.platform.cert-service.oom-truststore-merger:latest
+onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest
 ```
 Before run replace <src_path> with absolute path where you located truststores to merge (eg. /certs/resources/)
 
@@ -55,18 +55,18 @@ Output from merger (when pointed more than one truststore to merge in TRUSTSTORE
 
 Remove docker container:
 ```
-docker rm oom-truststore-merger
+docker rm oom-certservice-post-processor
 ```
 
 ### Logs locally
 
 path:
 ```
-var/log/onap/oom/truststore-merger/truststore-merger.log
+var/log/onap/oom/cert-service/post-processor/application.log
 ```
 ### Logs in Docker container
 ```
-docker logs oom-merger
+docker logs oom-certservice-post-processor
 ```
 ###Exit codes
 ```
diff --git a/certServicePostProcessor/pom.xml b/certServicePostProcessor/pom.xml
index d150a9b3..e02e59f0 100644
--- a/certServicePostProcessor/pom.xml
+++ b/certServicePostProcessor/pom.xml
@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>oom-truststore-merger</artifactId>
+    <artifactId>oom-certservice-post-processor</artifactId>
     <version>2.0.0-SNAPSHOT</version>
-    <name>oom-truststore-merger</name>
-    <description>Truststore merging application</description>
+    <name>oom-certservice-post-processor</name>
+    <description>An application which conducts certificate post-processing like: merging truststores, copying keystores.</description>
     <packaging>jar</packaging>
 
     <build>
diff --git a/certServicePostProcessor/src/main/resources/log4j2.xml b/certServicePostProcessor/src/main/resources/log4j2.xml
index 697017e3..b7a588bf 100644
--- a/certServicePostProcessor/src/main/resources/log4j2.xml
+++ b/certServicePostProcessor/src/main/resources/log4j2.xml
@@ -8,8 +8,8 @@
                     pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} %style{%pid}{magenta} [%15.15t] %style{%-40.40C{1.}}{cyan} : %m%n%throwable"/>
         </Console>
 
-        <RollingFile fileName="var/log/onap/oom/truststore-merger/truststore-merger.log"
-                     filePattern="logs/truststore-merger-%d{yyyy-MM-dd}-%i.log" name="ROLLING_FILE">
+        <RollingFile fileName="var/log/onap/oom/cert-service/post-processor/application.log"
+                     filePattern="logs/application-%d{yyyy-MM-dd}-%i.log" name="ROLLING_FILE">
             <PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/>
             <Policies>
                 <SizeBasedTriggeringPolicy size="64 MB"/>
-- 
2.16.6