Used releng template of xtext 2.10.0

parent 5c09aa26
......@@ -150,7 +150,7 @@
definitionId="de.cau.se.teetime.configuration.dsl.Config.Editor.opened">
</reference>
</visibleWhen>
</command>
</command>
</menuContribution>
<!-- copy qualified name -->
<menuContribution locationURI="popup:#TextEditorContext?after=copy">
......@@ -159,7 +159,7 @@
<visibleWhen checkEnabled="false">
<reference definitionId="de.cau.se.teetime.configuration.dsl.Config.Editor.opened" />
</visibleWhen>
</command>
</command>
</menuContribution>
<menuContribution locationURI="menu:edit?after=copy">
<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
......@@ -167,7 +167,7 @@
<visibleWhen checkEnabled="false">
<reference definitionId="de.cau.se.teetime.configuration.dsl.Config.Editor.opened" />
</visibleWhen>
</command>
</command>
</menuContribution>
<menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
......@@ -213,10 +213,10 @@
</parser>
</extension>
<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
<resourceServiceProvider
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
uriExtension="config">
</resourceServiceProvider>
<resourceServiceProvider
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
uriExtension="config">
</resourceServiceProvider>
</extension>
<!-- marker definitions for de.cau.se.teetime.configuration.dsl.Config -->
<extension
......@@ -323,31 +323,31 @@
</extension>
<!-- quickfix marker resolution generator for de.cau.se.teetime.configuration.dsl.Config -->
<extension
point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.se.teetime.configuration.dsl.ui.config.check.fast">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
<markerResolutionGenerator
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.se.teetime.configuration.dsl.ui.config.check.normal">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
<markerResolutionGenerator
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.se.teetime.configuration.dsl.ui.config.check.expensive">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
point="org.eclipse.ui.ide.markerResolution">
<markerResolutionGenerator
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.se.teetime.configuration.dsl.ui.config.check.fast">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
<markerResolutionGenerator
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.se.teetime.configuration.dsl.ui.config.check.normal">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
<markerResolutionGenerator
class="de.cau.se.teetime.configuration.dsl.ui.ConfigExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
markerType="de.cau.se.teetime.configuration.dsl.ui.config.check.expensive">
<attribute
name="FIXABLE_KEY"
value="true">
</attribute>
</markerResolutionGenerator>
</extension>
<!-- Rename Refactoring -->
<extension point="org.eclipse.ui.handlers">
......
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.9.2" modelDirectory="/de.cau.se.teetime.configuration.dsl/src-gen"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.10.0" modelDirectory="/de.cau.se.teetime.configuration.dsl/src-gen"
modelPluginID="de.cau.se.teetime.configuration.dsl" forceOverwrite="true" modelName="Config"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.11">
......
......@@ -4,7 +4,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.configuration.teetime/dsl/Config"
class = "teetime.configuration.dsl.config.ConfigPackage"
class = "de.cau.se.teetime.configuration.dsl.config.ConfigPackage"
genModel = "model/generated/Config.genmodel" />
</extension>
<extension
......
......@@ -15,16 +15,132 @@
<version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<!-- Generate Xtend code. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<executions>
<execution>
<id>mwe2Launcher</id>
<phase>generate-sources</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
<arguments>
<argument>/${project.basedir}/src/de/cau/se/teetime/configuration/dsl/GenerateConfig.mwe2</argument>
<argument>-p</argument>
<argument>rootPath=/${project.basedir}/..</argument>
</arguments>
<classpathScope>compile</classpathScope>
<includePluginDependencies>true</includePluginDependencies>
<cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
</configuration>
<dependencies>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.8.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtend.compiler.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets combine.children="append">
<fileset>
<directory>${basedir}/../${project.artifactId}/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../../tests/${project.artifactId}.tests/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ide/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../${project.artifactId}.ui/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/../../tests${project.artifactId}.ui.tests/src-gen/</directory>
<includes>
<include>**/*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/model/generated/</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.mojo
</groupId>
<artifactId>
exec-maven-plugin
</artifactId>
<versionRange>
[1.2.1,)
</versionRange>
<goals>
<goal>java</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
\ No newline at end of file
......@@ -8,32 +8,6 @@ var rootPath = ".."
var runtimeProject = "../de.cau.se.teetime.configuration.dsl"
Workflow {
bean = StandaloneSetup {
// use an XtextResourceset throughout the process, which is able to resolve classpath:/ URIs.
resourceSet = org.eclipse.xtext.resource.XtextResourceSet:theResourceSet {}
// add mappings from platform:/resource to classpath:/
uriMap = {
from = "platform:/resource/org.eclipse.xtext.xbase/"
to = "classpath:/"
}
uriMap = {
from = "platform:/resource/org.eclipse.xtext.common.types/"
to = "classpath:/"
}
// for builds without .project file
// projectMapping = {
// projectName = '${projectName}'
// path = '${runtimeProject}'
// }
// register current projects and its siblings for platform URI map, as they are not on the classpath.
platformUri = "${runtimeProject}/.."
// The following two lines can be removed, if Xbase is not used.
registerGeneratedEPackage = "org.eclipse.xtext.xbase.XbasePackage"
registerGenModelFile = "platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel"
}
component = XtextGenerator {
configuration = {
project = StandardProjectConfig {
......@@ -41,14 +15,14 @@ Workflow {
rootPath = rootPath
runtimeTest = {
enabled = true
root = "../../tests/de.cau.se.teetime.configuration.dsl.tests"
root = "../tests/de.cau.se.teetime.configuration.dsl.tests"
}
eclipsePlugin = {
enabled = true
}
eclipsePluginTest = {
enabled = true
root = "../../tests/de.cau.se.teetime.configuration.dsl.ui.tests"
root = "../tests/de.cau.se.teetime.configuration.dsl.ui.tests"
}
createEclipseMetaData = true
}
......
......@@ -11,10 +11,10 @@ Require-Bundle: javax.inject,
org.eclipse.elk.core;bundle-version="0.1.0",
org.eclipse.elk.graph,
org.eclipse.elk.alg.layered,
de.cau.cs.kieler.klighd.krendering.extensions,
de.cau.cs.kieler.klighd;bundle-version="0.10.0",
de.cau.cs.kieler.klighd.ui,
de.cau.cs.kieler.klighd.piccolo,
de.cau.cs.kieler.klighd.krendering.extensions;bundle-version="0.8.0",
org.eclipse.ui,
org.eclipse.ui.ide.application,
org.eclipse.ui.navigator.resources,
......
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.cau.se.teetime</groupId>
<artifactId>features</artifactId>
<artifactId>de.cau.se.teetime.features</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -23,10 +23,10 @@
<import plugin="org.eclipse.elk.core"/>
<import plugin="org.eclipse.elk.graph"/>
<import plugin="org.eclipse.elk.alg.layered"/>
<import plugin="de.cau.cs.kieler.klighd.krendering.extensions"/>
<import plugin="de.cau.cs.kieler.klighd"/>
<import plugin="de.cau.cs.kieler.klighd.ui"/>
<import plugin="de.cau.cs.kieler.klighd.piccolo"/>
<import plugin="de.cau.cs.kieler.klighd.krendering.extensions"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.ide.application"/>
<import plugin="org.eclipse.ui.navigator.resources"/>
......@@ -34,10 +34,12 @@
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.emf"/>
<import plugin="org.eclipse.xtext.ui"/>
<import plugin="de.cau.se.teetime.configuration.dsl" version="0.1.0" match="greaterOrEqual"/>
<import plugin="de.cau.se.teetime.configuration.dsl"/>
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.core.contenttype"/>
<import plugin="de.cau.cs.kieler.klighd.ui.contrib3x"/>
<import plugin="org.eclipse.elk.core.service"/>
<import plugin="de.cau.cs.kieler.klighd.krendering"/>
</requires>
<plugin
......
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.cau.se.teetime</groupId>
<artifactId>features</artifactId>
<artifactId>de.cau.se.teetime.features</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>de.cau.se.teetime</groupId>
<artifactId>features</artifactId>
<artifactId>de.cau.se.teetime.features</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
......
......@@ -11,6 +11,6 @@
Cool TeeTime stuff
</description>
</category-def>
<repository-reference location="http://download.eclipse.org/elk/updates/releases/0.1.0/" enabled="true" />
<repository-reference location="http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2016-07/" enabled="true" />
<repository-reference location="http://download.eclipse.org/elk/updates/releases/0.1.0/" enabled="true" />
</site>
......@@ -7,7 +7,60 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>de.cau.se.teetime</groupId>
<artifactId>updatesite</artifactId>
<artifactId>de.cau.se.teetime.updatesite</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<pluginRepositories>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
</pluginRepository>
<pluginRepository>
<id>jboss-snapshots-repository</id>
<name>JBoss Snapshots Repository</name>
<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<properties>
<update.site.name>TeeTime</update.site.name>
<update.site.description>Nightly</update.site.description>
<update.site.version>2016-08</update.site.version>
<target.eclipse.version>4.5 (Mars)</target.eclipse.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
<version>0.23.3</version>
<executions>
<execution>
<id>generate-facade</id>
<phase>package</phase>
<goals>
<goal>generate-repository-facade</goal>
</goals>
<configuration>
<associateSites>
<associateSite>http://download.eclipse.org/elk/updates/releases/0.1.0/</associateSite>
<associateSite>http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2016-07/</associateSite>
</associateSites>
<siteTemplateFolder>siteTemplate</siteTemplateFolder>
<symbols>
<update.site.name>${update.site.name}</update.site.name>
<update.site.description>${update.site.description}</update.site.description>
<update.site.version>${update.site.version}</update.site.version>
<target.eclipse.version>${target.eclipse.version}</target.eclipse.version>
</symbols>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
<html>
<head>
<title>${update.site.name} - ${update.site.description} Update Site: ${update.site.version}</title>
<link rel="stylesheet" type="text/css" href="web/site.css">
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<center>
<table cellspacing="0" cellpadding="0" class="table">
<tr>
<td>
<h2 class="title"><br/><br/>${update.site.name} - ${update.site.description} Update Site</h2>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span>Latest Build: ${update.site.version}</span></td>
</tr>
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">
This is the <b>${update.site.description}</b>
Update Site for ${update.site.name}.
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To install from this site, start up Eclipse ${target.eclipse.version}, then do:
<ul>
<code><strong>Help > Install New Software... ></strong></code>
</ul>
</li>
<li>Copy this site's URL into Eclipse, and hit Enter.</li>
<li>
When the site loads, select the features to install,
or click the <code><strong>Select All</strong></code> button.</li>
<li>
To properly resolve all dependencies, check
<ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
</li>
<li>Click <code><strong>Next</strong></code>, agree to the license terms, and install.</li>
</ol>
</blockquote>
</td>
</tr>
</table>
</td>
</tr>
</table>
</center>
</html>
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment