Adapt to refactoring of GModel source model classes & log4j

* Adaptations for eclipse-glsp/glsp-server#165 * TPD update, see eclipse-glsp/glsp-server#163
eclipse-glsp · May 23, 2022 · 7f181dc · 7f181dc
1 parent af09ea3
commit 7f181dc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/...e.workflow.editor/src/org/eclipse/glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java b/...e.workflow.editor/src/org/eclipse/glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java
@@ -29,9 +29,9 @@
 import org.eclipse.glsp.ide.editor.actions.handlers.InitializeCanvasBoundsActionHandler;
 import org.eclipse.glsp.ide.editor.actions.handlers.SetClipboardDataActionHandler;
 import org.eclipse.glsp.ide.editor.di.IdeActionDispatcher;
+import org.eclipse.glsp.ide.editor.gmodel.operations.IdeGModelPasteOperationHandler;
 import org.eclipse.glsp.ide.editor.initialization.DefaultModelInitializationConstraint;
 import org.eclipse.glsp.ide.editor.initialization.ModelInitializationConstraint;
-import org.eclipse.glsp.ide.editor.operations.handlers.IdePasteOperationHandler;
 import org.eclipse.glsp.server.actions.Action;
 import org.eclipse.glsp.server.actions.ActionDispatcher;
 import org.eclipse.glsp.server.actions.ActionHandler;
@@ -40,8 +40,8 @@
 import org.eclipse.glsp.server.actions.SetDirtyStateAction;
 import org.eclipse.glsp.server.di.MultiBinding;
 import org.eclipse.glsp.server.features.navigation.NavigateToExternalTargetAction;
+import org.eclipse.glsp.server.gmodel.GModelPasteOperationHandler;
 import org.eclipse.glsp.server.operations.OperationHandler;
-import org.eclipse.glsp.server.operations.gmodel.PasteOperationHandler;
 
 import com.google.inject.Scopes;
 
@@ -72,8 +72,8 @@ protected void configureActionHandlers(final MultiBinding<ActionHandler> binding
    @Override
    protected void configureOperationHandlers(final MultiBinding<OperationHandler> bindings) {
       super.configureOperationHandlers(bindings);
-      bindings.remove(PasteOperationHandler.class);
-      bindings.add(IdePasteOperationHandler.class);
+      bindings.remove(GModelPasteOperationHandler.class);
+      bindings.add(IdeGModelPasteOperationHandler.class);
    }
 
    @Override

diff --git a/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF
@@ -32,10 +32,10 @@ Export-Package: org.eclipse.glsp.ide.editor,
  org.eclipse.glsp.ide.editor.clipboard,
  org.eclipse.glsp.ide.editor.clipboard.ui,
  org.eclipse.glsp.ide.editor.di,
+ org.eclipse.glsp.ide.editor.gmodel.operations,
  org.eclipse.glsp.ide.editor.handlers,
  org.eclipse.glsp.ide.editor.initialization,
  org.eclipse.glsp.ide.editor.internal.actions,
- org.eclipse.glsp.ide.editor.operations.handlers,
  org.eclipse.glsp.ide.editor.ui,
  org.eclipse.glsp.ide.editor.utils
 Import-Package: javax.servlet;version="[3.1.0,4.0.0)",

diff --git a/...ns/handlers/IdePasteOperationHandler.java → ...tions/IdeGModelPasteOperationHandler.java b/...ns/handlers/IdePasteOperationHandler.java → ...tions/IdeGModelPasteOperationHandler.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-package org.eclipse.glsp.ide.editor.operations.handlers;
+package org.eclipse.glsp.ide.editor.gmodel.operations;
 
 import static org.eclipse.glsp.server.utils.GeometryUtil.shift;
 
@@ -24,25 +24,25 @@
 import org.eclipse.glsp.graph.GModelElement;
 import org.eclipse.glsp.ide.editor.clipboard.ClipboardService;
 import org.eclipse.glsp.ide.editor.clipboard.ui.JsonTransfer;
+import org.eclipse.glsp.server.gmodel.GModelPasteOperationHandler;
 import org.eclipse.glsp.server.gson.GraphGsonConfigurationFactory;
 import org.eclipse.glsp.server.operations.OperationHandler;
 import org.eclipse.glsp.server.operations.PasteOperation;
-import org.eclipse.glsp.server.operations.gmodel.PasteOperationHandler;
 
 import com.google.inject.Inject;
 
 /**
- * An {@link OperationHandler} similar to the GLSP {@link PasteOperationHandler},
+ * An {@link OperationHandler} similar to the GLSP {@link GModelPasteOperationHandler},
  * except that it relies on the local clipboard (instead of relying on Data passed by the client
  * via the operation data).
  */
-public class IdePasteOperationHandler extends PasteOperationHandler {
+public class IdeGModelPasteOperationHandler extends GModelPasteOperationHandler {
 
    @Inject
    protected ClipboardService clipboard;
 
    @Inject
-   public IdePasteOperationHandler(final GraphGsonConfigurationFactory gsonFactory) {
+   public IdeGModelPasteOperationHandler(final GraphGsonConfigurationFactory gsonFactory) {
       super(gsonFactory);
    }
 

diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2021-03.target b/server/releng/org.eclipse.glsp.ide.releng.target/r2021-03.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2021-03 - Release" sequenceNumber="1647251299">
+<target name="2021-03 - Release" sequenceNumber="1653313308">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.19.0.v20210303-1800"/>
@@ -20,12 +20,16 @@
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.glsp.feature.feature.group" version="0.10.0.202203070850"/>
-      <unit id="org.eclipse.glsp.feature.source.feature.group" version="0.10.0.202203070850"/>
+      <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.glsp.feature.feature.group" version="0.10.0.202205231314"/>
+      <unit id="org.eclipse.glsp.feature.source.feature.group" version="0.10.0.202205231314"/>
       <unit id="org.eclipse.glsp.server.websocket" version="0.0.0"/>
       <unit id="org.eclipse.glsp.layout" version="0.0.0"/>
       <unit id="org.eclipse.glsp.example.workflow" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/glsp/server/p2/nightly/0.10/0.10.0.202203070850/"/>
+      <repository location="https://download.eclipse.org/glsp/server/p2/nightly/0.10/0.10.0.202205231314/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.44.v20210927"/>

diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2021-03.tpd b/server/releng/org.eclipse.glsp.ide.releng.target/r2021-03.tpd
@@ -16,7 +16,11 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202108252228
 	javax.xml.stream
 }
 
-location "https://download.eclipse.org/glsp/server/p2/nightly/0.10/0.10.0.202203070850/" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" {
+	org.apache.logging.log4j
+}
+
+location "https://download.eclipse.org/glsp/server/p2/nightly/0.10/0.10.0.202205231314/" {
 	org.eclipse.glsp.feature.feature.group
 	org.eclipse.glsp.feature.source.feature.group
 	org.eclipse.glsp.server.websocket lazy