chore: eliminate all usages of Xpand

com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckCatalogGenerator.java

@@ -34,7 +34,7 @@ public class CheckCatalogGenerator {
   private JavaIoFileSystemAccess fsa;
 
   /**
-   * Generates a check file. Calls an Xpand template.
+   * Generates a check file.
    *
    * @param path
    *          the path used for the output file destination

com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/wizard/CheckProjectInfo.java

@@ -83,7 +83,7 @@ public String getDefaultPackageImport() {
   }
 
   /**
-   * Gets the path to where files should be generated by Xpand. If {@code path} is {@code null}, a default is calculated.
+   * Gets the path to where files should be generated. If {@code path} is {@code null}, a default is calculated.
    *
    * @return the path
    */

com.avaloq.tools.ddk.xtext.export/META-INF/MANIFEST.MF

@@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.xtext,
  com.avaloq.tools.ddk.xtext.expression;visibility:=reexport,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.xtend.shared.ui;resolution:=optional,
  org.eclipse.xtext.ui.codetemplates;resolution:=optional,
  org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j

com.avaloq.tools.ddk.xtext.export/src/com/avaloq/tools/ddk/xtext/export/validation/ExportValidator.java

@@ -62,13 +62,7 @@ public void checkExtensions(final ExportModel model) {
     if (!Platform.isRunning()) {
       resourceManager = new ResourceManagerDefaultImpl();
     }
-    // } else {
-    // FIXME: sort out xpand
-    // IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new
-    // Path(model.eResource().getURI().toPlatformString(true))).getProject());
-    // if (project != null) {
-    // resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
-    // }
+
     if (resourceManager == null) {
       return;
     }

com.avaloq.tools.ddk.xtext.expression/src/com/avaloq/tools/ddk/xtext/expression/generator/CompilationContext.java

@@ -34,7 +34,7 @@
  * The CompilationContext is used by CodeGeneration.ext to resolve types, get information about local variables, etc. It is a
  * wrapper around {@link ExecutionContext}.
  * <p>
- * Note that many of these methods are called from Xtend and Xpand and will thus not show up when doing a find references in Eclipse.
+ * Note that many of these methods are called from Xtend and will thus not show up when doing a find references in Eclipse.
  */
 @SuppressWarnings("nls")
 public class CompilationContext {

com.avaloq.tools.ddk.xtext.format.generator/META-INF/MANIFEST.MF

@@ -5,8 +5,6 @@ Bundle-Vendor: Avaloq Group AG
 Bundle-Version: 16.4.0.qualifier
 Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.format.generator;singleton:=true
 Require-Bundle: com.avaloq.tools.ddk.xtext.format;visibility:=reexport,
- org.eclipse.xpand,
- org.eclipse.xtend,
  org.eclipse.xtext.xtext.generator,
  org.eclipse.xtext,
  com.avaloq.tools.ddk.xtext.generator;visibility:=reexport,

com.avaloq.tools.ddk.xtext.generator/META-INF/MANIFEST.MF

@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.jface,
  org.eclipse.ui.views,
  org.eclipse.emf.codegen.ecore,
- org.eclipse.xpand,
  org.eclipse.xtext,
  org.eclipse.xtext.xtext.generator,
  org.eclipse.emf.mwe2.lib,
@@ -17,7 +16,6 @@ Require-Bundle: org.eclipse.jface,
  com.avaloq.tools.ddk.xtext,
  com.avaloq.tools.ddk.xtext.expression,
  com.avaloq.tools.ddk.xtext.expression.ui,
- org.eclipse.xtend.util.stdlib,
  com.google.guava,
  com.avaloq.tools.ddk.xtext.ui,
  org.eclipse.xtend.lib,

com.avaloq.tools.ddk.xtext.scope/META-INF/MANIFEST.MF

@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.xtext,
  com.avaloq.tools.ddk.xtext.expression;visibility:=reexport,
  org.eclipse.xtend,
+ org.eclipse.xtend.typesystem.emf,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
  org.eclipse.xtext.util,
  org.eclipse.emf.ecore,
@@ -17,9 +18,7 @@ Require-Bundle: org.eclipse.xtext,
  com.avaloq.tools.ddk.xtext,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.xtend.shared.ui;resolution:=optional,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.typesystem.emf
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.logging.log4j,
  org.apache.log4j
 Export-Package: com.avaloq.tools.ddk.xtext.scope,

com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/generator/ScopeProviderGenerator.xtend

@@ -252,7 +252,7 @@ class ScopeProviderGenerator {
   '''
 
   def dispatch scopeExpression(ScopeExpression it, ScopeModel model, String typeOrRef, ScopeDefinition scope, Boolean isGlobal) {
-    error("Xpand called the wrong definition." + it.toString() + javaContributorComment(it.location()))
+    error("Xtend called the wrong definition." + it.toString() + javaContributorComment(it.location()))
   }
 
   def dispatch scopeExpression(FactoryExpression it, ScopeModel model, String typeOrRef, ScopeDefinition scope, Boolean isGlobal) {

com.avaloq.tools.ddk.xtext.scope/src/com/avaloq/tools/ddk/xtext/scope/validation/ScopeValidator.java

@@ -69,13 +69,7 @@ public void checkExtensions(final ScopeModel model) {
     if (!Platform.isRunning()) {
       resourceManager = new ResourceManagerDefaultImpl();
     }
-    // } else {
-    // FIXME: xpand
-    // IXtendXpandProject project = Activator.getExtXptModelManager().findProject(ResourcesPlugin.getWorkspace().getRoot().getFile(new
-    // Path(model.eResource().getURI().toPlatformString(true))).getProject());
-    // if (project != null) {
-    // resourceManager = new XpandPluginExecutionContext(project).getResourceManager();
-    // }
+
     if (resourceManager == null) {
       return;
     }

com.avaloq.tools.ddk.xtext.test/pom.xml

@@ -48,11 +48,6 @@
                 <id>org.eclipse.xtext.sdk</id>
                 <versionRange>0.0.0</versionRange>
               </requirement>
-              <requirement>
-                <type>eclipse-feature</type>
-                <id>org.eclipse.xpand.sdk</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
               <requirement>
                 <type>eclipse-feature</type>
                 <id>org.eclipse.pde</id>

ddk-configuration/launches/devkit-run.launch

@@ -250,7 +250,6 @@
 <setEntry value="org.eclipse.ui.workbench@default:default"/>
 <setEntry value="org.eclipse.ui@default:default"/>
 <setEntry value="org.eclipse.update.configurator@3:true"/>
-<setEntry value="org.eclipse.xpand@default:default"/>
 <setEntry value="org.eclipse.xtend.core@default:default"/>
 <setEntry value="org.eclipse.xtend.doc@default:default"/>
 <setEntry value="org.eclipse.xtend.examples@default:default"/>

ddk-target/ddk.target

@@ -25,7 +25,9 @@
     <repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
   </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-    <unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.xtend" version="0.0.0"/>
+    <unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
+    <unit id="org.eclipse.xtend.util.stdlib" version="0.0.0"/>
     <repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
   </location>
   <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -47,6 +49,7 @@
     <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
     <unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
     <unit id="org.apache.commons.lang" version="2.6.0.v20220406-2305"/>
+    <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
     <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
     <unit id="org.slf4j.ext" version="1.7.30.v20221112-0806"/>
     <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/>