From e9714c78a6842435b4f9fda624c4306531741ca7 Mon Sep 17 00:00:00 2001
From: Dominik Guhr <dguhr@redhat.com>
Date: Mon, 11 Jul 2022 08:05:56 +0200
Subject: [PATCH] Fix internal filepath for logging on windows

Alo fixes filepath for concurrenthashmap and one windows-only test referencing now non-existing QuarkusJpaConnectionProviderFactory log output in LoggingDistTest

Closes #12984
---
 quarkus/runtime/src/main/resources/META-INF/keycloak.conf     | 4 ++--
 .../test/java/org/keycloak/it/cli/dist/LoggingDistTest.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/quarkus/runtime/src/main/resources/META-INF/keycloak.conf b/quarkus/runtime/src/main/resources/META-INF/keycloak.conf
index 1cda82b812..8b64759435 100644
--- a/quarkus/runtime/src/main/resources/META-INF/keycloak.conf
+++ b/quarkus/runtime/src/main/resources/META-INF/keycloak.conf
@@ -24,10 +24,10 @@ metrics-enabled=false
 
 #logging defaults
 log-console-output=default
-log-file=${kc.home.dir:default}data/log/keycloak.log
+log-file=${kc.home.dir:default}${file.separator}data${file.separator}log${file.separator}keycloak.log
 
 # Storage defaults
-spi-map-storage-concurrenthashmap-dir=${kc.home.dir:default}data/chm
+spi-map-storage-concurrenthashmap-dir=${kc.home.dir:default}${file.separator}data${file.separator}chm
 spi-map-storage-concurrenthashmap-key-type-single-use-objects=string
 spi-map-storage-concurrenthashmap-key-type-realms=string
 spi-map-storage-concurrenthashmap-key-type-authz-resource-servers=string
\ No newline at end of file
diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java
index d7dbd9e368..93676edc6a 100644
--- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java
+++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java
@@ -135,7 +135,7 @@ public class LoggingDistTest {
     void testWinLogLevelSettingsAppliedWhenJsonEnabled(LaunchResult result) {
         CLIResult cliResult = (CLIResult) result;
         assertFalse(cliResult.getOutput().contains("\"loggerName\":\"io.quarkus\",\"level\":\"INFO\")"));
-        assertTrue(cliResult.getOutput().contains("\"loggerName\":\"org.keycloak.quarkus.runtime.storage.database.jpa.QuarkusJpaConnectionProviderFactory\",\"level\":\"DEBUG\""));
+        assertTrue(cliResult.getOutput().contains("\"loggerName\":\"org.keycloak.services.resources.KeycloakApplication\",\"level\":\"DEBUG\""));
         assertTrue(cliResult.getOutput().contains("\"loggerName\":\"org.infinispan.CONTAINER\",\"level\":\"INFO\""));
     }