Merge branch 'SI-65_REF-Tables_HR' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP
diff --git a/gfsBackendService/Dockerfile b/gfsBackendService/Dockerfile
deleted file mode 100644
index a117754..0000000
--- a/gfsBackendService/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM openjdk:8-jre-alpine
-COPY /target/contact-base-data.jar /usr/src/cbd/
-WORKDIR usr/src/cbd
-CMD ["java", "-jar", "-Dspring.config.name=application_localdev", "contact-base-data.jar"]
\ No newline at end of file
diff --git a/gfsBackendService/Dockerfile_DevServer b/gfsBackendService/Dockerfile_DevServer
index 5e57ef4..2282cf7 100644
--- a/gfsBackendService/Dockerfile_DevServer
+++ b/gfsBackendService/Dockerfile_DevServer
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-alpine
-COPY /target/grid-failure-Information.backend.service.jar /usr/src/cbd/
+COPY /target/grid-failure-information.backend.service.jar /usr/src/cbd/
WORKDIR usr/src/cbd
-CMD ["java", "-jar", "-Dspring.profiles.active=devserver", "grid-failure-Information.backend.service.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "-Dspring.profiles.active=devserver", "grid-failure-information.backend.service.jar"]
\ No newline at end of file
diff --git a/gfsBackendService/Dockerfile_DevServerUnsecure b/gfsBackendService/Dockerfile_DevServerUnsecure
index ed1325b..f92d502 100644
--- a/gfsBackendService/Dockerfile_DevServerUnsecure
+++ b/gfsBackendService/Dockerfile_DevServerUnsecure
@@ -1,4 +1,4 @@
FROM openjdk:8-jre-alpine
-COPY /target/contact-base-data.jar /usr/src/cbd/
+COPY /target/grid-failure-information.backend.service.jar /usr/src/cbd/
WORKDIR usr/src/cbd
-CMD ["java", "-jar", "-Dspring.profiles.active=devserver-unsecure", "contact-base-data.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "-Dspring.profiles.active=devserver-unsecure", "grid-failure-information.backend.service.jar"]
\ No newline at end of file
diff --git a/gfsBackendService/pom.xml b/gfsBackendService/pom.xml
index 9616423..34dc5b2 100644
--- a/gfsBackendService/pom.xml
+++ b/gfsBackendService/pom.xml
@@ -9,9 +9,9 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.openk</groupId>
- <artifactId>grid-failure-Information.backend.service</artifactId>
+ <artifactId>grid-failure-information.backend.service</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>grid-failure-Information</name>
+ <name>grid-failure-information</name>
<description>Grid-Failure-Information Project for openKONSEQUENZ</description>
<properties>
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 839950f..eb1406d 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -109,7 +109,7 @@
spring:
profiles: qserver
datasource:
- url: jdbc:postgresql://localhost:5432/gridFailureInfoQa
+ url: jdbc:postgresql://localhost:5432/GridFailureInfoQaServer
username: gfi_service
password: gfi_service
flyway:
diff --git a/gfsBackendService/src/main/resources/logback-spring.xml b/gfsBackendService/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..47f0fb9
--- /dev/null
+++ b/gfsBackendService/src/main/resources/logback-spring.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+ <property name="LOGS" value="./logs"/>
+
+ <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <Pattern>
+ %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%c{60}): %msg%n%throwable
+ </Pattern>
+ </layout>
+ </appender>
+
+ <appender name="RollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${LOGS}/grid-failure-information.log</file>
+ <encoder
+ class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <Pattern>%d %p %c{60} [%t] %m%n</Pattern>
+ </encoder>
+
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${LOGS}/archived/grid-failure-information-%d{yyyy-MM-dd}.gz</fileNamePattern>
+ <MaxHistory>30</MaxHistory>
+ <cleanHistoryOnStart>true</cleanHistoryOnStart>
+ </rollingPolicy>
+ </appender>
+
+ <!-- LOG everything at INFO level -->
+ <root level="info">
+ <appender-ref ref="RollingFile"/>
+ <appender-ref ref="Console"/>
+ </root>
+
+ <!-- LOG "com.baeldungorg.eclipse.openk.contactbasedata*" at INFO level -->
+ <logger name="org.eclipse.openk.gridfailureinformation" level="info" additivity="false">
+ <appender-ref ref="RollingFile"/>
+ <appender-ref ref="Console"/>
+ </logger>
+
+</configuration>
\ No newline at end of file
