Added logs

Improve Dockerfile and build fat jar

Change-Id: I8b4dd1a56350af310c70236d6843ae1c357ad95e
Issue-ID: DCAEGEN2-407
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>

8 files changed, 68 insertions, 55 deletions

diff --git a/Dockerfile b/Dockerfile
index 1c29b2b7..4f1a092c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,13 @@ FROM azul/zulu-openjdk:8u152
 
 MAINTAINER Przemysław Wąsala "przemyslaw.wasala@nokia.com"
 
-COPY target/pnf-registration-handler-1.0.0-SNAPSHOT.jar /opt/app/Prh/
+ADD /prh-app-server/target/prh-app-server.jar /opt/app/Prh/
 WORKDIR /opt/app/Prh
 
 ENV HOME /opt/app/Prh
 ENV JAVA_HOME /usr
 #RUN apt-get update && apt-get install -y curl vim
 
-EXPOSE 8080
+EXPOSE 8100
 
-CMD [ "java", "-jar", "pnf-registration-handler-1.0.0-SNAPSHOT.jar" ]
\ No newline at end of file
+CMD [ "java", "-jar", "prh-app-server.jar" ]
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e334c004..8abf8425 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,22 +399,20 @@
 
       <!-- LOGGING dependencies> -->
       <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
         <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
+        <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>${logback.version}</version>
-        <scope>provided</scope>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>1.7.25</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+        <version>1.7.25</version>
       </dependency>
 
       <!-- TESTING TOOLS DEPENDENCIES -->
diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml
index 8efa0a35..52d784a9 100644
--- a/prh-aai-client/pom.xml
+++ b/prh-aai-client/pom.xml
@@ -49,18 +49,16 @@
 
     <!-- LOGGING DEPENDENCIES-->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
     </dependency>
 
     <!-- TEST DEPENDENCIES-->
diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index a03e27f3..5a62e40e 100644
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -22,6 +22,17 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <finalName>prh-app-server</finalName>
+          <mainClass>org.onap.dcaegen2.services.prh.MainApp</mainClass>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -39,18 +50,16 @@
 
     <!-- LOGGING DEPENDENCIES-->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
     </dependency>
 
     <!--TESTS DEPENDENCIES -->
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
index 91ed6024..cb2d1331 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
@@ -36,24 +36,11 @@ public class DmaapConsumerTask implements DmaapTask {
 
     @Override
     public void execute() {
-        logger.info("Start task DmaapConsumerTask::execute() :: Execution Time - {}", dateTimeFormatter.format(
+        logger.debug("Start task DmaapConsumerTask::execute() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
         //TODO: ADD implementation for executing request to consume topic from dmaap
-        //DmappConsumerRunner dmappConsumerRunner = consumer.play()
-        //if(dmappConsumerRunner != null){
-          //AAIProcess aaiProcess = new AAiPRocess(dmappConsumerRunner)
-        /*
-        try{
-        aaiProcess.Execute()
-        }
-        catch(Exception e(){
-            Log
-            return
-        }
-        DmaapConsumerPost post;
-        */
-        //}
-        logger.info("End task DmaapConsumerTask::execute() :: Execution Time - {}",
+
+        logger.debug("End task DmaapConsumerTask::execute() :: Execution Time - {}",
             dateTimeFormatter.format(LocalDateTime.now()));
     }
 }
\ No newline at end of file
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
index 5ed3c8c0..a3a48b79 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
@@ -48,7 +48,7 @@ public class ScheduledTask {
 
     @Scheduled(fixedDelay = SCHEDULING_DELAY)
     public void scheduledTaskAskingDMaaPOfConsumeEvent() {
-        logger.info("Task scheduledTaskAskingDMaaPOfConsumeEvent() :: Execution Time - {}", dateTimeFormatter.format(
+        logger.debug("Task scheduledTaskAskingDMaaPOfConsumeEvent() :: Execution Time - {}", dateTimeFormatter.format(
             LocalDateTime.now()));
         try {
             dmaapConsumerTask.execute();
diff --git a/prh-app-server/src/main/resources/logback.xml b/prh-app-server/src/main/resources/logback.xml
new file mode 100644
index 00000000..5f5175e0
--- /dev/null
+++ b/prh-app-server/src/main/resources/logback.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <property name="LOG_PATH" value="logs"/>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>${LOG_PATH}/logFile.log</file>
+    <append>true</append>
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.onap.dcaegen2.services.prh" level="TRACE"/>
+  <root level="DEBUG">
+    <appender-ref ref="STDOUT"/>
+    <appender-ref ref="FILE"/>
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml
index e3efc20c..080a6f1b 100644
--- a/prh-dmaap-client/pom.xml
+++ b/prh-dmaap-client/pom.xml
@@ -47,18 +47,16 @@
 
     <!-- LOGGING DEPENDENCIES -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
     </dependency>