diff --git a/CODEOWNERS b/CODEOWNERS index 508ee364fc..1589f7bb68 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -10,9 +10,6 @@ /com.avaloq.tools.ddk.check.*/** @dsldevkit/sca /com.avaloq.tools.ddk.checkcfg.*/** @dsldevkit/sca -# Valid DSL (obsolete SCA) -/com.avaloq.tools.ddk.xtext.valid*/** @dsldevkit/sca - # Generating workflow /com.avaloq.tools.ddk.workflow/** @dsldevkit/codeowners diff --git a/README.md b/README.md index 71f37e8bfb..fc6ee7a635 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,6 @@ You can find more detailed documentation and examples at [ddk.tools.avaloq.com]( | com.avaloq.tools.ddk.xtext.checkcfg.\* | Check Configuration DSL | | com.avaloq.tools.ddk.xtext.scope.\* | Scope DSL | | com.avaloq.tools.ddk.xtext.export.\* | Export DSL | -| com.avaloq.tools.ddk.xtext.valid.\* | obsolete and is replaced by Check DSL | | com.avaloq.tools.ddk.typesystem | Basics for building a typesystem for a DSL | | com.avaloq.tools.ddk.test.\* | Support for writing tests for DSLs | | com.avaloq.tools.ddk.xtextspy.\* | View to support debugging a DSL | diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/Ddk.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/Ddk.mwe2 index f8bba783db..2ee7e087fe 100644 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/Ddk.mwe2 +++ b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/Ddk.mwe2 @@ -18,7 +18,6 @@ Workflow { component = @ Scope {} component = @ Check {} component = @ CheckCfg {} - component = @ Valid {} component = @ TypeModel {} component = @ ModelInference {} } diff --git a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 b/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 deleted file mode 100644 index 6bf233e44e..0000000000 --- a/com.avaloq.tools.ddk.workflow/src/com/avaloq/tools/ddk/workflow/GenerateValid.mwe2 +++ /dev/null @@ -1,165 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Avaloq Group AG and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Avaloq Group AG - initial API and implementation - *******************************************************************************/ -module Valid - -import org.eclipse.emf.mwe.utils.* -import org.eclipse.xtext.ui.generator.* - -import com.avaloq.tools.ddk.xtext.* -import com.avaloq.tools.ddk.xtext.generator.* -import com.avaloq.tools.ddk.xtext.generator.ui.* - -import com.avaloq.tools.foundation.xtext.generator.* -import com.avaloq.tools.foundation.xtext.generator.ui.* - -import com.avaloq.tools.ddk.* - -var languageName = "Valid" -var baseName = "Valid" -var grammar = "valid" -var grammarURI = "classpath:/com/avaloq/tools/ddk/xtext/${grammar}/${baseName}.xtext" -var editorFileExtensions = "valid" - -var baseProjectName = "com.avaloq.tools.ddk.xtext" - -var projectNameRt = "${baseProjectName}.${grammar}" -var projectNameUi = "${baseProjectName}.${grammar}.ui" -var projectNameIde = "${baseProjectName}.${grammar}.ide" - -var runtimeProject = "../${projectNameRt}" -var ideProject = "../${projectNameIde}" -var uiProject = "../${projectNameUi}" - -var projectName = "${baseProjectName}.${grammar}" -var rootPath = ".." -var modelDirectory = "metamodel/com/avaloq/tools/ddk/xtext/${grammar}" -var metamodelPlugin = "com.avaloq.tools.ddk.xtext.${grammar}" -var metamodelBase = "platform:/resource/${metamodelPlugin}" - -Workflow { - - bean = com.avaloq.tools.ddk.xtext.generator.util.StandaloneSetup { - resourceSet = org.eclipse.xtext.resource.XtextResourceSet : resourceSet {} - platformUri = "${runtimeProject}/.." - scanClassPath = true - uriMap = {from = "platform:/plugin/" to = "platform:/resource/"} - registerGenModelFile = "platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel" - registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel" - registerGenModelFile = "platform:/resource/com.avaloq.tools.ddk.xtext.expression/metamodel/com/avaloq/tools/ddk/xtext/expression/Expression.genmodel" - registerEcoreFile = "${metamodelBase}/${modelDirectory}/${baseName}.ecore" - registerGenModelFile = "${metamodelBase}/${modelDirectory}/${baseName}.genmodel" - } - - component = DirectoryCleaner { - directory = "${runtimeProject}/src-gen" - } - - component = DirectoryCleaner { - directory = "${ideProject}/src-gen" - } - - component = DirectoryCleaner { - directory = "${uiProject}/src-gen" - } - - component = org.eclipse.xtext.xtext.generator.XtextGenerator { - configuration = GeneratorModule { - project = generator.model.project.ProjectConfig { - baseName = projectName - rootPath = rootPath - runtimeSuffix = "" - forceDisableIdeProject = false - runtimeTest = { - enabled = false - } - eclipsePlugin = { - enabled = true - } - eclipsePluginTest = { - enabled = false - } - createEclipseMetaData = true - } - code = { - encoding = "UTF-8" - lineDelimiter = "\n" - fileHeader = "/*\n * generated by Xtext\n */" - preferXtendStubs = false - } - } - - language = com.avaloq.tools.ddk.workflow.ExtendedLanguageConfig { - resourceSet = resourceSet - grammarUri = grammarURI - languageName = languageName - fileExtensions = editorFileExtensions - - // Java API to access grammar elements (required by several other fragments) - fragment = org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2 {} - - fragment = com.avaloq.tools.ddk.xtext.generator.ecore.EcoreGeneratorFragment2 { - genModel = "${metamodelBase}/${modelDirectory}/${baseName}.genmodel" - suppressSrcPath = "../com.avaloq.tools.ddk.typesystem/src" // Sure no relevant *ImplCustom - suppressSrcPath = "../org.eclipse.emf.ecore/src" - suppressSrcPath = "../org.eclipse.xtext.xbase/src" - suppressSrcPath = "../org.eclipse.xtext/src" - suppressSrcPath = "../org.eclipse.xtext.common.types/src" - generateEdit = false - } - - // the serialization component - fragment = org.eclipse.xtext.xtext.generator.serializer.SerializerFragment2 {} - - // a custom ResourceFactory for use with EMF - fragment = org.eclipse.xtext.xtext.generator.resourceFactory.ResourceFactoryFragment2 {} - - // the following fragment generates an Antlr parser --> - fragment = org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2 {} - - // java-based API for validation - fragment = org.eclipse.xtext.xtext.generator.validation.ValidatorFragment2 {} - - // scoping and exporting API - fragment = org.eclipse.xtext.xtext.generator.scoping.ImportNamespacesScopingFragment2 {} - fragment = org.eclipse.xtext.xtext.generator.exporting.SimpleNamesFragment2 {} - fragment = org.eclipse.xtext.xtext.generator.builder.BuilderIntegrationFragment2 {} - - // formatter API - fragment = org.eclipse.xtext.xtext.generator.formatting.Formatter2Fragment2 { - generateStub = false - } - - // labeling API - fragment = org.eclipse.xtext.xtext.generator.ui.labeling.LabelProviderFragment2 {} - - // outline API - fragment = org.eclipse.xtext.xtext.generator.ui.outline.OutlineTreeProviderFragment2 {} - fragment = org.eclipse.xtext.xtext.generator.ui.outline.QuickOutlineFragment2 {} - - // quickfix API - fragment = org.eclipse.xtext.xtext.generator.ui.quickfix.QuickfixProviderFragment2 {} - - // content assist API - fragment = org.eclipse.xtext.xtext.generator.ui.contentAssist.ContentAssistFragment2 {} - - // provides a compare view - fragment = org.eclipse.xtext.xtext.generator.ui.compare.CompareFragment2 {} - - fragment = BundleVersionStripperFragment { - bundle = "org.antlr.runtime" - bundle = "org.eclipse.xtext.xbase.lib" - bundle = "org.eclipse.xtend.lib" - bundle = "org.objectweb.asm" - } - - } - } -}