[527497] Upgrading CPS demonstrator for VIATRA 2.0
Most important changes:
* VIATRA dependency ranges updated
* MWE demonstration removed with corresponding base functionality
* Minimum Java version increased to Java 8
* Removed references to deprecated VIATRA APIs
* Updated version number to 2.0
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.classpath b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.classpath
deleted file mode 100644
index 248b4c5..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.project b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.project
deleted file mode 100644
index 490d896..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.viatra.examples.cps.mwe2integration.example</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.settings/org.eclipse.jdt.core.prefs b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de36..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/META-INF/MANIFEST.MF
deleted file mode 100644
index 87a664e..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CPS VIATRA MWE2 integration example
-Bundle-SymbolicName: org.eclipse.viatra.examples.cps.mwe2integration.example
-Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: IncQueryLabs Ltd.
-Export-Package: org.eclipse.viatra.examples.cps.integration,
- org.eclipse.viatra.examples.cps.integration.batch,
- org.eclipse.viatra.examples.cps.integration.eventdriven,
- org.eclipse.viatra.examples.cps.integration.messages
-Require-Bundle: org.eclipse.emf.mwe2.launch,
- org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.xform.m2t.distributed;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.generator.tests,
- org.eclipse.viatra.examples.cps.xform.serializer,
- org.eclipse.viatra.examples.cps.xform.serializer.javaio,
- org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;bundle-version="0.1.0",
- org.eclipse.xtend.lib;bundle-version="2.9.0",
- org.eclipse.viatra.integration.mwe2;bundle-version="[0.13.0,0.18.0)",
- org.eclipse.viatra.transformation.evm,
- org.eclipse.core.resources;bundle-version="3.10.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/build.properties b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/build.properties
deleted file mode 100644
index d8e2f0e..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/,\
- xtend-gen/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/pom.xml
deleted file mode 100644
index c4ccba4..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
- <groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>org.eclipse.viatra.examples.cps.mwe2integration.example</artifactId>
- <packaging>eclipse-plugin</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
- <executions>
- <execution>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <filesets>
- <fileset>
- <directory>src-gen</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileset>
- <fileset>
- <directory>xtend-gen</directory>
- <excludes>
- <exclude>.gitignore</exclude>
- </excludes>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- <version>${xtend.compiler.version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/ChangeMonitorTransformationStep.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/ChangeMonitorTransformationStep.java
deleted file mode 100644
index 40aa736..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/ChangeMonitorTransformationStep.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration;
-
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-import org.eclipse.viatra.examples.cps.deployment.Deployment;
-import org.eclipse.viatra.examples.cps.traceability.CPSToDeployment;
-import org.eclipse.viatra.examples.cps.xform.m2t.monitor.DeploymentChangeDelta;
-import org.eclipse.viatra.examples.cps.xform.m2t.monitor.DeploymentChangeMonitor;
-import org.eclipse.viatra.integration.mwe2.IPublishTo;
-import org.eclipse.viatra.integration.mwe2.mwe2impl.TransformationStep;
-
-public class ChangeMonitorTransformationStep extends TransformationStep {
- protected AdvancedViatraQueryEngine engine;
- protected DeploymentChangeMonitor monitor;
- protected DeploymentChangeDelta delta;
-
- @Override
- public void doInitialize(IWorkflowContext ctx) {
- // create transformation
- System.out.println("Initialized change monitor");
- engine = (AdvancedViatraQueryEngine) ctx.get("engine");
- Deployment deployment = ((CPSToDeployment) ctx.get("model")).getDeployment();
- monitor = new DeploymentChangeMonitor(deployment, engine);
- try {
- monitor.startMonitoring();
- } catch (ViatraQueryException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void doExecute() {
- delta = monitor.createCheckpoint();
- System.out.println("Checkpoint created");
- }
-
- @Override
- public void publishMessages() {
- for (IPublishTo iPublishTo : publishTo) {
- iPublishTo.publishMessage(delta);
- }
- }
-
- @Override
- public void dispose() {
- System.out.println("Disposed change monitor");
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/InitializerComponent.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/InitializerComponent.java
deleted file mode 100644
index fc1c814..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/InitializerComponent.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowComponent;
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.examples.cps.generator.CPSPlanBuilder;
-import org.eclipse.viatra.examples.cps.generator.dtos.AppClass;
-import org.eclipse.viatra.examples.cps.generator.dtos.BuildableCPSConstraint;
-import org.eclipse.viatra.examples.cps.generator.dtos.CPSFragment;
-import org.eclipse.viatra.examples.cps.generator.dtos.CPSGeneratorInput;
-import org.eclipse.viatra.examples.cps.generator.dtos.GeneratorPlan;
-import org.eclipse.viatra.examples.cps.generator.dtos.HostClass;
-import org.eclipse.viatra.examples.cps.generator.dtos.MinMaxData;
-import org.eclipse.viatra.examples.cps.generator.dtos.Percentage;
-import org.eclipse.viatra.examples.cps.generator.exceptions.ModelGeneratorException;
-import org.eclipse.viatra.examples.cps.generator.dtos.constraints.ICPSConstraints;
-import org.eclipse.viatra.examples.cps.generator.utils.CPSModelBuilderUtil;
-import org.eclipse.viatra.examples.cps.planexecutor.PlanExecutor;
-import org.eclipse.viatra.examples.cps.traceability.CPSToDeployment;
-import org.eclipse.viatra.examples.cps.xform.serializer.DefaultSerializer;
-import org.eclipse.viatra.examples.cps.xform.serializer.javaio.JavaIOBasedFileAccessor;
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.emf.EMFScope;
-import org.eclipse.viatra.query.runtime.exception.ViatraQueryException;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-public class InitializerComponent implements IWorkflowComponent {
- protected int modelSize;
- private int seed = 11111;
- private String modelDir;
- private String modelName = "MWE_TEST";
- private String outputProjectName;
- private String outputProjectLocation;
-
- public int getModelSize() {
- return modelSize;
- }
-
- public void setModelSize(String modelSize) {
- try {
- this.modelSize = Integer.parseInt(modelSize);
- } catch (Exception e) {
- this.modelSize = 4;
- }
-
- }
-
- public int getSeed() {
- return seed;
- }
-
- public void setSeed(String seed) {
- try {
- this.seed = Integer.parseInt(seed);
- } catch (Exception e) {
- this.seed = 4;
- }
-
- }
-
- public String getOutputProjectLocation() {
- return outputProjectLocation;
- }
-
- public void setOutputProjectLocation(String outputProjectLocation) {
- this.outputProjectLocation = outputProjectLocation;
- }
-
- public String getModelName() {
- return modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public String getModelDir() {
- return modelDir;
- }
-
- public void setModelDir(String modelDir) {
- this.modelDir = modelDir;
- }
-
- public String getOutputProjectName() {
- return outputProjectName;
- }
-
- public void setOutputProjectName(String outputProjectName) {
- this.outputProjectName = outputProjectName;
- }
-
- @Override
- public void preInvoke() {
-
- }
-
- @Override
- public void invoke(IWorkflowContext ctx) {
- CPSModelBuilderUtil modelBuilderUtil = new CPSModelBuilderUtil();
- DefaultSerializer serializer = new DefaultSerializer();
-
- String locationString = (String) ctx.get("projectLocation");
- if(locationString != null){
- outputProjectLocation = locationString;
- }
- modelDir = outputProjectLocation+"\\"+outputProjectName+"\\"+"model";
-
-
- // //////////////////////////////////
- // //// EMF initialization phase
- // //////////////////////////////////
-
- Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION,
- new XMIResourceFactoryImpl());
-
- CPSToDeployment cps2dep = modelBuilderUtil.preparePersistedCPSModel(URI.createFileURI(modelDir), modelName);
-
- // //////////////////////////////////
- // //// Generation phase
- // //////////////////////////////////
- if (ctx.get("modelsize") != null) {
- modelSize = (Integer) ctx.get("modelsize");
- }
-
- AdvancedViatraQueryEngine engine = null;
- try {
-
- CPSGeneratorInput input = new CPSGeneratorInput(seed, getConstraints(modelSize), cps2dep.getCps());
- GeneratorPlan plan = CPSPlanBuilder.buildCharacteristicBasedPlan();
- PlanExecutor<CPSFragment, CPSGeneratorInput> generator = new PlanExecutor<CPSFragment, CPSGeneratorInput>();
-
- CPSFragment fragment = generator.process(plan, input);
- fragment.getEngine().dispose();
-
- engine = AdvancedViatraQueryEngine.createUnmanagedEngine(new EMFScope(cps2dep.eResource().getResourceSet()));
- } catch (ViatraQueryException e) {
- e.printStackTrace();
- }
-
- serializer.createProject(outputProjectLocation, outputProjectName, new JavaIOBasedFileAccessor());
- File project = new File(outputProjectLocation, outputProjectName);
- File srcFolder = new File(project.getAbsolutePath(), "src");
- for (File file : srcFolder.listFiles()) {
- file.delete();
- }
-
- ctx.put("engine", engine);
- ctx.put("model", cps2dep);
- ctx.put("projectname", outputProjectName);
- ctx.put("projectPath", project.getAbsolutePath());
- ctx.put("folder", srcFolder.getAbsolutePath());
- }
-
- @Override
- public void postInvoke() {
- }
-
- protected ICPSConstraints getConstraints(int scale) {
- List<HostClass> classList = createHostClassList(scale);
-
- int signalCount = 143;
- BuildableCPSConstraint cons = new BuildableCPSConstraint("Statistics-based Case", new MinMaxData<Integer>(
- signalCount, signalCount), createAppClassList(scale, classList), classList);
-
- return cons;
- }
-
- private List<HostClass> createHostClassList(int scale) {
- List<HostClass> hostClasses = Lists.newArrayList();
-
- // 1 for the empty, and scale for the host instances with allocated application instances
- int instEmptyCount = scale * 22;
- int instAppContainerCount = scale * 4;
- int comCount = instAppContainerCount - 1;
-
- // TODO should we randomize the number of host communication for the hosts without allocated applications
- int emptyHostCommunicationCount = scale * 2;
-
- Map<HostClass, Integer> emptyHostConnection = Maps.newHashMap();
- HostClass emptyHostClass = new HostClass("HC_empty", // name
- new MinMaxData<Integer>(1, 1), // Type
- new MinMaxData<Integer>(instEmptyCount, instEmptyCount), // Instance
- new MinMaxData<Integer>(emptyHostCommunicationCount, emptyHostCommunicationCount), // ComLines
- emptyHostConnection);
- hostClasses.add(emptyHostClass);
-
- List<HostClass> appContainerClasses = Lists.newArrayList();
- for (int i = 0; i < scale; i++) {
-
- // The application container host instances of the same type will form a complete graph of 4
- // when only taking the communicatesWith relation
- Map<HostClass, Integer> appContainerConnection = Maps.newHashMap();
- HostClass appContainerHostClass = new HostClass("HC_appContainer" + i, // name
- new MinMaxData<Integer>(1, 1), // Type
- new MinMaxData<Integer>(instAppContainerCount, instAppContainerCount), // Instance
- new MinMaxData<Integer>(comCount, comCount), // ComLines
- appContainerConnection);
- appContainerConnection.put(appContainerHostClass, 1);
-
- hostClasses.add(appContainerHostClass);
- appContainerClasses.add(appContainerHostClass);
- }
-
- // Communications:
- // App containers only communicate with each other, the empty hosts might communicate with any instance
- emptyHostConnection.put(emptyHostClass, 1);
- for (HostClass appContainerClass : appContainerClasses) {
- emptyHostConnection.put(appContainerClass, 1);
- }
-
- return hostClasses;
- }
-
- private List<AppClass> createAppClassList(int scale, List<HostClass> hostClasses) {
- List<AppClass> appClasses = Lists.newArrayList();
-
- double expectedValueOfTypes = scale * 52;
-
- // Every class will have 1 or 2 types, so that the expected value of the appTypes will be the
- // expectedValueOfTypes using the formula below
- double appClassCount = 2 * expectedValueOfTypes / 3;
-
- // alloc ratios - allocate only to the second host type
- Map<HostClass, Integer> allocRatios = Maps.newHashMap();
- List<HostClass> hostClassesList = hostClasses;
- HostClass emptyHostClass = hostClassesList.get(0);
-
- // The first in the list is the empty host class, the instances of the others should contain app instances
- for (HostClass hostClass : hostClasses) {
- if (hostClass.equals(emptyHostClass)) {
- allocRatios.put(hostClass, 0);
- } else {
- allocRatios.put(hostClass, 1);
- }
- }
-
- int appTypeMinCount = 1;
- int appTypeMaxCount = 2;
-
- // Each app type will have 1 instance to have an assignment between AppType and HostInstance
- int appInstCount = 1;
-
- try {
- // Half of the app types will not have state machine, the other half will have
- for (int i = 0; i < appClassCount / 2; i++) {
- appClasses.add(new AppClass("AC_withoutStateMachine" + i, new MinMaxData<Integer>(appTypeMinCount,
- appTypeMaxCount), // AppTypes
- new MinMaxData<Integer>(appInstCount, appInstCount), // AppInstances
- new MinMaxData<Integer>(0, 0), // States
- new MinMaxData<Integer>(0, 0), // Transitions
- new Percentage(100), // Alloc
- allocRatios, new Percentage(0), // Action
- new Percentage(0) // Send
- ));
- }
- for (int i = 0; i < appClassCount / 2; i++) {
- appClasses.add(new AppClass("AC_withStateMachine" + i, new MinMaxData<Integer>(appTypeMinCount,
- appTypeMaxCount), // AppTypes
- new MinMaxData<Integer>(appInstCount, appInstCount), // AppInstances
- new MinMaxData<Integer>(3, 3), // States
- new MinMaxData<Integer>(7, 8), // Transitions
- new Percentage(100), // Alloc
- allocRatios, new Percentage(50), // Action
- new Percentage(50) // Send
- ));
- }
- } catch (ModelGeneratorException e) {
- e.printStackTrace();
- }
-
- return appClasses;
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/M2TDistributedTransformationStep.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/M2TDistributedTransformationStep.java
deleted file mode 100644
index 68cf949..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/M2TDistributedTransformationStep.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration;
-
-import java.util.List;
-
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
-import org.eclipse.viatra.examples.cps.xform.m2t.api.ChangeM2TOutputProvider;
-import org.eclipse.viatra.examples.cps.xform.m2t.api.ICPSGenerator;
-import org.eclipse.viatra.examples.cps.xform.m2t.api.M2TOutputRecord;
-import org.eclipse.viatra.examples.cps.xform.m2t.distributed.CodeGenerator;
-import org.eclipse.viatra.examples.cps.xform.m2t.monitor.DeploymentChangeDelta;
-import org.eclipse.viatra.integration.mwe2.IPublishTo;
-import org.eclipse.viatra.integration.mwe2.mwe2impl.TransformationStep;
-
-public class M2TDistributedTransformationStep extends TransformationStep {
- protected AdvancedViatraQueryEngine engine;
- public ICPSGenerator generator;
- public String projectName;
- public String sourceFolder;
- public List<M2TOutputRecord> output;
- public DeploymentChangeDelta delta;
-
-
- @Override
- public void doInitialize(IWorkflowContext ctx) {
- System.out.println("Initialized model-to-text transformation");
- engine = (AdvancedViatraQueryEngine) ctx.get("engine");
- projectName = (String) ctx.get("projectname");
- sourceFolder = (String) ctx.get("folder");
- generator = new CodeGenerator(projectName,engine,true);
-
- }
-
- @Override
- public void doExecute() {
- ChangeM2TOutputProvider provider = new ChangeM2TOutputProvider(delta, generator, sourceFolder);
- output = provider.generateChanges();
- System.out.println("Model-to-text transformation executed");
- }
-
- @Override
- public void publishMessages() {
- for (IPublishTo iPublishTo : publishTo) {
- iPublishTo.publishMessage(output);
- }
- }
-
- @Override
- public void dispose() {
- System.out.println("Disposed model-to-text transformation");
-
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/ModelModifierStep.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/ModelModifierStep.java
deleted file mode 100644
index 540e8cd..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/ModelModifierStep.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.examples.cps.generator.utils.CPSModelBuilderUtil;
-import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.ApplicationType;
-import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.HostInstance;
-import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.HostType;
-import org.eclipse.viatra.examples.cps.traceability.CPSToDeployment;
-import org.eclipse.viatra.integration.mwe2.mwe2impl.TransformationStep;
-
-public class ModelModifierStep extends TransformationStep{
- protected CPSToDeployment model;
- protected CPSModelBuilderUtil modelBuilder = new CPSModelBuilderUtil();
-
- @Override
- public void doInitialize(IWorkflowContext ctx) {
- model = (CPSToDeployment) ctx.get("model");
- }
-
- @Override
- public void doExecute() {
- modifyModel();
- System.out.println("Model modification executed");
-
- }
-
- @Override
- public void dispose() {
- System.out.println("Disposed model modifier");
- }
-
- private void modifyModel(){
- ApplicationType appType = null;
- EList<ApplicationType> appTypes = model.getCps().getAppTypes();
-// if(!appTypes.isEmpty()){
-// appType = appTypes.get(0);
-// }
- for (ApplicationType applicationType : appTypes) {
- if(applicationType.getIdentifier().contains("AC_withStateMachine")){
- appType = applicationType;
- }
- }
-
- HostInstance instance = null;
- EList<HostType> hostTypes = model.getCps().getHostTypes();
-// if(!hostTypes.isEmpty() && !hostTypes.get(0).getInstances().isEmpty()){
-// instance = hostTypes.get(0).getInstances().get(0);
-// }
- for (HostType type : hostTypes) {
- if(type.getIdentifier().contains("HC_appContainer")){
- instance = type.getInstances().get(0);
- }
- }
- if(appType != null && instance !=null){
- modelBuilder.prepareApplicationInstanceWithId(appType,"new.app.instance", instance);
- }
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/SerializerTransformationStep.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/SerializerTransformationStep.java
deleted file mode 100644
index ab05496..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/SerializerTransformationStep.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.examples.cps.xform.m2t.api.IM2TOutputProvider;
-import org.eclipse.viatra.examples.cps.xform.m2t.api.M2TOutputRecord;
-import org.eclipse.viatra.examples.cps.xform.serializer.DefaultSerializer;
-import org.eclipse.viatra.examples.cps.xform.serializer.javaio.JavaIOBasedFileAccessor;
-import org.eclipse.viatra.integration.mwe2.mwe2impl.TransformationStep;
-
-public class SerializerTransformationStep extends TransformationStep {
- public DefaultSerializer serializer;
- public String sourceFolder;
- public List<M2TOutputRecord> m2tOutput;
-
- @Override
- public void doInitialize(IWorkflowContext ctx) {
- System.out.println("Initialized serializer");
- serializer = new DefaultSerializer();
- sourceFolder = (String) ctx.get("folder");
- }
-
- @Override
- public void doExecute() {
- ListBasedOutputProvider provider = new ListBasedOutputProvider(m2tOutput);
- serializer.serialize(sourceFolder, provider, new JavaIOBasedFileAccessor());
-
- System.out.println("Serialization completed");
- }
-
- @Override
- public void dispose() {
- System.out.println("Disposed serializer");
- }
-
- public class ListBasedOutputProvider implements IM2TOutputProvider{
- private List<M2TOutputRecord> records = new ArrayList<M2TOutputRecord>();
-
- public ListBasedOutputProvider(List<M2TOutputRecord> records) {
- super();
- this.records = records;
- }
-
- @Override
- public List<M2TOutputRecord> getOutput() {
- return records;
- }
-
- public void setRecords(List<M2TOutputRecord> records) {
- this.records = records;
- }
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/batch/BatchTransformation.mwe2 b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/batch/BatchTransformation.mwe2
deleted file mode 100644
index 7299222..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/batch/BatchTransformation.mwe2
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-module org.eclipse.viatra.examples.cps.integration.batch
-
-import org.eclipse.viatra.integration.mwe2.*
-import org.eclipse.viatra.integration.mwe2.mwe2impl.*
-import org.eclipse.viatra.examples.cps.integration.*
-import org.eclipse.viatra.examples.cps.integration.batch.*
-import org.eclipse.viatra.examples.cps.integration.messages.*
-
-Workflow {
- component = InitializerComponent{
- modelSize = "4"
- // Specifiy a correct Project Location
- outputProjectLocation = "C:\\MWE_TEST"
- outputProjectName = "VIATRA_BATCH"
- }
-
- component = TransformationChain {
- step = ForLoop{
- iterations = "2"
-
- step = M2MBatchViatraTransformationStep {}
- step = ChangeMonitorTransformationStep{
- publishing = PublishTo{topicName = "M2TTopic" factory = ChangeDeltaMessageFactory{}}
- }
- step = M2TDistributedTransformationStep{
- subscription = SubscribeTo{topicName = "M2TTopic" processor = ChangeDeltaMessageProcessor{}}
- publishing = PublishTo{topicName = "SerializeTopic" factory = M2TOutputMessageFactory{}}
- }
- step = SerializerTransformationStep{
- subscription = SubscribeTo{topicName = "SerializeTopic" processor = M2TOutputMessageProcessor{}}
- }
- step = ModelModifierStep {}
- }
- }
-}
\ No newline at end of file
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/batch/M2MBatchViatraTransformationStep.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/batch/M2MBatchViatraTransformationStep.java
deleted file mode 100644
index 15ffa31..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/batch/M2MBatchViatraTransformationStep.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.batch;
-
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra.CPS2DeploymentBatchViatra;
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
-import org.eclipse.viatra.examples.cps.traceability.CPSToDeployment;
-import org.eclipse.viatra.integration.mwe2.mwe2impl.TransformationStep;
-
-public class M2MBatchViatraTransformationStep extends TransformationStep {
- protected AdvancedViatraQueryEngine engine;
- protected CPS2DeploymentBatchViatra transformation;
-
- @Override
- public void doInitialize(IWorkflowContext ctx) {
- CPSToDeployment cps2dep = (CPSToDeployment) ctx.get("model");
-
- engine = (AdvancedViatraQueryEngine) ctx.get("engine");
- transformation = new CPS2DeploymentBatchViatra();
- transformation.initialize(cps2dep, engine);
-
- System.out.println("Initialized model-to-model transformation");
- }
-
- @Override
- public void doExecute() {
- transformation.execute();
- System.out.println("Model-to-model transformation executed");
- }
-
- @Override
- public void dispose() {
- transformation.dispose();
- System.out.println("Disposed model-to-model transformation");
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/eventdriven/M2MScheduledEventDrivenViatraTransformationStep.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/eventdriven/M2MScheduledEventDrivenViatraTransformationStep.java
deleted file mode 100644
index 95ccef1..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/eventdriven/M2MScheduledEventDrivenViatraTransformationStep.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.eventdriven;
-
-import org.eclipse.emf.mwe2.runtime.workflow.IWorkflowContext;
-import org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.CPS2DeploymentTransformationViatra;
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
-import org.eclipse.viatra.examples.cps.traceability.CPSToDeployment;
-import org.eclipse.viatra.integration.mwe2.eventdriven.MWE2BaseControllableScheduler.MWEBaseControllableSchedulerFactory;
-import org.eclipse.viatra.integration.mwe2.mwe2impl.TransformationStep;
-
-public class M2MScheduledEventDrivenViatraTransformationStep extends TransformationStep {
- protected MWEBaseControllableSchedulerFactory factory;
- protected AdvancedViatraQueryEngine engine;
- protected CPS2DeploymentTransformationViatra transformation;
-
- @Override
- public void doInitialize(IWorkflowContext ctx) {
- CPSToDeployment cps2dep = (CPSToDeployment) ctx.get("model");
- engine = (AdvancedViatraQueryEngine) ctx.get("engine");
- factory = new MWEBaseControllableSchedulerFactory();
- transformation = new CPS2DeploymentTransformationViatra();
- transformation.setScheduler(factory);
- transformation.initialize(cps2dep, engine);
- System.out.println("Initialized model-to-model transformation");
- }
-
- @Override
- public void dispose() {
- transformation.dispose();
- System.out.println("Disposed model-to-model transformation");
- }
-
- @Override
- public void doExecute() {
- factory.run();
- while (!factory.isFinished()) {
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- System.out.println("Model-to-model transformation executed");
-
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/eventdriven/ScheduledEventDrivenTransformation.mwe2 b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/eventdriven/ScheduledEventDrivenTransformation.mwe2
deleted file mode 100644
index f72bb5d..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/eventdriven/ScheduledEventDrivenTransformation.mwe2
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-module org.eclipse.viatra.emf.mwe2integration.transdemo
-
-import org.eclipse.viatra.integration.mwe2.*
-import org.eclipse.viatra.integration.mwe2.mwe2impl.*
-import org.eclipse.viatra.examples.cps.integration.*
-import org.eclipse.viatra.examples.cps.integration.messages.*
-import org.eclipse.viatra.examples.cps.integration.eventdriven.*
-
-Workflow {
- component = InitializerComponent{
- modelSize = "4"
- //Specifiy a correct Project Location
- outputProjectLocation = "C:\\MWE_TEST"
- outputProjectName = "VIATRA_ED_SchedulerBased"
- }
-
- component = TransformationChain {
- step = ForLoop{
- iterations = "2"
-
- step = M2MScheduledEventDrivenViatraTransformationStep {}
- step = ChangeMonitorTransformationStep{
- publishing = PublishTo{topicName = "M2TTopic" factory = ChangeDeltaMessageFactory{}}
- }
- step = M2TDistributedTransformationStep{
- subscription = SubscribeTo{topicName = "M2TTopic" processor = ChangeDeltaMessageProcessor{}}
- publishing = PublishTo{topicName = "SerializeTopic" factory = M2TOutputMessageFactory{}}
- }
- step = SerializerTransformationStep{
- subscription = SubscribeTo{topicName = "SerializeTopic" processor = M2TOutputMessageProcessor{}}
- }
- step = ModelModifierStep {}
- }
- }
-}
\ No newline at end of file
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessage.xtend b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessage.xtend
deleted file mode 100644
index 28cd5c7..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessage.xtend
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.messages
-
-import org.eclipse.viatra.examples.cps.xform.m2t.monitor.DeploymentChangeDelta
-import org.eclipse.viatra.integration.mwe2.IMessage
-
-class ChangeDeltaMessage implements IMessage<DeploymentChangeDelta> {
- DeploymentChangeDelta parameter
-
- new(DeploymentChangeDelta parameter) {
- super()
- this.parameter = parameter
- }
-
- override DeploymentChangeDelta getParameter() {
- return parameter
- }
-
- override void setParameter(DeploymentChangeDelta parameter) {
- this.parameter = parameter
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessageFactory.xtend b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessageFactory.xtend
deleted file mode 100644
index f8674a6..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessageFactory.xtend
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.messages
-
-import org.eclipse.viatra.examples.cps.xform.m2t.monitor.DeploymentChangeDelta
-import org.eclipse.viatra.integration.mwe2.IMessageFactory
-import org.eclipse.viatra.integration.mwe2.mwe2impl.exceptions.InvalidParameterTypeException
-
-class ChangeDeltaMessageFactory implements IMessageFactory<DeploymentChangeDelta, ChangeDeltaMessage> {
- override boolean isValidParameter(Object parameter) {
- if (parameter instanceof DeploymentChangeDelta) {
- return true
- }
- return false
- }
-
- override ChangeDeltaMessage createMessage(Object parameter) throws InvalidParameterTypeException {
- if (isValidParameter(parameter)) {
- return new ChangeDeltaMessage(parameter as DeploymentChangeDelta)
- }
- return null
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessageProcessor.xtend b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessageProcessor.xtend
deleted file mode 100644
index 8b72b35..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/ChangeDeltaMessageProcessor.xtend
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.messages
-
-import java.security.InvalidParameterException
-import org.eclipse.viatra.examples.cps.integration.M2TDistributedTransformationStep
-import org.eclipse.viatra.examples.cps.xform.m2t.monitor.DeploymentChangeDelta
-import org.eclipse.viatra.integration.mwe2.IMessage
-import org.eclipse.viatra.integration.mwe2.IMessageProcessor
-import org.eclipse.viatra.integration.mwe2.ITransformationStep
-
-class ChangeDeltaMessageProcessor implements IMessageProcessor<DeploymentChangeDelta, ChangeDeltaMessage> {
- protected ITransformationStep parent
-
- override ITransformationStep getParent() {
- return parent
- }
-
- override void setParent(ITransformationStep parent) {
- this.parent = parent
- }
-
- override void processMessage(IMessage<? extends Object> message) throws InvalidParameterException {
- if (message instanceof ChangeDeltaMessage) {
- var ChangeDeltaMessage event = (message as ChangeDeltaMessage)
- if (parent instanceof M2TDistributedTransformationStep) {
- var M2TDistributedTransformationStep m2tparent = (parent as M2TDistributedTransformationStep)
- m2tparent.delta = event.getParameter()
- }
- }
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessage.xtend b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessage.xtend
deleted file mode 100644
index c9302be..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessage.xtend
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.messages
-
-import java.util.List
-import org.eclipse.viatra.examples.cps.xform.m2t.api.M2TOutputRecord
-import org.eclipse.viatra.integration.mwe2.IMessage
-
-class M2TOutputMessage implements IMessage<List<M2TOutputRecord>> {
- List<M2TOutputRecord> parameter
-
- new(List<M2TOutputRecord> parameter) {
- super()
- this.parameter = parameter
- }
-
- override List<M2TOutputRecord> getParameter() {
- return parameter
- }
-
- override void setParameter(List<M2TOutputRecord> parameter) {
- this.parameter = parameter
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessageFactory.xtend b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessageFactory.xtend
deleted file mode 100644
index f9c6741..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessageFactory.xtend
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.messages
-
-import java.util.ArrayList
-import java.util.List
-import org.eclipse.viatra.examples.cps.xform.m2t.api.M2TOutputRecord
-import org.eclipse.viatra.integration.mwe2.IMessageFactory
-import org.eclipse.viatra.integration.mwe2.mwe2impl.exceptions.InvalidParameterTypeException
-
-class M2TOutputMessageFactory implements IMessageFactory<List<M2TOutputRecord>, M2TOutputMessage> {
- override boolean isValidParameter(Object parameter) {
- var List<M2TOutputRecord> list = (parameter as List<M2TOutputRecord>)
- if(list !== null){
- return true
- }else {
- return false
- }
- }
-
- override M2TOutputMessage createMessage(Object parameter) throws InvalidParameterTypeException {
- if (isValidParameter(parameter)) {
- return new M2TOutputMessage(parameter as List<M2TOutputRecord>)
- }
- return new M2TOutputMessage(new ArrayList<M2TOutputRecord>())
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessageProcessor.xtend b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessageProcessor.xtend
deleted file mode 100644
index 6dd0393..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/src/org/eclipse/viatra/examples/cps/integration/messages/M2TOutputMessageProcessor.xtend
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package org.eclipse.viatra.examples.cps.integration.messages
-
-import java.security.InvalidParameterException
-import java.util.List
-import org.eclipse.viatra.examples.cps.integration.SerializerTransformationStep
-import org.eclipse.viatra.examples.cps.xform.m2t.api.M2TOutputRecord
-import org.eclipse.viatra.integration.mwe2.IMessage
-import org.eclipse.viatra.integration.mwe2.IMessageProcessor
-import org.eclipse.viatra.integration.mwe2.ITransformationStep
-
-class M2TOutputMessageProcessor implements IMessageProcessor<List<M2TOutputRecord>, M2TOutputMessage> {
- ITransformationStep parent
-
- override ITransformationStep getParent() {
- return parent
- }
-
- override void setParent(ITransformationStep parent) {
- this.parent = parent
- }
-
- override void processMessage(IMessage<? extends Object> message) throws InvalidParameterException {
- if (message instanceof M2TOutputMessage) {
- var M2TOutputMessage event = (message as M2TOutputMessage)
- if (parent instanceof SerializerTransformationStep) {
- var SerializerTransformationStep serializerparent = (parent as SerializerTransformationStep)
- serializerparent.m2tOutput = event.getParameter()
- }
- }
- }
-}
\ No newline at end of file
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/BehaviorsimplecpsappFirstAppClass0sm0.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/BehaviorsimplecpsappFirstAppClass0sm0.java
deleted file mode 100644
index 3d4e763..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/BehaviorsimplecpsappFirstAppClass0sm0.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package testproject.hosts.statemachines;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.applications.Application;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.applications.statemachines.State;
-
-import com.google.common.collect.Lists;
-
-public enum BehaviorSimplecpsappfirstappclass0inst0 implements State<BehaviorSimplecpsappfirstappclass0inst0> {
- ///////////
- // States
- Simplecpsappfirstappclass0sm0s1 {
- @Override
- public List<State<BehaviorSimplecpsappfirstappclass0inst0>> possibleNextStates(Application app) {
- List<State<BehaviorSimplecpsappfirstappclass0inst0>> possibleStates = Lists.newArrayList();
-
- // Add Neutral Transitions
-
- // Add Send Transitions
-
- // Add Wait Transitions
-
- return possibleStates;
- }
-
- }
- ,Simplecpsappfirstappclass0sm0s0 {
- @Override
- public List<State<BehaviorSimplecpsappfirstappclass0inst0>> possibleNextStates(Application app) {
- List<State<BehaviorSimplecpsappfirstappclass0inst0>> possibleStates = Lists.newArrayList();
-
- // Add Neutral Transitions
- possibleStates.add(Simplecpsappfirstappclass0sm0s1);
-
- // Add Send Transitions
-
- // Add Wait Transitions
-
- return possibleStates;
- }
-
- }
- ;
-
- private static Logger logger = Logger.getLogger("cps.proto.distributed.state");
-
- /////////////////
- // General part
- @Override
- abstract public List<State<BehaviorSimplecpsappfirstappclass0inst0>> possibleNextStates(Application app);
-
- @Override
- public BehaviorSimplecpsappfirstappclass0inst0 stepTo(BehaviorSimplecpsappfirstappclass0inst0 nextState, Application app){
- if(possibleNextStates(app).contains(nextState)){
- logger.info("Step from " + this.name() + " to " + nextState.name());
- return nextState;
- }else{
- logger.info("!!! Warning: Unable to step from " + this.name() + " to " + nextState.name()
- + " because the target state is not possible state.");
- }
- return this;
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/HostsimplecpshostFirstHostClass0inst0.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/HostsimplecpshostFirstHostClass0inst0.java
deleted file mode 100644
index 16a6d83..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/HostsimplecpshostFirstHostClass0inst0.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package testproject.hosts;
-
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.applications.Application;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.communicationlayer.CommunicationNetwork;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.hosts.BaseHost;
-import com.google.common.collect.Lists;
-import testproject.applications.Simplecpsappfirstappclass0inst0Application;
-
-public class HostSimplecpshostfirsthostclass0inst0 extends BaseHost {
-
- public HostSimplecpshostfirsthostclass0inst0(CommunicationNetwork network) {
- super(network);
- // Add Applications of Host
- applications = Lists.<Application>newArrayList(
- new Simplecpsappfirstappclass0inst0Application(this)
- );
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/HostsimplecpshostFirstHostClass0inst1.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/HostsimplecpshostFirstHostClass0inst1.java
deleted file mode 100644
index 525a622..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/HostsimplecpshostFirstHostClass0inst1.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package testproject.hosts;
-
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.applications.Application;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.communicationlayer.CommunicationNetwork;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.hosts.BaseHost;
-import com.google.common.collect.Lists;
-
-public class HostSimplecpshostfirsthostclass0inst1 extends BaseHost {
-
- public HostSimplecpshostfirsthostclass0inst1(CommunicationNetwork network) {
- super(network);
- // Add Applications of Host
- applications = Lists.<Application>newArrayList(
- );
- }
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/simplecpsappFirstAppClass0inst0Application.java b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/simplecpsappFirstAppClass0inst0Application.java
deleted file mode 100644
index c91ee8a..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/testproject/src/simplecpsappFirstAppClass0inst0Application.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014-2016 IncQuery Labs Ltd.
- * 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:
- * Akos Horvath, Abel Hegedus, Zoltan Ujhelyi, Peter Lunk - initial API and implementation
- *******************************************************************************/
-package testproject.applications;
-
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.applications.BaseApplication;
-import org.eclipse.viatra.examples.cps.m2t.proto.distributed.general.hosts.Host;
-
-import testproject.hosts.statemachines.BehaviorSimplecpsappfirstappclass0inst0;
-
-
-public class Simplecpsappfirstappclass0inst0Application extends BaseApplication<BehaviorSimplecpsappfirstappclass0inst0> {
-
- // Set ApplicationID
- protected static final String APP_ID = "simple.cps.app.FirstAppClass0.inst0";
-
- public Simplecpsappfirstappclass0inst0Application(Host host) {
- super(host);
-
- // Set initial State
- currentState = BehaviorSimplecpsappfirstappclass0inst0.Simplecpsappfirstappclass0sm0s0;
- }
-
- @Override
- public String getAppID() {
- return APP_ID;
- }
-
-}
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/xtend-gen/.gitignore b/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/xtend-gen/.gitignore
deleted file mode 100644
index c96a04f..0000000
--- a/cps/addons/org.eclipse.viatra.examples.cps.mwe2integration.example/xtend-gen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.classpath b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.classpath
index 664b52e..26e67d6 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.classpath
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.settings/org.eclipse.jdt.core.prefs b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.settings/org.eclipse.jdt.core.prefs
index d17b672..a698e59 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
index f90bfb8..710d01e 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Live Validation
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.queries.validation;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Require-Bundle: org.eclipse.viatra.examples.cps.queries,
com.google.guava,
@@ -12,4 +12,4 @@
org.eclipse.viatra.query.runtime,
org.eclipse.viatra.addon.validation.core,
org.eclipse.viatra.addon.validation.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
index 58795df..b2e7040 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.queries.validation/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.queries.validation</artifactId>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/.project b/cps/addons/org.eclipse.viatra.examples.cps.view/.project
index d5cc6db..ae3b420 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/.project
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/.project
@@ -6,16 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.viatra.query.tooling.core.projectbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF b/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
index d13e799..8181e76 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Viewers
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.view;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Require-Bundle: org.eclipse.viatra.examples.cps.model,
org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.integration.zest;bundle-version="[0.16.0,0.18.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.integration.zest;bundle-version="[0.20.0,0.21.0)",
org.eclipse.gef.layout;bundle-version="5.0.0",
org.eclipse.gef.zest.fx;bundle-version="5.0.0",
org.eclipse.gef.zest.fx.jface;bundle-version="5.0.0",
@@ -16,7 +16,7 @@
org.eclipse.viatra.examples.cps.model.editor,
org.eclipse.viatra.examples.cps.queries,
com.google.guava;bundle-version="10.0.0",
- org.eclipse.viatra.addon.viewers.runtime;bundle-version="[0.16.0,0.18.0)",
- org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[0.16.0,0.18.0)"
+ org.eclipse.viatra.addon.viewers.runtime;bundle-version="[0.20.0,0.21.0)",
+ org.eclipse.viatra.addon.viewers.runtime.zest;bundle-version="[0.20.0,0.21.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j;version="1.2.15"
diff --git a/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml b/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
index 0aff7cd..daee84d 100644
--- a/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
+++ b/cps/addons/org.eclipse.viatra.examples.cps.view/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.view</artifactId>
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF b/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
index 6b48d7e..3d53278 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: CPS Demonstrator UI Contributions
Bundle-Vendor: Eclipse VIATRA Project
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.application.ui;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.databinding.observable,
org.eclipse.emf.edit,
@@ -12,9 +12,9 @@
org.eclipse.jface.databinding,
org.eclipse.ui,
org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[1.6.0,1.8.0)",
- org.eclipse.viatra.query.tooling.ui.browser;bundle-version="[1.6.0,1.8.0)",
- org.eclipse.viatra.query.tooling.ui;bundle-version="[1.6.0,1.8.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.query.tooling.ui.browser;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.query.tooling.ui;bundle-version="[2.0.0,2.1.0)",
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
org.eclipse.xtext.xbase.lib,
diff --git a/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml b/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
index 09b8d22..2daae2b 100644
--- a/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
+++ b/cps/application/org.eclipse.viatra.examples.cps.application.ui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.application.ui</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.classpath
index 3bc2475..22f3064 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.settings/org.eclipse.jdt.core.prefs
index ef8a789..a698e59 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
index db30c57..d5468fb 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.deployment.edit;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.viatra.examples.cps.deployment.provider.DeploymentEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.deployment.provider
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.viatra.examples.cps.deployment;visibility:=reexport,
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
index 65a0c64..5052ecc 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.deployment.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.deployment/.classpath
index 3bc2475..22f3064 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.deployment/.settings/org.eclipse.jdt.core.prefs
index ef8a789..a698e59 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
index ced65e7..0a144c2 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.deployment;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.deployment,
org.eclipse.viatra.examples.cps.deployment.impl,
org.eclipse.viatra.examples.cps.deployment.util
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
index d1af8d2..d383757 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.deployment/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.deployment</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.classpath
index 3bc2475..22f3064 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
index 5865793..ab307f5 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model.edit;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.provider.ModelEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.provider
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.viatra.examples.cps.model;visibility:=reexport,
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
index 5e8b537..521d6ae 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.model.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.classpath
index 3bc2475..22f3064 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
index 2b6168a..2199f14 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model.editor;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.presentation.ModelEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.cyberPhysicalSystem.presentation,
org.eclipse.viatra.examples.cps.traceability.presentation,
org.eclipse.viatra.examples.cps.deployment.presentation
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
index 37e8399..bfc1457 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model.editor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.model.editor</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.model/.classpath
index 098194c..eca7bdb 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.model/.settings/org.eclipse.jdt.core.prefs
index d17b672..a698e59 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
index 8a766c6..e99ccb8 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.model;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,5 +11,5 @@
org.eclipse.viatra.examples.cps.cyberPhysicalSystem.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
index c9225ac..a767182 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.model/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.model</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.classpath
index 3bc2475..22f3064 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.settings/org.eclipse.jdt.core.prefs
index d17b672..a698e59 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
index 8ee12ec..a6ab5de 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.traceability.edit;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.viatra.examples.cps.traceability.provider.TraceabilityEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.traceability.provider
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.viatra.examples.cps.traceability;visibility:=reexport,
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
index ad51ec7..10d5c39 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.traceability.edit</artifactId>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/.classpath b/cps/domains/org.eclipse.viatra.examples.cps.traceability/.classpath
index 3bc2475..22f3064 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/.classpath
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/.settings/org.eclipse.jdt.core.prefs b/cps/domains/org.eclipse.viatra.examples.cps.traceability/.settings/org.eclipse.jdt.core.prefs
index d17b672..a698e59 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF b/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
index 3779cb3..017fea2 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.traceability;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,7 +11,7 @@
org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.traceability,
org.eclipse.viatra.examples.cps.traceability.impl,
org.eclipse.viatra.examples.cps.traceability.util
diff --git a/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml b/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
index 9066f1e..0ddd9ea 100644
--- a/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
+++ b/cps/domains/org.eclipse.viatra.examples.cps.traceability/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.traceability</artifactId>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/.classpath b/cps/generator/org.eclipse.viatra.examples.cps.generator/.classpath
index b2c065c..afa591e 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/.classpath
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/.settings/org.eclipse.jdt.core.prefs b/cps/generator/org.eclipse.viatra.examples.cps.generator/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF b/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
index e051aa5..a9597d0 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Model Generator Implementation
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.generator;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.generator,
org.eclipse.viatra.examples.cps.generator.dtos,
@@ -18,12 +18,13 @@
org.eclipse.viatra.examples.cps.generator.queries.util,
org.eclipse.viatra.examples.cps.generator.utils
Require-Bundle: org.eclipse.viatra.examples.cps.planexecutor;bundle-version="0.1.0";visibility:=reexport,
- org.eclipse.xtend.lib,
- com.google.guava,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
- org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.xtend.lib,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
+ org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
+ org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml b/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
index 531221d..28a4d46 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.generator</artifactId>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/dtos/CPSStats.xtend b/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/dtos/CPSStats.xtend
index e0d2a67..bcff2b4 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/dtos/CPSStats.xtend
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/dtos/CPSStats.xtend
@@ -12,8 +12,6 @@
import java.util.LinkedHashSet
import org.apache.log4j.Logger
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.emf.ecore.EStructuralFeature
import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.ApplicationInstance
import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.CyberPhysicalSystem
import org.eclipse.viatra.examples.cps.cyberPhysicalSystem.CyberPhysicalSystemPackage
@@ -31,7 +29,6 @@
import org.eclipse.viatra.examples.cps.generator.utils.StatsUtil
import org.eclipse.viatra.examples.cps.generator.utils.SumProcessor
import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
-import org.eclipse.viatra.query.runtime.base.api.IEStructuralFeatureProcessor
import org.eclipse.viatra.query.runtime.base.api.ViatraBaseFactory
class CPSStats extends ModelStats {
@@ -68,9 +65,8 @@
// EFeatures
val sp2 = new SumProcessor
- baseIndex.processAllFeatureInstances(CyberPhysicalSystemPackage.Literals.TRANSITION__ACTION, new IEStructuralFeatureProcessor(){
- override process(EStructuralFeature feature, EObject source, Object target) {
- if(source instanceof Transition){
+ baseIndex.processAllFeatureInstances(CyberPhysicalSystemPackage.Literals.TRANSITION__ACTION, [source,target |
+ if (source instanceof Transition){
val Transition t = source as Transition
if(t.action.startsWith(CPSPhaseActionGeneration.SEND_METHOD_NAME)){
sendActions++
@@ -78,8 +74,7 @@
waitActions++
}
}
- }
- })
+ ])
sp2.resetSum
val appInstanceIdentifiers = baseIndex.getAllInstances(CyberPhysicalSystemPackage.Literals.APPLICATION_INSTANCE).filter(ApplicationInstance).map[it.identifier].toList
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/utils/SumProcessor.xtend b/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/utils/SumProcessor.xtend
index 2a84b91..2617fe2 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/utils/SumProcessor.xtend
+++ b/cps/generator/org.eclipse.viatra.examples.cps.generator/src/org/eclipse/viatra/examples/cps/generator/utils/SumProcessor.xtend
@@ -13,10 +13,9 @@
import org.eclipse.viatra.query.runtime.base.api.IEClassifierProcessor.IEClassProcessor
import org.eclipse.emf.ecore.EClass
import org.eclipse.emf.ecore.EObject
-import org.eclipse.viatra.query.runtime.base.api.IEStructuralFeatureProcessor
-import org.eclipse.emf.ecore.EStructuralFeature
+import org.eclipse.viatra.query.runtime.base.api.IStructuralFeatureInstanceProcessor
-class SumProcessor implements IEClassProcessor, IEStructuralFeatureProcessor {
+class SumProcessor implements IEClassProcessor, IStructuralFeatureInstanceProcessor {
var sum = 0;
@@ -24,7 +23,7 @@
sum++
}
- override process(EStructuralFeature feature, EObject source, Object target) {
+ override process(EObject source, Object target) {
sum++
}
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.classpath b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.classpath
index b2c065c..afa591e 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.classpath
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.settings/org.eclipse.jdt.core.prefs b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
index d85a7db..922e7bb 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Model Generator
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.planexecutor;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.planexecutor,
org.eclipse.viatra.examples.cps.planexecutor.api
-Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.9.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.13.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
index 11115da..77582d5 100644
--- a/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
+++ b/cps/generator/org.eclipse.viatra.examples.cps.planexecutor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.planexecutor</artifactId>
diff --git a/cps/pom.xml b/cps/pom.xml
index f3e8db9..caab877 100644
--- a/cps/pom.xml
+++ b/cps/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.viatra.examples.cps</groupId>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>CPS Demonstrator</name>
<url></url>
<packaging>pom</packaging>
@@ -25,7 +25,6 @@
<!-- Addons -->
<module>addons/org.eclipse.viatra.examples.cps.queries.validation</module>
- <module>addons/org.eclipse.viatra.examples.cps.mwe2integration.example</module>
<!-- M2M Transformations -->
@@ -79,11 +78,11 @@
</profiles>
<properties>
<tycho.version>1.0.0</tycho.version>
- <xtend.compiler.version>2.10.0</xtend.compiler.version>
+ <xtend.compiler.version>2.13.0</xtend.compiler.version>
<viatra.repository.url>http://download.eclipse.org/viatra/updates/integration</viatra.repository.url>
- <viatra.compiler.version>1.7.0-SNAPSHOT</viatra.compiler.version>
+ <viatra.compiler.version>2.0.0-SNAPSHOT</viatra.compiler.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.7</java.version>
+ <java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
diff --git a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.classpath b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.classpath
index 098194c..eca7bdb 100644
--- a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.classpath
+++ b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.settings/org.eclipse.jdt.core.prefs b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/META-INF/MANIFEST.MF b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/META-INF/MANIFEST.MF
index a12bef2..15d7f5e 100644
--- a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/META-INF/MANIFEST.MF
+++ b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto.distributed/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: CPS M2T Distributed Prototype
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.m2t.proto.distributed
Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: IncQueryLabs Ltd.
Require-Bundle: org.eclipse.viatra.examples.cps.deployment;bundle-version="0.1.0",
com.google.guava;bundle-version="15.0.0",
diff --git a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.classpath b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.classpath
index c1c6235..1b83178 100644
--- a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.classpath
+++ b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.settings/org.eclipse.jdt.core.prefs b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.settings/org.eclipse.jdt.core.prefs
index 7341ab1..3a21537 100644
--- a/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/prototypes/org.eclipse.viatra.examples.cps.m2t.proto/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/.classpath b/cps/queries/org.eclipse.viatra.examples.cps.queries/.classpath
index 6a42377..f0c5549 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/.classpath
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src-gen"/>
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/.settings/org.eclipse.jdt.core.prefs b/cps/queries/org.eclipse.viatra.examples.cps.queries/.settings/org.eclipse.jdt.core.prefs
index d17b672..a698e59 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF b/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
index bd8b19d..9df4617 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Query Definitions
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.queries;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.deployment.common,
org.eclipse.viatra.examples.cps.deployment.common.util,
@@ -21,6 +21,6 @@
org.eclipse.emf.ecore,
org.eclipse.xtext.xbase.lib,
org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
index c1e197c..b64938b 100644
--- a/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
+++ b/cps/queries/org.eclipse.viatra.examples.cps.queries/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.queries</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
index 786423f..daddef6 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.viatra.examples.cps.application.dependencies.feature"
label="CPS Demonstrator Application dependencies"
- version="0.1.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="IncQuery Labs Ltd."
license-feature="org.eclipse.license">
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
index af7cc3e..67a1298 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.dependencies.feature/pom.xml
@@ -8,7 +8,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
index 0237200..3f70040 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.viatra.examples.cps.application.feature"
label="CPS Demonstrator Application"
- version="0.1.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="IncQuery Labs Ltd."
license-feature="org.eclipse.license">
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
index 05c4c1e..5c4a694 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.feature/pom.xml
@@ -8,7 +8,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
index 1e20e70..7815d4d 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/cps-application.product
@@ -123,22 +123,22 @@
<feature id="org.eclipse.pde"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.rcp"/>
- <feature id="org.eclipse.viatra.addon.databinding.runtime.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.addon.querybasedfeatures.runtime.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.addon.validation.runtime.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.addon.viewers.runtime.feature" version="0.17.0.qualifier"/>
- <feature id="org.eclipse.viatra.addon.viewers.runtime.zest.feature" version="0.17.0.qualifier"/>
- <feature id="org.eclipse.viatra.addon.viewers.tooling.feature" version="0.17.0.qualifier"/>
- <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="0.1.0.qualifier"/>
- <feature id="org.eclipse.viatra.examples.cps.application.feature" version="0.1.0.qualifier"/>
- <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="0.1.0.qualifier"/>
- <feature id="org.eclipse.viatra.query.language.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.query.runtime.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.query.sdk.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.query.tooling.ui.visualization.feature" version="0.17.0.qualifier"/>
- <feature id="org.eclipse.viatra.transformation.debug.feature" version="0.17.0.qualifier"/>
- <feature id="org.eclipse.viatra.transformation.evm.transactions.feature" version="1.7.0.qualifier"/>
- <feature id="org.eclipse.viatra.transformation.runtime.emf.feature" version="1.7.0.qualifier"/>
+ <feature id="org.eclipse.viatra.addon.databinding.runtime.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.addon.querybasedfeatures.runtime.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.addon.validation.runtime.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.addon.viewers.runtime.feature" version="0.20.0.qualifier"/>
+ <feature id="org.eclipse.viatra.addon.viewers.runtime.zest.feature" version="0.20.0.qualifier"/>
+ <feature id="org.eclipse.viatra.addon.viewers.tooling.feature" version="0.20.0.qualifier"/>
+ <feature id="org.eclipse.viatra.examples.cps.application.dependencies.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.examples.cps.application.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.query.language.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.query.runtime.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.query.sdk.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.query.tooling.ui.visualization.feature" version="0.20.0.qualifier"/>
+ <feature id="org.eclipse.viatra.transformation.debug.feature" version="0.20.0.qualifier"/>
+ <feature id="org.eclipse.viatra.transformation.evm.transactions.feature" version="2.0.0.qualifier"/>
+ <feature id="org.eclipse.viatra.transformation.runtime.emf.feature" version="2.0.0.qualifier"/>
<feature id="org.eclipse.xtend.sdk"/>
<feature id="org.eclipse.xtext.docs"/>
<feature id="org.eclipse.xtext.examples"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
index 89ee45e..7c7a59d 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.application.product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.application.product</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
index 9dd0835..5f13f45 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.domain.parent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<groupId>org.eclipse.viatra.examples.cps</groupId>
<relativePath>../..</relativePath>
</parent>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
index 06bce62..d2ef13a 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.viatra.examples.cps.metamodel.feature"
label="CPS metamodels"
- version="0.1.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="IncQuery Labs Ltd."
license-feature="org.eclipse.license">
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
index f71acd2..d58ccdb 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.metamodel.feature/pom.xml
@@ -8,7 +8,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>eclipse-feature</packaging>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
index d5a6b85..0fc132c 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/org.eclipse.viatra.examples.cps.target.target
@@ -14,9 +14,9 @@
<repository location="http://download.eclipse.org/releases/oxygen/201710111001"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201605250459"/>
- <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.13.0.v20171020-0920"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.13.0.v20171020-0920"/>
+ <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.13.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.fx.runtime.min.feature.feature.group" version="3.0.0.201705220748"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
index a64bc08..6e3cd9f 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.target/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.target</artifactId>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml b/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
index 4cf3b6c..ceb1464 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.update/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.viatra.examples.cps.metamodel.feature_0.1.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.metamodel.feature" version="0.1.0.qualifier">
+ <feature url="features/org.eclipse.viatra.examples.cps.metamodel.feature_2.0.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.metamodel.feature" version="2.0.0.qualifier">
<category name="org.eclipse.viatra.examples.cps"/>
</feature>
- <feature url="features/org.eclipse.viatra.examples.cps.application.feature_0.1.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.application.feature" version="0.1.0.qualifier">
+ <feature url="features/org.eclipse.viatra.examples.cps.application.feature_2.0.0.qualifier.jar" id="org.eclipse.viatra.examples.cps.application.feature" version="2.0.0.qualifier">
<category name="org.eclipse.viatra.examples.cps"/>
</feature>
<category-def name="org.eclipse.viatra.examples.cps" label="CPS Demonstrator"/>
diff --git a/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml b/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
index 14e7a81..d74f412 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
+++ b/cps/releng/org.eclipse.viatra.examples.cps.update/pom.xml
@@ -8,7 +8,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<packaging>eclipse-repository</packaging>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
index 719c7b6..1b147e9 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Model Generator Tests
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.generator.tests;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.generator.tests
Require-Bundle: org.eclipse.xtend.lib,
@@ -11,6 +11,7 @@
org.eclipse.viatra.examples.cps.generator;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.viatra.examples.cps.planexecutor;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.viatra.examples.cps.tests.util;bundle-version="0.1.0";visibility:=reexport,
- org.eclipse.viatra.query.runtime.base.itc;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
index 60f95d0..6a43c68 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.generator.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.generator.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.m2t.proto.distributed.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.m2t.proto.distributed.tests/META-INF/MANIFEST.MF
index 0cfa66c..3827a5c 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.m2t.proto.distributed.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.m2t.proto.distributed.tests/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@
org.eclipse.viatra.examples.cps.queries,
org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.xform.m2t.distributed;bundle-version="0.1.0",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
com.google.guava;bundle-version="15.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.classpath b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.classpath
index 248b4c5..0805795 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.classpath
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.settings/org.eclipse.jdt.core.prefs b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
index 057b890..d3694c7 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Tests Common
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.tests.util
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.tests.util
Require-Bundle: org.eclipse.xtend.lib,
@@ -11,7 +11,7 @@
org.eclipse.viatra.examples.cps.traceability;visibility:=reexport,
org.junit;bundle-version="4.0.0";visibility:=reexport,
org.eclipse.viatra.examples.cps.generator;bundle-version="0.1.0";visibility:=reexport,
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.9.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j;version="1.2.15"
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
index 4de081f..a3b05c5 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.tests.util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.tests.util</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
index 5993ccf..24f5bcc 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator M2M Tests
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.tests;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.tests
Require-Bundle: com.google.guava,
@@ -17,8 +17,8 @@
org.eclipse.viatra.examples.cps.tests.util;visibility:=reexport,
org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra,
org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime.base.itc;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.query.runtime.localsearch;bundle-version="1.2.0",
+ org.eclipse.viatra.query.runtime.base.itc;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.query.runtime.localsearch;bundle-version="[2.0.0,2.1.0)",
org.eclipse.viatra.examples.cps.xform.m2m.launcher;bundle-version="0.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j;version="1.2.15"
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
index 061afcc..35580aa 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2m.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
index c62ad03..01d2078 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Tests for M2T Transformation
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.tests;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Require-Bundle: org.junit;bundle-version="4.11.0",
org.apache.log4j;bundle-version="1.2.15",
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
index 5813d0b..6f47d34 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.m2t.tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2t.tests</artifactId>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.classpath b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.classpath
index 248b4c5..0805795 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.classpath
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.settings/org.eclipse.jdt.core.prefs b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
index 9fe6883..356e7a0 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator serializer tests
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.test
-Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="0.1.0",
+Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
org.eclipse.viatra.examples.cps.xform.serializer,
org.eclipse.emf.ecore,
org.eclipse.core.resources,
diff --git a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
index 7c00eb0..0623544 100644
--- a/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
+++ b/cps/tests/org.eclipse.viatra.examples.cps.xform.serializer.test/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.serializer.test</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.classpath
index b2c065c..afa591e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
index a170b1a..b61668c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.viatra.examples.cps.xfrom.m2m.batch.eiq
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq,
org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq.queries,
@@ -13,6 +13,6 @@
org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.xform.m2m.util,
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
index 9fa70ff..16962b9 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.eiq</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.classpath
index c86db38..07878f5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
index afe9bfc..3349586 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@
Bundle-Name: Optimized
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized
Bundle-Vendor: IncQueryLabs Ltd.
-Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.google.guava,
org.eclipse.xtend.lib,
org.eclipse.xtext.xbase.lib,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
index 9925fc6..b10a2a6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.optimized</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.classpath
index c86db38..07878f5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
index fc74e93..2edeab0 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Simple
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.simple
Require-Bundle: com.google.guava,
@@ -12,5 +12,5 @@
org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j;version="1.2.15"
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
index 461da24..42acb13 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.simple/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.simple</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.classpath
index b2c065c..afa591e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
index 2fa6d1c..a6b7a45 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra,
org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra.patterns,
org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra.patterns.util
@@ -13,8 +13,8 @@
org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0",
org.eclipse.xtend.lib,
org.eclipse.viatra.query.runtime,
- org.eclipse.viatra.transformation.evm;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.runtime.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.17.0,0.18.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.21.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
index e3be667..68b8695 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.batch.viatra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.classpath
index c02d4d0..a3b681e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
<classpathentry kind="src" path="src"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
index ab9c91d..82920ad 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Aggr
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr,
org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr.queries,
org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr.queries.util
@@ -14,8 +14,8 @@
org.eclipse.viatra.examples.cps.model;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
org.eclipse.viatra.examples.cps.xform.m2m.util,
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.evm;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.runtime.emf;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
index f69a7d8..990aec8 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.aggr</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.classpath
index b2c065c..afa591e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
index e3892b5..974f4e8 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Model-To-Model Transformations
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.expl,
org.eclipse.viatra.examples.cps.xform.m2m.incr.expl.queries,
@@ -13,7 +13,7 @@
org.eclipse.emf.ecore,
org.eclipse.xtext.xbase.lib,
org.eclipse.viatra.examples.cps.xform.m2m.util,
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.evm;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
index 8125de3..e4def94 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.expl/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.expl</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.classpath
index b2c065c..afa591e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
index d2d0def..25d6554 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.viatra.examples.cps.xfrom.m2m.incr.qrt
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt,
org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt.queries,
org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt.queries.util,
@@ -13,7 +13,7 @@
org.eclipse.viatra.examples.cps.traceability,
org.eclipse.viatra.examples.cps.xform.m2m.util,
org.eclipse.xtend.lib,
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.evm;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
index d7afb3c..4990902 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.qrt</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.classpath
index b2c065c..afa591e 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
index 19f315f..49c3f3c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra,
org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.patterns,
org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra.patterns.util
@@ -13,8 +13,8 @@
org.eclipse.viatra.examples.cps.xform.m2m.util;bundle-version="0.1.0",
org.eclipse.xtend.lib,
org.eclipse.viatra.query.runtime,
- org.eclipse.viatra.transformation.evm;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.runtime.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.17.0,0.18.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.transformation.evm;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.runtime.emf;bundle-version="[2.0.0,2.1.0)",
+ org.eclipse.viatra.transformation.runtime.debug;bundle-version="[0.20.0,0.21.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
index f8dd64a..b188213 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.incr.viatra</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.classpath
index b849f38..87addf1 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.settings/org.eclipse.jdt.core.prefs
index 7341ab1..3a21537 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
index 910e4df..9164e84 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator M2M Transformation Launcher
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.launcher
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.viatra.examples.cps.xform.m2m.launcher
Import-Package: org.apache.log4j
Require-Bundle: org.eclipse.viatra.examples.cps.traceability;bundle-version="0.1.0",
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
index 5ef947f..86d7e3a 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.launcher/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.launcher</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.classpath
index 248b4c5..0805795 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
index a5e5d2f..8e2f123 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator M2M Transformation Util
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2m.util
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.google.guava,
org.eclipse.xtend.lib,
org.eclipse.xtext.xbase.lib,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
index 7a882a1..4fcf192 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2m.util</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend
index 1b9f34e..7d750af 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2m.util/src/org/eclipse/viatra/examples/cps/xform/m2m/util/SignalUtil.xtend
@@ -17,10 +17,12 @@
static val waitPattern = Pattern.compile("^waitForSignal\\((.*)\\)$")
static val sendPattern = Pattern.compile("^sendSignal\\((.*),(.*)\\)$")
+ @Pure
static def isSend(String action) {
sendPattern.matcher(action).matches
}
+ @Pure
static def isWait(String action) {
waitPattern.matcher(action).matches
}
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.classpath
index c86db38..fc8a78d 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.classpath
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
index dffe534..a245730 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator Proto Distribution Generator
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.distributed
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.distributed
Require-Bundle: org.eclipse.xtend;bundle-version="2.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
- org.eclipse.viatra.examples.cps.deployment,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.viatra.examples.cps.queries,
- org.eclipse.jdt.core;bundle-version="3.10.0",
- org.eclipse.text,
- org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.xtext.xbase.lib;bundle-version="2.6.0",
+ org.eclipse.viatra.examples.cps.deployment,
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.viatra.examples.cps.queries,
+ org.eclipse.jdt.core;bundle-version="3.10.0",
+ org.eclipse.text,
+ org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/build.properties b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/build.properties
index d8e2f0e..dd1e7e5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/build.properties
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/build.properties
@@ -1,5 +1,6 @@
-source.. = src/,\
- xtend-gen/
-output.. = bin/
bin.includes = META-INF/,\
.
+source.. = src/,\
+ xtend-gen/,\
+ src-gen/
+output.. = bin/
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
index 314c13f..df692d6 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.distributed/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2t.distributed</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.classpath
index c86db38..07878f5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
index 270f73d..59acfaf 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator JDT M2T Generator
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t.jdt
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.jdt
Require-Bundle: org.eclipse.core.runtime,
@@ -14,5 +14,5 @@
org.eclipse.jdt.core;bundle-version="3.10.0",
org.eclipse.core.resources;bundle-version="3.9.0",
org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
index 0c8dfd2..c37d0b0 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t.jdt/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2t.jdt</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.classpath
index 31dee90..67ddb5d 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
index d38ffee..e9d2d8c 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator M2T API
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.m2t;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.m2t.api,
org.eclipse.viatra.examples.cps.xform.m2t.exceptions,
@@ -17,7 +17,7 @@
org.eclipse.jdt.core;bundle-version="3.10.0",
org.eclipse.text,
org.eclipse.xtend.lib;bundle-version="2.9.0",
- org.eclipse.viatra.query.runtime;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.viatra.query.runtime;bundle-version="[2.0.0,2.1.0)",
org.eclipse.viatra.transformation.evm
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.apache.log4j
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
index 7a660d8..47c9683 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.m2t/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.m2t</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.classpath
index c86db38..07878f5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
index 7c31f91..deef9a2 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator eclipse based serializer
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.eclipse
-Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="0.1.0",
+Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
org.eclipse.viatra.examples.cps.xform.serializer,
org.eclipse.emf.ecore,
org.eclipse.core.resources,
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
index 3764b79..f3b4b4a 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.eclipse/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.serializer.eclipse</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.classpath
index c86db38..07878f5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
index f7ca64a..2f97df0 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator java i/o based serializer
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer.javaio
-Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: IncQueryLabs Ltd.
-Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer;bundle-version="0.1.0",
+Require-Bundle: org.eclipse.viatra.examples.cps.xform.serializer,
org.eclipse.viatra.examples.cps.xform.serializer,
org.eclipse.emf.ecore,
org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
com.google.guava;bundle-version="15.0.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.8.0"
+ org.eclipse.xtend.lib;bundle-version="2.13.0",
+ org.eclipse.xtend.lib.macro;bundle-version="2.13.0"
Export-Package: org.eclipse.viatra.examples.cps.xform.serializer.javaio
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
index d7aaca2..96ce521 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer.javaio/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.serializer.javaio</artifactId>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.classpath b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.classpath
index c86db38..07878f5 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.classpath
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.settings/org.eclipse.jdt.core.prefs b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.settings/org.eclipse.jdt.core.prefs
index f42de36..0c68a61 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.settings/org.eclipse.jdt.core.prefs
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
index b6dea60..45c314a 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: CPS Demonstrator serializer API
Bundle-SymbolicName: org.eclipse.viatra.examples.cps.xform.serializer
-Bundle-Version: 0.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: IncQueryLabs Ltd.
Export-Package: org.eclipse.viatra.examples.cps.xform.serializer
Require-Bundle: org.eclipse.viatra.examples.cps.xform.m2t;bundle-version="0.1.0",
diff --git a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
index 75253e9..ff7ae27 100644
--- a/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
+++ b/cps/transformations/org.eclipse.viatra.examples.cps.xform.serializer/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.viatra.examples.cps.parent</artifactId>
<groupId>org.eclipse.viatra.examples.cps</groupId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.viatra.examples.cps.xform.serializer</artifactId>
