From 5fbcb6344672167e7d1dbf28ecbea3b8f55732fb Mon Sep 17 00:00:00 2001
From: wasala <przemyslaw.wasala@nokia.com>
Date: Wed, 18 Apr 2018 15:21:56 +0200
Subject: Implementation for HTTP/HTTPS and endpoints

*Added HTTP/HTTPS in spring configuration
*Fixing issues with license
*Fixing HTTP/HTTPS and logging configuration
*Add Webflux in implementation

Change-Id: I0a7add391cde010d56dbf352de365b1eba90a9cd
Issue-ID: DCAEGEN2-453
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
---
 .../src/main/resources/application.properties      |  13 ++++++
 prh-app-server/src/main/resources/keystore.jks     | Bin 0 -> 2643 bytes
 prh-app-server/src/main/resources/keystore.jks.old | Bin 0 -> 2272 bytes
 .../src/main/resources/logback-spring.xml          |  45 +++++++++++++++++++++
 prh-app-server/src/main/resources/logback.xml      |  45 ---------------------
 .../src/main/resources/scheduled-context.xml       |   2 +-
 6 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100644 prh-app-server/src/main/resources/application.properties
 create mode 100644 prh-app-server/src/main/resources/keystore.jks
 create mode 100644 prh-app-server/src/main/resources/keystore.jks.old
 create mode 100644 prh-app-server/src/main/resources/logback-spring.xml
 delete mode 100644 prh-app-server/src/main/resources/logback.xml

(limited to 'prh-app-server/src/main/resources')

diff --git a/prh-app-server/src/main/resources/application.properties b/prh-app-server/src/main/resources/application.properties
new file mode 100644
index 00000000..53fa9cde
--- /dev/null
+++ b/prh-app-server/src/main/resources/application.properties
@@ -0,0 +1,13 @@
+spring.profiles.active=prod
+server.port=8433
+server.ssl.key-store-type=PKCS12
+server.ssl.key-store-password=nokiapnf
+server.ssl.key-store=classpath:keystore.jks
+server.ssl.key-password=nokiapnf
+server.ssl.key-alias=tomcat-localhost
+logging.level.root=ERROR
+logging.level.org.springframework=ERROR
+logging.level.org.springframework.data=ERROR
+logging.level.org.onap.dcaegen2.services.prh=INFO
+logging.file=logs/log/application.log
+app.filepath=config/prh_endpoints.json
diff --git a/prh-app-server/src/main/resources/keystore.jks b/prh-app-server/src/main/resources/keystore.jks
new file mode 100644
index 00000000..cd27cc01
Binary files /dev/null and b/prh-app-server/src/main/resources/keystore.jks differ
diff --git a/prh-app-server/src/main/resources/keystore.jks.old b/prh-app-server/src/main/resources/keystore.jks.old
new file mode 100644
index 00000000..8a2b4f99
Binary files /dev/null and b/prh-app-server/src/main/resources/keystore.jks.old differ
diff --git a/prh-app-server/src/main/resources/logback-spring.xml b/prh-app-server/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000..af4ab189
--- /dev/null
+++ b/prh-app-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+  <property name="LOG_FILE"
+    value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>
+
+  <springProfile name="dev">
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+    <appender name="ROLLING-FILE"
+      class="ch.qos.logback.core.rolling.RollingFileAppender">
+      <encoder>
+        <pattern>${FILE_LOG_PATTERN}</pattern>
+      </encoder>
+      <file>${LOG_FILE}</file>
+      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.log</fileNamePattern>
+      </rollingPolicy>
+    </appender>
+    <root level="ERROR">
+      <appender-ref ref="CONSOLE"/>
+      <appender-ref ref="ROLLING-FILE"/>
+    </root>
+  </springProfile>
+
+  <springProfile name="prod">
+    <appender name="ROLLING-FILE"
+      class="ch.qos.logback.core.rolling.RollingFileAppender">
+      <encoder>
+        <pattern>${FILE_LOG_PATTERN}</pattern>
+      </encoder>
+      <file>${LOG_FILE}</file>
+      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
+        <timeBasedFileNamingAndTriggeringPolicy
+          class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+          <maxFileSize>10MB</maxFileSize>
+        </timeBasedFileNamingAndTriggeringPolicy>
+      </rollingPolicy>
+    </appender>
+
+    <root level="ERROR">
+      <appender-ref ref="ROLLING-FILE"/>
+    </root>
+  </springProfile>
+</configuration>
\ No newline at end of file
diff --git a/prh-app-server/src/main/resources/logback.xml b/prh-app-server/src/main/resources/logback.xml
deleted file mode 100644
index af4ab189..00000000
--- a/prh-app-server/src/main/resources/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-  <property name="LOG_FILE"
-    value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>
-
-  <springProfile name="dev">
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-    <appender name="ROLLING-FILE"
-      class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <encoder>
-        <pattern>${FILE_LOG_PATTERN}</pattern>
-      </encoder>
-      <file>${LOG_FILE}</file>
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.log</fileNamePattern>
-      </rollingPolicy>
-    </appender>
-    <root level="ERROR">
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="ROLLING-FILE"/>
-    </root>
-  </springProfile>
-
-  <springProfile name="prod">
-    <appender name="ROLLING-FILE"
-      class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <encoder>
-        <pattern>${FILE_LOG_PATTERN}</pattern>
-      </encoder>
-      <file>${LOG_FILE}</file>
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
-        <timeBasedFileNamingAndTriggeringPolicy
-          class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-          <maxFileSize>10MB</maxFileSize>
-        </timeBasedFileNamingAndTriggeringPolicy>
-      </rollingPolicy>
-    </appender>
-
-    <root level="ERROR">
-      <appender-ref ref="ROLLING-FILE"/>
-    </root>
-  </springProfile>
-</configuration>
\ No newline at end of file
diff --git a/prh-app-server/src/main/resources/scheduled-context.xml b/prh-app-server/src/main/resources/scheduled-context.xml
index d1c80caf..91919aa2 100644
--- a/prh-app-server/src/main/resources/scheduled-context.xml
+++ b/prh-app-server/src/main/resources/scheduled-context.xml
@@ -10,7 +10,7 @@
   <context:component-scan
     base-package="org.onap.dcaegen2.services.prh"/>
   <task:scheduled-tasks>
-    <task:scheduled ref="scheduleController" method="startTask"
+    <task:scheduled ref="scheduleController" method="startTasks"
       fixed-rate="1000"/>
   </task:scheduled-tasks>
 </beans>
-- 
cgit 1.2.3-korg