Remove apache logger due to it requiring slf4j 1.7

vitruv-tools · Jun 20, 2024 · e2bde32 · e2bde32
1 parent 02ecb91
commit e2bde32
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/bundles/tools.vitruv.testutils/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.junit.jupiter.api.extension,
  org.junit.jupiter.params.converter,
  org.junit.platform.commons.support
-Require-Bundle: org.apache.log4j,
- org.slf4j.api,
+Require-Bundle: slf4j.api,
  ch.qos.logback.classic,
  ch.qos.logback.core,
  org.hamcrest.core,

diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend b/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend
@@ -3,18 +3,14 @@ package tools.vitruv.testutils
 import ch.qos.logback.classic.Level
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder
 import edu.kit.ipd.sdq.activextendannotations.Lazy
-import org.apache.log4j.ConsoleAppender
-import org.apache.log4j.PatternLayout
 import org.junit.jupiter.api.^extension.BeforeAllCallback
 import org.junit.jupiter.api.^extension.ExtensionContext
 import org.slf4j.LoggerFactory
 
-import static org.apache.log4j.Level.*
-import static org.apache.log4j.Logger.getRootLogger
 import static org.slf4j.Logger.ROOT_LOGGER_NAME
 
-import static extension org.apache.log4j.Logger.getLogger
 import java.util.List
+import org.slf4j.Logger
 
 /** 
  * Initializes console logger for tests. Sets the logger level to {@code WARN} by default. If the VM property
@@ -28,18 +24,20 @@ class TestLogging implements BeforeAllCallback {
 	public static val VM_ARGUMENT_LOG_LEVEL = "vitruv.logLevel"
 	static val LOG_PATTERN = "%d{HH:mm:ss.SSS} [%35.35c{1}] %5p: %m%n"
 	static val VITRUV_LOG_ROOTS = List.of("tools.vitruv", "mir.reactions", "mir.routines")
+
+	static val Logger rootLogger = LoggerFactory.getLogger(TestLogging)
 
 	override beforeAll(ExtensionContext context) throws Exception {
 		configureLog4J()
 		configureSlf4J()
 	}
 
 	def private static configureLog4J() {
-		rootLogger.removeAllAppenders()
-		rootLogger.addAppender(new ConsoleAppender(new PatternLayout(LOG_PATTERN)))
-		rootLogger.level = ERROR
-		VITRUV_LOG_ROOTS.forEach [logger.level = toLevel(desiredLogLevel, WARN)]
-		TestProjectManager.logger.level = INFO
+//		rootLogger.atLevel()
+//		rootLogger.addAppender(new ConsoleAppender(new PatternLayout(LOG_PATTERN)))
+//		rootLogger.level = ERROR
+//		VITRUV_LOG_ROOTS.forEach [logger.level = toLevel(desiredLogLevel, WARN)]
+//		TestProjectManager.logger.level = INFO
 	}
 
 	def private static configureSlf4J() {

diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProjectManager.xtend b/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProjectManager.xtend
@@ -5,7 +5,6 @@ import java.nio.file.DirectoryNotEmptyException
 import java.nio.file.FileAlreadyExistsException
 import java.nio.file.Path
 import java.nio.file.SimpleFileVisitor
-import org.apache.log4j.Logger
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
 import org.junit.jupiter.api.^extension.ExtensionContext
 import org.junit.jupiter.api.^extension.ParameterContext
@@ -28,6 +27,7 @@ import java.nio.file.NoSuchFileException
 import java.util.stream.Stream
 import org.eclipse.core.runtime.Platform
 import static extension tools.vitruv.change.propagation.ProjectMarker.markAsProjectRootFolder
+import org.slf4j.LoggerFactory
 
 /**
  * Extension managing the test projects for Eclipse tests. Test classes using this extension can have test project 
@@ -45,7 +45,7 @@ class TestProjectManager implements ParameterResolver, AfterEachCallback {
 	 * Set this system property to overwrite the workspace path 
 	 */
 	public static val WORKSPACE_PATH_SYSTEM_PROPERTY = "vitruv.workspace"
-	static val log = Logger.getLogger(TestProjectManager)
+	static val log = LoggerFactory.getLogger(TestProjectManager)
 	static val namespace = ExtensionContext.Namespace.create(TestProjectManager)
 	static val observedFailure = "observedFailure"
 	static val projectNamespace = ExtensionContext.Namespace.create(TestProjectManager, "projects")

diff --git a/features/tools.vitruv.testutils.feature/feature.xml b/features/tools.vitruv.testutils.feature/feature.xml
@@ -20,7 +20,6 @@
    </license>
 
    <requires>
-      <import plugin="org.apache.log4j"/>
       <import plugin="slf4j.api"/>
       <import plugin="ch.qos.logback.classic"/>
       <import plugin="ch.qos.logback.core"/>