From 3d2f59e1d56e950a89e9329d6e336d12798af52f Mon Sep 17 00:00:00 2001
From: Philip Langer <planger@eclipsesource.com>
Date: Mon, 23 May 2022 15:21:09 +0200
Subject: [PATCH] Adapt to refactoring of GModel source model classes & log4j

  * Adaptations for https://github.com/eclipse-glsp/glsp-server/pull/165
  * TPD update, see https://github.com/eclipse-glsp/glsp-server/pull/163
---
 .../glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java | 4 ++--
 .../operations/handlers/IdePasteOperationHandler.java       | 6 +++---
 .../org.eclipse.glsp.ide.releng.target/r2021-03.target      | 6 +++++-
 .../releng/org.eclipse.glsp.ide.releng.target/r2021-03.tpd  | 4 ++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/example/org.eclipse.glsp.ide.workflow.editor/src/org/eclipse/glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java b/server/example/org.eclipse.glsp.ide.workflow.editor/src/org/eclipse/glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java
index b1c3a2b..4fa3f5e 100644
--- a/server/example/org.eclipse.glsp.ide.workflow.editor/src/org/eclipse/glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java
+++ b/server/example/org.eclipse.glsp.ide.workflow.editor/src/org/eclipse/glsp/ide/workflow/editor/WorkflowGLSPEclipseModule.java
@@ -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,7 +72,7 @@ protected void configureActionHandlers(final MultiBinding<ActionHandler> binding
    @Override
    protected void configureOperationHandlers(final MultiBinding<OperationHandler> bindings) {
       super.configureOperationHandlers(bindings);
-      bindings.remove(PasteOperationHandler.class);
+      bindings.remove(GModelPasteOperationHandler.class);
       bindings.add(IdePasteOperationHandler.class);
    }
 
diff --git a/server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/operations/handlers/IdePasteOperationHandler.java b/server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/operations/handlers/IdePasteOperationHandler.java
index de0ec86..833ac02 100644
--- a/server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/operations/handlers/IdePasteOperationHandler.java
+++ b/server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/operations/handlers/IdePasteOperationHandler.java
@@ -24,19 +24,19 @@
 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 IdePasteOperationHandler extends GModelPasteOperationHandler {
 
    @Inject
    protected ClipboardService clipboard;
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
index ecccacb..89e99fd 100644
--- 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="1652713421">
   <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,6 +20,10 @@
       <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
       <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.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.202203070850"/>
       <unit id="org.eclipse.glsp.feature.source.feature.group" version="0.10.0.202203070850"/>
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
index 640289f..b557351 100644
--- a/server/releng/org.eclipse.glsp.ide.releng.target/r2021-03.tpd
+++ b/server/releng/org.eclipse.glsp.ide.releng.target/r2021-03.tpd
@@ -17,6 +17,10 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202108252228
 	javax.xml.stream
 }
 
+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.202203070850/" {
 	org.eclipse.glsp.feature.feature.group
 	org.eclipse.glsp.feature.source.feature.group