Add logback tracing to Java LS

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
eclipse-jdtls · Jun 15, 2022 · 0154920 · 0154920
1 parent 18ea9fb
commit 0154920
Show file tree

Hide file tree

Showing 30 changed files with 1,372 additions and 2 deletions.
diff --git a/launch/jdt.ls.remote.server.launch b/launch/jdt.ls.remote.server.launch
@@ -90,6 +90,9 @@
 <setEntry value="org.eclipse.m2e.jdt@default:default"/>
 <setEntry value="org.eclipse.m2e.lifecyclemapping.defaults@default:default"/>
 <setEntry value="org.apache.commons.codec@default:default"/>
+<setEntry value="ch.qos.logback.classic@default:default"/>
+<setEntry value="ch.qos.logback.core@default:default"/>
+<setEntry value="ch.qos.logback.slf4j@default:default"/>
 <setEntry value="org.eclipse.m2e.maven.indexer@default:default"/>
 <setEntry value="org.eclipse.m2e.maven.runtime.slf4j.simple@default:default"/>
 <setEntry value="org.eclipse.m2e.maven.runtime@default:default"/>
@@ -112,6 +115,8 @@
 </setAttribute>
 <setAttribute key="selected_workspace_bundles">
 <setEntry value="org.eclipse.jdt.ls.core@default:default"/>
+<setEntry value="org.eclipse.jdt.ls.logback.appender@default:false"/>
+<setEntry value="org.eclipse.jdt.ls.logback@default:true"/>
 </setAttribute>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

diff --git a/launch/jdt.ls.socket-stream.launch b/launch/jdt.ls.socket-stream.launch
@@ -91,6 +91,9 @@
 <setEntry value="org.eclipse.m2e.jdt@default:default"/>
 <setEntry value="org.eclipse.m2e.lifecyclemapping.defaults@default:default"/>
 <setEntry value="org.apache.commons.codec@default:default"/>
+<setEntry value="ch.qos.logback.classic@default:default"/>
+<setEntry value="ch.qos.logback.core@default:default"/>
+<setEntry value="ch.qos.logback.slf4j@default:default"/>
 <setEntry value="org.eclipse.m2e.maven.indexer@default:default"/>
 <setEntry value="org.eclipse.m2e.maven.runtime.slf4j.simple@default:default"/>
 <setEntry value="org.eclipse.m2e.maven.runtime@default:default"/>
@@ -113,6 +116,8 @@
 </setAttribute>
 <setAttribute key="selected_workspace_bundles">
 <setEntry value="org.eclipse.jdt.ls.core@default:default"/>
+<setEntry value="org.eclipse.jdt.ls.logback.appender@default:false"/>
+<setEntry value="org.eclipse.jdt.ls.logback@default:true"/>
 </setAttribute>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>

diff --git a/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporter.java b/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporter.java
@@ -47,6 +47,7 @@
 import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
 import org.eclipse.m2e.core.MavenPlugin;
+import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.embedder.MavenModelManager;
 import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.core.internal.preferences.MavenConfigurationImpl;
@@ -56,6 +57,7 @@
 import org.eclipse.m2e.core.project.MavenProjectInfo;
 import org.eclipse.m2e.core.project.ProjectImportConfiguration;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 
 @SuppressWarnings("restriction")
 public class MavenProjectImporter extends AbstractProjectImporter {
@@ -234,7 +236,7 @@ public void importToWorkspace(IProgressMonitor monitor) throws CoreException, Op
 	}
 
 	private long getLastWorkspaceStateModified() {
-		Bundle bundle = Platform.getBundle(IMavenConstants.PLUGIN_ID);
+		Bundle bundle = FrameworkUtil.getBundle(IMaven.class);
 		if (bundle != null) {
 			IPath result = Platform.getStateLocation(bundle);
 			File bundleStateLocation = result.toFile();

diff --git a/org.eclipse.jdt.ls.logback.appender/.classpath b/org.eclipse.jdt.ls.logback.appender/.classpath
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.jdt.ls.logback.appender/.project b/org.eclipse.jdt.ls.logback.appender/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jdt.ls.logback.appender</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>