Skip to content

Commit add237d

Browse files
laeubiakurtakov
laeubi
authored and
akurtakov
committed
Consume lemminx as a bundle from the OSGi runtime
Currently lemminx is embedded into WWD what has some disadvantages: - the jar gets bigger - the embedded jar needs to be extracted before it can be used - version bumps are required for lemminx updates - lemminx can't be updated independent from WWD This now adds a require-bundle to the manifest (so we are getting a certain version we are compatible with) and uses the bundle wiring to get hold of the bundle and then transform it into a file path. Signed-off-by: Christoph Läubrich <[email protected]>
1 parent a3ea5af commit add237d

File tree

8 files changed

+49
-66
lines changed

8 files changed

+49
-66
lines changed

‎org.eclipse.wildwebdeveloper.tests/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1414
org.eclipse.jdt.core.compiler.release=enabled
1515
org.eclipse.jdt.core.compiler.source=21
16+
org.eclipse.jdt.core.compiler.ignoreUnnamedModuleForSplitPackage=enabled

‎org.eclipse.wildwebdeveloper.xml.feature/feature.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.eclipse.wildwebdeveloper.xml.feature"
44
label="%name"
5-
version="1.3.6.qualifier"
5+
version="1.3.7.qualifier"
66
provider-name="Eclipse Wild Web Developer project"
77
license-feature="org.eclipse.license"
88
license-feature-version="0.0.0">

‎org.eclipse.wildwebdeveloper.xml.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>
99
<packaging>eclipse-feature</packaging>
10-
<version>1.3.6-SNAPSHOT</version>
10+
<version>1.3.7-SNAPSHOT</version>
1111
<build>
1212
<plugins>
1313
<plugin>

‎org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wildwebdeveloper.xml;singleton:=true
5-
Bundle-Version: 1.3.6.qualifier
5+
Bundle-Version: 1.3.7.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Automatic-Module-Name: org.eclipse.wildwebdeveloper.xml
@@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.tm4e.registry;bundle-version="0.3.0",
2323
org.eclipse.text,
2424
org.eclipse.jface.text;bundle-version="3.20.100",
2525
com.google.gson,
26-
org.eclipse.tm4e.language_pack
26+
org.eclipse.tm4e.language_pack,
27+
org.eclipse.lemminx.uber-jar;bundle-version="[0.29.0,1.0.0)"
2728
Bundle-ActivationPolicy: lazy
2829
Bundle-Activator: org.eclipse.wildwebdeveloper.xml.internal.Activator
2930
Export-Package: org.eclipse.wildwebdeveloper.xml;x-friends:="org.eclipse.m2e.editor.lemminx",

‎org.eclipse.wildwebdeveloper.xml/build.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
44
.,\
55
plugin.xml,\
66
plugin.properties,\
7-
language-servers/server/,\
87
language-configurations/,\
98
grammars/,\
109
snippets/,\

‎org.eclipse.wildwebdeveloper.xml/pom.xml‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,10 @@
77
<version>1.0.0-SNAPSHOT</version>
88
</parent>
99
<packaging>eclipse-plugin</packaging>
10-
<version>1.3.6-SNAPSHOT</version>
10+
<version>1.3.7-SNAPSHOT</version>
1111

1212
<build>
1313
<plugins>
14-
<plugin>
15-
<groupId>org.apache.maven.plugins</groupId>
16-
<artifactId>maven-clean-plugin</artifactId>
17-
<configuration>
18-
<filesets>
19-
<fileset>
20-
<directory>language-servers/</directory>
21-
<includes>*.tgz</includes>
22-
</fileset>
23-
</filesets>
24-
</configuration>
25-
</plugin>
26-
<plugin>
27-
<groupId>org.apache.maven.plugins</groupId>
28-
<artifactId>maven-dependency-plugin</artifactId>
29-
<version>3.8.1</version>
30-
<executions>
31-
<execution>
32-
<id>fetch-lemminx</id>
33-
<phase>generate-resources</phase>
34-
<goals>
35-
<goal>copy</goal>
36-
</goals>
37-
<configuration>
38-
<artifactItems>
39-
<artifactItem>
40-
<groupId>org.eclipse.lemminx</groupId>
41-
<artifactId>org.eclipse.lemminx</artifactId>
42-
<!-- Bumping to version with API breakage needs to bump bundle version at least by +0.1.0 -->
43-
<version>0.29.0</version>
44-
<!-- classifier:uber includes all dependencies -->
45-
<classifier>uber</classifier>
46-
</artifactItem>
47-
</artifactItems>
48-
<outputDirectory>language-servers/server</outputDirectory>
49-
<stripVersion>true</stripVersion>
50-
</configuration>
51-
</execution>
52-
</executions>
53-
</plugin>
5414
<plugin>
5515
<groupId>org.eclipse.tycho</groupId>
5616
<artifactId>tycho-packaging-plugin</artifactId>
@@ -62,17 +22,4 @@
6222
</plugin>
6323
</plugins>
6424
</build>
65-
66-
<repositories>
67-
<repository>
68-
<id>lemminx-releases</id>
69-
<url>https://repo.eclipse.org/content/repositories/lemminx-releases/</url>
70-
<snapshots>
71-
<enabled>false</enabled>
72-
</snapshots>
73-
<releases>
74-
<enabled>true</enabled>
75-
</releases>
76-
</repository>
77-
</repositories>
7825
</project>

‎org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/XMLLanguageServer.java‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.io.File;
1717
import java.io.IOException;
1818
import java.net.URI;
19-
import java.net.URL;
2019
import java.util.ArrayList;
2120
import java.util.Arrays;
2221
import java.util.Collection;
@@ -42,8 +41,12 @@
4241
import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider;
4342
import org.eclipse.lsp4j.DidChangeConfigurationParams;
4443
import org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceServerConstants;
44+
import org.osgi.framework.Bundle;
4545
import org.osgi.framework.BundleContext;
46+
import org.osgi.framework.FrameworkUtil;
4647
import org.osgi.framework.ServiceReference;
48+
import org.osgi.framework.wiring.BundleWire;
49+
import org.osgi.framework.wiring.BundleWiring;
4750

4851
@SuppressWarnings("restriction")
4952
public class XMLLanguageServer extends ProcessStreamConnectionProvider {
@@ -103,21 +106,36 @@ public XMLLanguageServer() {
103106
commands.add("-Duser.home=" + System.getProperty("user.home"));
104107
commands.add("-classpath");
105108
try {
106-
URL url = FileLocator
107-
.toFileURL(getClass().getResource("/language-servers/server/org.eclipse.lemminx-uber.jar"));
109+
Bundle lemminxBundle = getLemminxBundle();
110+
File file = FileLocator.getBundleFileLocation(lemminxBundle)
111+
.orElseThrow(() -> new IllegalStateException("Can't determine lemminx file location"));
108112
List<String> extensionJarPaths = getExtensionJarPaths();
109-
String uberJarPath = new java.io.File(url.getPath()).getAbsolutePath();
113+
String uberJarPath = file.getAbsolutePath();
110114
jarPaths.add(uberJarPath);
111115
jarPaths.addAll(extensionJarPaths);
112116
commands.add(String.join(System.getProperty("path.separator"), jarPaths));
113-
commands.add("org.eclipse.lemminx.XMLServerLauncher");
117+
String mainClass = lemminxBundle.getHeaders().get("Main-Class");
118+
commands.add(mainClass);
114119
setCommands(commands);
115120
setWorkingDirectory(System.getProperty("user.dir"));
116-
} catch (IOException e) {
121+
} catch (RuntimeException e) {
117122
ILog.get().error(e.getMessage(), e);
118123
}
119124
}
120125

126+
private Bundle getLemminxBundle() {
127+
Bundle self = FrameworkUtil.getBundle(getClass());
128+
BundleWiring wiring = self.adapt(BundleWiring.class);
129+
List<BundleWire> wires = wiring.getRequiredWires("osgi.wiring.bundle");
130+
for (BundleWire bundleWire : wires) {
131+
Bundle bundle = bundleWire.getProvider().getBundle();
132+
if (bundle.getSymbolicName().equals("org.eclipse.lemminx.uber-jar")) {
133+
return bundle;
134+
}
135+
}
136+
throw new IllegalStateException("can't find the lemminx bundle!");
137+
}
138+
121139
private Collection<? extends String> getProxySettings() {
122140
Map<String, String> res = new HashMap<>();
123141
for (Entry<Object, Object> entry : System.getProperties().entrySet()) {

‎target-platform/target-platform.target‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,22 @@
5454
</dependency>
5555
</dependencies>
5656
</location>
57+
<location includeDependencyDepth="none" includeDependencyScopes="compile" label="LemMinX" missingManifest="error" type="Maven">
58+
<dependencies>
59+
<dependency>
60+
<groupId>org.eclipse.lemminx</groupId>
61+
<artifactId>org.eclipse.lemminx</artifactId>
62+
<version>0.29.0</version>
63+
<type>jar</type>
64+
<classifier>uber</classifier>
65+
</dependency>
66+
</dependencies>
67+
<repositories>
68+
<repository>
69+
<id>lemminx-releases</id>
70+
<url>https://repo.eclipse.org/content/repositories/lemminx-releases/</url>
71+
</repository>
72+
</repositories>
73+
</location>
5774
</locations>
58-
</target>
75+
</target>

0 commit comments

Comments
 (0)