Skip to content

drop xtext web #3722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdietrich merged 12 commits into from
Jun 1, 2026
Merged

drop xtext web #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bf55f24
feat: drop xtext-web
cdietrich Jun 1, 2026
cf2bb45
drop projects
cdietrich Jun 1, 2026
1ddc350
drop some build refs
cdietrich Jun 1, 2026
4351dad
drop more stuff
cdietrich Jun 1, 2026
45c768a
drop descriptor
cdietrich Jun 1, 2026
fc194ef
more adjustments
cdietrich Jun 1, 2026
ef74846
more removals
cdietrich Jun 1, 2026
d44ea7d
and more stuff
cdietrich Jun 1, 2026
6309032
fix tests
cdietrich Jun 1, 2026
1fcd090
fix wizaerd
cdietrich Jun 1, 2026
228f984
more stuff
cdietrich Jun 1, 2026
38b1052
copyright adjustments
cdietrich Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions dev-doc/RegenerateLanguages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,5 @@ This document describes the necessary steps to regenerate the test- and producti
org.eclipse.xtext.xtext.ui.examples/projects/homeautomation/org.eclipse.xtext.example.homeautomation/src/org/eclipse/xtext/example/homeautomation/GenerateRuleEngine.mwe2
org.eclipse.xtext.xtext.ui.tests/generator/org/eclipse/xtext/xtext/ui/ecore2xtext/GenerateEcore2XtextTestGrammar.mwe2
org.eclipse.xtext.xtext.ui.tests/src/org/eclipse/xtext/xtext/ui/GenerateTestLanguages.mwe2
org.eclipse.xtext.web.example.entities/src/org/eclipse/xtext/web/example/entities/GenerateEntities.mwe2
org.eclipse.xtext.web.example.statemachine/src/org/eclipse/xtext/web/example/statemachine/GenerateStatemachine.mwe2
org.eclipse.xtend.core/src/org/eclipse/xtend/core/GenerateXtend.mwe2
```
10 changes: 0 additions & 10 deletions org.eclipse.xtext.full.releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,6 @@
<module>../org.eclipse.xtext.xtext.ui.graph.tests</module>
<module>../org.eclipse.xtext.xtext.ui.tests</module>

<!-- xtext-web -->
<module>../org.eclipse.xtext.web</module>
<module>../org.eclipse.xtext.web.example.statemachine</module>
<module>../org.eclipse.xtext.web.example.statemachine.ide</module>
<module>../org.eclipse.xtext.xbase.web</module>
<module>../org.eclipse.xtext.web.example.entities</module>
<module>../org.eclipse.xtext.web.example.entities.ide</module>
<module>../org.eclipse.xtext.web.servlet</module>
<module>../org.eclipse.xtext.web.example.jetty</module>

<!-- xtext-maven -->
<module>../org.eclipse.xtext.maven.parent</module>
<module>../org.eclipse.xtext.maven.plugin</module>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Export-Package: org.eclipse.xtext.ide;version="2.44.0";
org.eclipse.xtext.ide.editor.partialEditing;version="2.44.0",
org.eclipse.xtext.ide.editor.quickfix;version="2.44.0",
org.eclipse.xtext.ide.editor.syntaxcoloring;version="2.44.0",
org.eclipse.xtext.ide.labels;version="2.44.0";x-friends:="org.eclipse.xtext.web,org.eclipse.xtext.xbase.ide",
org.eclipse.xtext.ide.labels;version="2.44.0";x-friends:="org.eclipse.xtext.xbase.ide",
org.eclipse.xtext.ide.refactoring;version="2.44.0";x-friends:="org.eclipse.xtext.testlanguages.ide,org.eclipse.xtext.ui",
org.eclipse.xtext.ide.serializer;version="2.44.0";x-friends:="org.eclipse.xtext.ide.tests,org.eclipse.xtext.ui",
org.eclipse.xtext.ide.serializer.debug;version="2.44.0";x-friends:="org.eclipse.xtext.ide.tests,org.eclipse.xtext.testing",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.maven.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<url>https://www.eclipse.org/Xtext/</url>
<name>Xtext Maven Plugin Parent POM</name>
<description>Xtext is a framework for development of programming languages and domain-specific languages. With Xtext you define your language using a powerful grammar language. As a result you get a full infrastructure, including parser, linker, typechecker, compiler as well as editing support for Eclipse, LSP and your favorite web browser.</description>
<description>Xtext is a framework for development of programming languages and domain-specific languages. With Xtext you define your language using a powerful grammar language. As a result you get a full infrastructure, including parser, linker, typechecker, compiler as well as editing support for Eclipse, and LSP (Language Server Protocol).</description>

<properties>
<root-dir>${basedir}/..</root-dir>
Expand Down
9 changes: 0 additions & 9 deletions org.eclipse.xtext.maven.releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@
<!-- This is required by the xtext-maven-plugin IT -->
<module>../org.eclipse.xtext.purexbase</module>
<module>../org.eclipse.xtext.purexbase.ide</module>
<!-- xtext-web -->
<module>../org.eclipse.xtext.web</module>
<module>../org.eclipse.xtext.web.example.statemachine</module>
<module>../org.eclipse.xtext.web.example.statemachine.ide</module>
<module>../org.eclipse.xtext.xbase.web</module>
<module>../org.eclipse.xtext.web.example.entities</module>
<module>../org.eclipse.xtext.web.example.entities.ide</module>
<module>../org.eclipse.xtext.web.servlet</module>
<module>../org.eclipse.xtext.web.example.jetty</module>
<!-- xtext-maven -->
<module>../org.eclipse.xtext.maven.parent</module>
<module>../org.eclipse.xtext.maven.plugin</module>
Expand Down
13 changes: 0 additions & 13 deletions org.eclipse.xtext.relengutil/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@
<name>Xtext Release Engineering Utilities</name>
<description>Utilities to perform maintenance work in Xtext.</description>

<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.web.example.entities</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.web.example.statemachine</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
8 changes: 0 additions & 8 deletions org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/GenerateAllExamples.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,4 @@ Workflow {
component = @org.eclipse.xtext.example.homeautomation.GenerateRuleEngine {
rootPath = "${rootPath}/homeautomation"
}
component = @org.eclipse.xtext.web.example.entities.GenerateEntities {
rootPath = ".."
}
component = @org.eclipse.xtext.web.example.statemachine.GenerateStatemachine {
rootPath = ".."
}
}


3 changes: 1 addition & 2 deletions org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/WizardConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,7 @@ public void allBuildSystemsUseJava21() {

public List<? extends ProjectDescriptor> allJavaProjects() {
return Lists.newArrayList(config.getRuntimeProject(), config.getRuntimeProject().getTestProject(),
config.getUiProject(), config.getUiProject().getTestProject(), config.getIdeProject(),
config.getWebProject());
config.getUiProject(), config.getUiProject().getTestProject(), config.getIdeProject());
}

@Test
Expand Down
13 changes: 0 additions & 13 deletions org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ public static void main(String[] args) {
project.setProjectLayout(ProjectLayout.HIERARCHICAL);
project.getRuntimeProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("mavenTycho");
project.setPreferredBuildSystem(BuildSystem.MAVEN);
Expand All @@ -137,7 +136,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("mavenTychoJUnit6");
project.setPreferredBuildSystem(BuildSystem.MAVEN);
Expand All @@ -147,7 +145,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.setJunitVersion(JUnitVersion.JUNIT_6);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("gradle");
Expand All @@ -156,7 +153,6 @@ public static void main(String[] args) {
project.setProjectLayout(ProjectLayout.HIERARCHICAL);
project.getRuntimeProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.setJunitVersion(JUnitVersion.JUNIT_6);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("eclipsePlugin");
Expand Down Expand Up @@ -186,7 +182,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.getP2Project().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("mavenTychoP2J25");
Expand All @@ -198,7 +193,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.getP2Project().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("full");
Expand All @@ -209,7 +203,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(true);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(true);
project.getP2Project().setEnabled(true);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("lsMavenFatjar");
Expand All @@ -220,7 +213,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(false);
project.getUiProject().getTestProject().setEnabled(false);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(false);
project.setLanguageServer(LanguageServer.FATJAR);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("lsMavenTychoFatjar");
Expand All @@ -231,7 +223,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(false);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(false);
project.setLanguageServer(LanguageServer.FATJAR);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("lsGradleFatjar");
Expand All @@ -242,7 +233,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(false);
project.getUiProject().getTestProject().setEnabled(false);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(false);
project.setLanguageServer(LanguageServer.FATJAR);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("lsMavenApp");
Expand All @@ -253,7 +243,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(false);
project.getUiProject().getTestProject().setEnabled(false);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(false);
project.setLanguageServer(LanguageServer.APP);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("lsMavenTychoApp");
Expand All @@ -264,7 +253,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(true);
project.getUiProject().getTestProject().setEnabled(false);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(false);
project.setLanguageServer(LanguageServer.APP);
}), CliWizardIntegrationTest.newProjectConfig(project -> {
project.setBaseName("lsGradleApp");
Expand All @@ -275,7 +263,6 @@ public static void main(String[] args) {
project.getUiProject().setEnabled(false);
project.getUiProject().getTestProject().setEnabled(false);
project.getIdeProject().setEnabled(true);
project.getWebProject().setEnabled(false);
project.setLanguageServer(LanguageServer.APP);
}));

Expand Down
23 changes: 0 additions & 23 deletions org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.web/build.gradle
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...tions/full/full.parent/full/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/full.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.feature&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.repository&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/full.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ui&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.target&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.feature&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.repository&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.tests&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/full.ui.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="mydsl.GenerateMyDsl"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="full"/>
Expand Down
6 changes: 0 additions & 6 deletions org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../full.web/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/model/generated/</directory>
</fileset>
Expand Down
3 changes: 0 additions & 3 deletions ...ext.tests/testdata/wizard-expectations/full/full.parent/full/src/mydsl/GenerateMyDsl.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ Workflow {
eclipsePluginTest = {
enabled = true
}
web = {
enabled = true
}
createEclipseMetaData = true
}
code = {
Expand Down
6 changes: 0 additions & 6 deletions ...pse.xtext.tests/testdata/wizard-expectations/full/full.parent/gradle/source-layout.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,3 @@ jar {
attributes 'Bundle-SymbolicName': project.name
}
}

plugins.withId('war') {
war {
webAppDirectory = file("WebRoot")
}
}
1 change: 0 additions & 1 deletion org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include 'full'
include 'full.ide'
include 'full.web'
include 'full.tests'
23 changes: 0 additions & 23 deletions ...pse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle.web/build.gradle
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...gradle/gradle.parent/gradle/.launch/Generate MyDsl (mydsl) Language Infrastructure.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<listAttribute key="tasks">
<listEntry value="build"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/gradle.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle.web&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/gradle.parent&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/gradle.tests&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/gradle}"/>
</launchConfiguration>
6 changes: 0 additions & 6 deletions ...xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/gradle/source-layout.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,3 @@ jar {
attributes 'Bundle-SymbolicName': project.name
}
}

plugins.withId('war') {
war {
webAppDirectory = file("src/main/webapp")
}
}
2 changes: 1 addition & 1 deletion ...ta/wizard-expectations/gradle/gradle.parent/gradle/src/main/java/mydsl/GenerateMyDsl.mwe2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Workflow {
runtimeTest = {
enabled = true
}
web = {
genericIde = {
enabled = true
}
mavenLayout = true
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.tests/testdata/wizard-expectations/gradle/gradle.parent/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
include 'gradle'
include 'gradle.ide'
include 'gradle.web'
6 changes: 0 additions & 6 deletions ...s/testdata/wizard-expectations/lsGradleApp/lsGradleApp.parent/gradle/source-layout.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,3 @@ jar {
attributes 'Bundle-SymbolicName': project.name
}
}

plugins.withId('war') {
war {
webAppDirectory = file("WebRoot")
}
}
6 changes: 0 additions & 6 deletions ...data/wizard-expectations/lsGradleFatjar/lsGradleFatjar.parent/gradle/source-layout.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,3 @@ jar {
attributes 'Bundle-SymbolicName': project.name
}
}

plugins.withId('war') {
war {
webAppDirectory = file("WebRoot")
}
}
Loading
Loading