Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ Export-Package: org.eclipse.glsp.example.workflow,
org.eclipse.glsp.example.workflow.wfgraph.util
Automatic-Module-Name: org.eclipse.glsp.example.workflow
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
org.eclipse.elk.core;bundle-version="0.8.1",
Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.3.0,3.0.0)",
org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)",
org.eclipse.glsp.server.websocket;bundle-version="[2.3.0,3.0.0)",
org.eclipse.elk.alg.layered;bundle-version="0.8.1",
org.eclipse.elk.core;bundle-version="0.8.1",
org.eclipse.elk.graph;bundle-version="0.8.1"
Import-Package: org.apache.logging.log4j;version="2.17.1"
2 changes: 0 additions & 2 deletions examples/org.eclipse.glsp.example.workflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@
</transformers>
<artifactSet>
<excludes>
<exclude>jakarta.websocket:jakarta.websocket-api</exclude>
<exclude>javax.websocket:javax.websocket-api</exclude>
<exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
Expand Down
8 changes: 6 additions & 2 deletions plugins/org.eclipse.glsp.graph/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src-gen/"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
6 changes: 3 additions & 3 deletions plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: org.eclipse.glsp.graph
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.emf.common;bundle-version="2.23.0",
com.google.gson;bundle-version="2.8.7",
org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport
Require-Bundle: org.eclipse.emf.common;bundle-version="2.29.0",
org.eclipse.emf.ecore;bundle-version="2.35.0";visibility:=reexport,
com.google.gson;bundle-version="2.10.1"
Export-Package: org.eclipse.glsp.graph,
org.eclipse.glsp.graph,
org.eclipse.glsp.graph.builder,
Expand Down
7 changes: 5 additions & 2 deletions plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: EclispeSource
Automatic-Module-Name: org.eclipse.glsp.layout
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
org.apache.commons.cli;bundle-version="1.6.0",
org.eclipse.emf.common;bundle-version="2.29.0",
org.eclipse.elk.core;bundle-version="0.8.1",
org.eclipse.elk.graph;bundle-version="0.8.1"
org.eclipse.elk.graph;bundle-version="0.8.1",
org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)"
Export-Package: org.eclipse.glsp.layout
3 changes: 1 addition & 2 deletions plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ Bundle-Vendor: Eclipse GLSP
Bundle-Localization: plugin
Automatic-Module-Name: org.eclipse.glsp.example.emf
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="2.25.0",
org.eclipse.emf.ecore.edit;bundle-version="2.13.0",
org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
Expand Down
45 changes: 23 additions & 22 deletions plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,30 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: com.eclipsesource.glps.server.websocket
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: com.google.gson;bundle-version="2.8.7",
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0]",
org.eclipse.lsp4j;bundle-version="0.11.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
org.eclipse.lsp4j.websocket;bundle-version="0.11.0",
org.eclipse.jetty.servlet;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.util;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.webapp;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.http;bundle-version="[10.0.0,11.0.0)";visibility:=reexport,
org.eclipse.jetty.io;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.client;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.javax.client;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.javax.server;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.javax.common;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.core.common;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.core.client;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.servlet;bundle-version="[10.0.0,11.0.0)",
org.eclipse.jetty.websocket.core.server;bundle-version="[10.0.0,11.0.0)"
Require-Bundle: com.google.gson;bundle-version="2.10.1",
org.eclipse.glsp.server;bundle-version="[2.3.0,3.0.0]",
org.eclipse.lsp4j;bundle-version="0.21.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.21.0",
org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.21.0",
org.eclipse.jetty.ee10.servlet;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.server;bundle-version="12.0.0",
org.eclipse.jetty.server;bundle-version="12.0.0",
org.eclipse.jetty.session;bundle-version="12.0.0",
org.eclipse.jetty.util;bundle-version="12.0.0",
org.eclipse.jetty.websocket.api;bundle-version="12.0.0",
org.eclipse.jetty.http;bundle-version="12.0.0",
org.eclipse.jetty.io;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.jakarta.client;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.jakarta.common;bundle-version="12.0.0",
org.eclipse.jetty.websocket.core.server;bundle-version="12.0.0",
org.eclipse.jetty.ee10.websocket.servlet;bundle-version="12.0.0",
org.eclipse.jetty.websocket.core.common;bundle-version="12.0.0",
org.eclipse.jetty.security;bundle-version="12.0.0"
Export-Package: org.eclipse.glsp.server.websocket
Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
javax.websocket;version="1.1.0",
javax.websocket.server;version="1.1.0",
Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)",
jakarta.websocket;version="[2.0.0,3.0.0)",
jakarta.websocket.server;version="[2.0.0,3.0.0)",
org.apache.logging.log4j;version="2.17.1",
org.apache.logging.log4j.core.config;version="2.17.1",
org.apache.logging.slf4j;version="2.17.1"
6 changes: 3 additions & 3 deletions plugins/org.eclipse.glsp.server.websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<version>${jetty.websocket.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j.websocket</artifactId>
<artifactId>org.eclipse.lsp4j.websocket.jakarta</artifactId>
<version>${lsp4j.version}</version>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
import java.util.ServiceLoader;
import java.util.function.Supplier;

import javax.websocket.Extension;
import javax.websocket.HandshakeResponse;
import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig;
import javax.websocket.server.ServerEndpointConfig.Configurator;

import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.ContainerDefaultConfigurator;

import com.google.inject.Injector;

import jakarta.websocket.Extension;
import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.websocket.server.ServerEndpointConfig.Configurator;

public class GLSPConfigurator extends Configurator {
protected Configurator containerConfigurator;
protected final Supplier<Injector> injector;
Expand All @@ -40,7 +40,7 @@ public GLSPConfigurator(final Supplier<Injector> injector) {
Configurator getContainerConfigurator() {
if (containerConfigurator == null) {
ServiceLoader<Configurator> loader = ServiceLoader
.load(javax.websocket.server.ServerEndpointConfig.Configurator.class);
.load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class);
if (loader.iterator().hasNext()) {
containerConfigurator = loader.iterator().next();
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
import java.util.function.Consumer;
import java.util.function.Function;

import javax.websocket.CloseReason;
import javax.websocket.EndpointConfig;
import javax.websocket.Session;

import org.eclipse.glsp.server.gson.ServerGsonConfigurator;
import org.eclipse.glsp.server.protocol.GLSPClient;
import org.eclipse.glsp.server.protocol.GLSPServer;
import org.eclipse.lsp4j.jsonrpc.Launcher.Builder;
import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
import org.eclipse.lsp4j.websocket.WebSocketEndpoint;
import org.eclipse.lsp4j.websocket.jakarta.WebSocketEndpoint;

import com.google.gson.GsonBuilder;
import com.google.inject.Inject;

import jakarta.websocket.CloseReason;
import jakarta.websocket.EndpointConfig;
import jakarta.websocket.Session;

public class GLSPServerEndpoint extends WebSocketEndpoint<GLSPClient> {
public static final int MAX_TEXT_MESSAGE_BUFFER_SIZE = 8388608;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
******************************************************************************/
package org.eclipse.glsp.server.websocket;

import javax.websocket.Endpoint;

import com.google.inject.AbstractModule;

import jakarta.websocket.Endpoint;

public class WebsocketModule extends AbstractModule {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@

import java.net.InetSocketAddress;

import javax.websocket.server.ServerEndpointConfig;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.eclipse.glsp.server.di.ServerModule;
import org.eclipse.glsp.server.launch.GLSPServerLauncher;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;

import com.google.inject.Module;

import jakarta.websocket.server.ServerEndpointConfig;

public class WebsocketServerLauncher extends GLSPServerLauncher {
public static final String START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed. Accepting requests on port:";
protected static Logger LOGGER = LogManager.getLogger(WebsocketServerLauncher.class);
Expand Down Expand Up @@ -68,12 +68,14 @@ public void start(final String hostname, int port) {

// Configure web socket

JavaxWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> {
JakartaWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> {
ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(GLSPServerEndpoint.class,
"/" + endpointPath);
builder.configurator(new GLSPConfigurator(this::createInjector));
wsContainer.setDefaultMaxSessionIdleTimeout(-1);
wsContainer.addEndpoint(builder.build());
ServerEndpointConfig endPointConfig = builder.build();

// wsContainer.setDefaultMaxSessionIdleTimeout(-1);
wsContainer.addEndpoint(endPointConfig);
});

server.setHandler(webAppContext);
Expand Down
15 changes: 7 additions & 8 deletions plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Bundle-Version: 2.3.0.qualifier
Bundle-Vendor: Eclipse GLSP
Automatic-Module-Name: org.eclipse.glsp.server
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.14.0",
com.google.gson;bundle-version="2.8.7",
org.eclipse.lsp4j;bundle-version="0.11.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport,
com.google.inject;bundle-version="[5.0.1,8.0.0)";visibility:=reexport,
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.15.0",
com.google.gson;bundle-version="2.10.1",
org.eclipse.lsp4j;bundle-version="0.21.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.21.0",
org.apache.commons.cli;bundle-version="1.6.0";visibility:=reexport,
com.google.inject;bundle-version="[7.0.0,8.0.0)";visibility:=reexport,
org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.glsp.server.actions,
org.eclipse.glsp.server.di,
org.eclipse.glsp.server.di.scope,
Expand Down Expand Up @@ -58,7 +58,6 @@ Export-Package: org.eclipse.glsp.server.actions,
org.eclipse.glsp.server.types,
org.eclipse.glsp.server.utils
Import-Package: jakarta.inject;resolution:=optional,
javax.inject;version="1.0.0",
org.apache.logging.log4j;version="2.17.1",
org.apache.logging.log4j.core;version="2.17.1",
org.apache.logging.log4j.core.appender;version="2.17.1",
Expand Down
24 changes: 11 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,24 @@
<maven.shade.version>3.6.0</maven.shade.version>
<maven.source.version>3.3.1</maven.source.version>
<maven.surefire.version>3.3.1</maven.surefire.version>
<puppycrawl.checkstyle.version>10.17.0</puppycrawl.checkstyle.version>
<tycho.version>4.0.8</tycho.version>
<versions.maven.version>2.17.1</versions.maven.version>

<!-- Dependency Versions: Version of dependencies provided by the target
platform in ,2. We try to match the p2-version if possible. -->
<apache.logging.log4j.version>[2.19.0,2.23.1]</apache.logging.log4j.version>
<apache.logging.log4j.version>[2.19.0,2.24.2]</apache.logging.log4j.version>
<commons.cli.version>[1.4,)</commons.cli.version>
<elk.version>0.8.1</elk.version>
<emf.common.version>[2.23.0,)</emf.common.version>
<emf.common.version>[2.29.0,)</emf.common.version>
<emf.ecore.change.version>[2.14.0,)</emf.ecore.change.version>
<emf.ecore.edit.version>[2.13.0,)</emf.ecore.edit.version>
<emf.ecore.version>[2.25.0,)</emf.ecore.version>
<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
<google.guice.version>[5.0.1,)</google.guice.version>
<google.gson.version>[2.8.7,)</google.gson.version>
<emf.ecore.edit.version>[2.14.0,)</emf.ecore.edit.version>
<emf.ecore.version>[2.35.0,)</emf.ecore.version>
<emf.ecore.xmi.version>[2.35.0,)</emf.ecore.xmi.version>
<google.guice.version>[7.0.0,)</google.guice.version>
<google.gson.version>[2.10.1,)</google.gson.version>
<junit.jupiter.engine.version>[5.7.1,6.0.0)</junit.jupiter.engine.version>
<lsp4j.version>[0.11.0,)</lsp4j.version>
<jetty.websocket.version>[10.0.12,)</jetty.websocket.version>
<lsp4j.version>[0.21.0,)</lsp4j.version>
<jetty.websocket.version>[12.0.3,)</jetty.websocket.version>


<!-- Release Dependencies for M2 -->
Expand Down Expand Up @@ -118,7 +116,7 @@

<properties>
<!-- Maven Plugin Versions: General maven plugin versions -->

<p2.target>r2024-09</p2.target>
</properties>

<modules>
Expand Down Expand Up @@ -233,7 +231,7 @@
<artifact>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<classifier>targetplatforms/r2022-12</classifier>
<classifier>targetplatforms/${p2.target}</classifier>
<version>${project.version}</version>
</artifact>
</target>
Expand Down
24 changes: 9 additions & 15 deletions releng/org.eclipse.glsp.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.glsp.feature"
label="GLSP SDK"
label="GLSP SDK (Core)"
version="2.3.0.qualifier"
provider-name="Eclipse GLSP">

Expand Down Expand Up @@ -312,31 +312,25 @@ version(s), and exceptions or additional permissions here}.&quot;
</url>

<requires>
<import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
<import plugin="com.google.gson" version="2.8.7" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j" version="0.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j.jsonrpc" version="0.11.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
<import plugin="com.google.gson" version="2.10.1" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="5.0.1" match="greaterOrEqual"/>
<import plugin="javax.inject"/>
<import plugin="jakarta.inject.jakarta.inject-api"/>
<import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.apache.logging.log4j.api"/>
<import plugin="org.apache.logging.log4j.core"/>
<import plugin="org.eclipse.emf.common" version="2.23.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.25.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j" version="0.21.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.lsp4j.jsonrpc" version="0.21.0" match="greaterOrEqual"/>
</requires>

<plugin
id="org.eclipse.glsp.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.eclipse.glsp.graph"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

</feature>
Loading
Loading