diff --git a/scm-packaging/windows/src/main/fs/conf/config.yml b/scm-packaging/windows/src/main/fs/conf/config.yml index e11f5dbe27..5f4117d02e 100644 --- a/scm-packaging/windows/src/main/fs/conf/config.yml +++ b/scm-packaging/windows/src/main/fs/conf/config.yml @@ -20,12 +20,12 @@ https: redirectHttpToHttps: false # Temp directory used for jetty webserver. The temporary directory for internal operations can be configured as "workDir" in webapp. -tempDir: /var/cache/scm/work +tempDir: work # logging log: ## Destination of logging files - logDir: /var/log/scm + logDir: logs rootLevel: WARN enableFileAppender: true enableConsoleAppender: true @@ -38,7 +38,7 @@ webapp: ## Sets explicit working directory for internal processes, empty means default java temp dir workDir: ## Home directory "scm-home" which is also set for classpath - homeDir: /var/lib/scm + homeDir: cache: dataFile: enabled: true diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginTransformer.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginTransformer.java index c4344a7e0e..788b5e55de 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginTransformer.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginTransformer.java @@ -28,6 +28,7 @@ import org.eclipse.transformer.AppOption; import org.eclipse.transformer.TransformOptions; import org.eclipse.transformer.Transformer; import org.eclipse.transformer.jakarta.JakartaTransform; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -39,18 +40,20 @@ import java.util.Comparator; import java.util.function.Function; import java.util.stream.Stream; +import static org.eclipse.transformer.Transformer.ResultCode.SUCCESS_RC; + public class PluginTransformer { private PluginTransformer() { } public static void transform(Path pluginPath) { - Transformer transformer = new Transformer(createOptions(pluginPath.toString())); + Transformer transformer = new Transformer(LoggerFactory.getLogger(Transformer.class), createOptions(pluginPath.toString())); transformer.inputPath = pluginPath.resolve("classes").toString(); transformer.outputName = pluginPath + "-transformed"; Transformer.ResultCode resultCode = transformer.run(); - if (resultCode.ordinal() == 0) { + if (resultCode == SUCCESS_RC) { try { try (Stream paths = Files.walk(Path.of(transformer.inputPath))) { paths @@ -64,8 +67,7 @@ public class PluginTransformer { } } else { throw new PluginTransformException( - String.format("Failed to transform downloaded plugin: %s", - pluginPath) + String.format("Failed to transform downloaded plugin %s: %s", pluginPath, resultCode) ); } }