diff --git a/core/build.gradle b/core/build.gradle index 7379530..d29a9de 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -22,6 +22,7 @@ jar { dependencies { included group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion + included group: 'uk.org.lidalia', name: 'sysout-over-slf4j', version: '1.0.2' runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion included group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '5.6.1' diff --git a/core/src/main/java/asys/core/Core.java b/core/src/main/java/asys/core/Core.java index 2bf1c8b..4c0c983 100644 --- a/core/src/main/java/asys/core/Core.java +++ b/core/src/main/java/asys/core/Core.java @@ -10,6 +10,7 @@ import org.apache.felix.framework.util.ImmutableMap; import org.osgi.framework.BundleActivator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -39,6 +40,7 @@ public class Core { private void startFelix() { logger.trace("starting Apache Felix (OSGi)"); + SysOutOverSLF4J.sendSystemOutAndErrToSLF4J(); try { felix = new Felix(createFelixConfig()); @@ -73,7 +75,7 @@ public class Core { @PreDestroy public void stop() { - startFelix(); + stopFelix(); } private void stopFelix() { @@ -85,5 +87,7 @@ public class Core { } catch (Exception e) { logger.error("Error shutdown Felix", e); } + + SysOutOverSLF4J.restoreOriginalSystemOutputs(); } }