From 52379af214a21a98a00f630b9ed968af50e35134 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 8 Jan 2016 15:28:15 +0100 Subject: [PATCH] make sure to use new builder id for concurrent xdsml --- .../services/SigPMLDebuggerServices.java | 2 +- .../org.gemoc.sample.sigpml.xdsml/.project | 4 +- .../META-INF/MANIFEST.MF | 56 ++++++++++++++----- .../build.properties | 12 ++-- .../org.gemoc.sample.sigpml.xdsml/plugin.xml | 2 +- .../design/services/TFSMAnimatorServices.java | 2 +- .../design/services/TFSMDebuggerServices.java | 2 +- .../org.gemoc.sample.tfsm.xdsml/.project | 4 +- .../build.properties | 13 ++--- .../org.gemoc.sample.tfsm.xdsml/plugin.xml | 2 +- 10 files changed, 61 insertions(+), 38 deletions(-) diff --git a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.model.design/src/org/gemoc/sample/sigpml/concrete/design/services/SigPMLDebuggerServices.java b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.model.design/src/org/gemoc/sample/sigpml/concrete/design/services/SigPMLDebuggerServices.java index 7cb0635cc..1feed66f0 100644 --- a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.model.design/src/org/gemoc/sample/sigpml/concrete/design/services/SigPMLDebuggerServices.java +++ b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.model.design/src/org/gemoc/sample/sigpml/concrete/design/services/SigPMLDebuggerServices.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocDebuggerServices; +import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; public class SigPMLDebuggerServices extends AbstractGemocDebuggerServices { diff --git a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/.project b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/.project index f6f3bba9b..a6f3bf569 100644 --- a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/.project +++ b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/.project @@ -26,13 +26,13 @@ - org.gemoc.gemoc_language_workbench.ui.gemocLanguageDesignerBuilder + org.gemoc.execution.concurrent.ccsljavaxdsml.ui.gemocLanguageDesignerBuilder - org.gemoc.gemoc_language_workbench.ui.gemocLanguageDesignerNature + org.gemoc.execution.concurrent.ccsljavaxdsml.ui.gemocLanguageDesignerNature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature diff --git a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/META-INF/MANIFEST.MF b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/META-INF/MANIFEST.MF index 19f1f6314..bfba6bba8 100644 --- a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/META-INF/MANIFEST.MF +++ b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/META-INF/MANIFEST.MF @@ -3,35 +3,63 @@ Bundle-SymbolicName: org.gemoc.sample.sigpml.xdsml;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Name: Xdsml Bundle-ClassPath: . -Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:=reexport, +Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0";visibility:="reexport", + fr.inria.aoste.timesquare.ccslkernel.solver;bundle-version="1.0.0", + fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.0.0", - org.gemoc.execution.concurrent.ccsljavaengine.extensions.k3;bundle-version="0.0.0";visibility:=reexport, + + org.gemoc.execution.concurrent.ccsljavaengine.extensions.k3;bundle-version="0.0.0";visibility:="reexport", + org.eclipse.ui, + org.eclipse.ui.workbench, - org.gemoc.sample.sigpml.k3dsa;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.model;bundle-version="0.0.0";visibility:=reexport, + + org.gemoc.sample.sigpml.k3dsa;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.model;bundle-version="0.0.0";visibility:="reexport", + fr.inria.diverse.commons.eclipse.messagingsystem.api;bundle-version="1.0.0", + fr.inria.diverse.commons.eclipse.messagingsystem.ui;bundle-version="1.0.0", + org.eclipse.core.runtime;bundle-version="3.9.100", + org.gemoc.commons.eclipse, + org.gemoc.commons.eclipse.ui, + fr.inria.aoste.timesquare.ecl.feedback.model, + org.gemoc.execution.concurrent.ccsljavaengine.ui;bundle-version="0.1.0", - org.gemoc.sample.sigpml.model.design;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.moc.lib;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.moc.application;bundle-version="0.0.0";visibility:=reexport, + + org.gemoc.sample.sigpml.model.design;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.moc.lib;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.moc.application;bundle-version="0.0.0";visibility:="reexport", + org.gemoc.execution.concurrent.ccsljavaengine.extensions.timesquare;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.k3dsa;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.model;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.model.design;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.moc.lib;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.moc.application;bundle-version="0.0.0";visibility:=reexport, - org.gemoc.sample.sigpml.k3dsa;bundle-version="0.0.0";visibility:=reexport, + + org.gemoc.sample.sigpml.k3dsa;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.model;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.model.design;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.moc.lib;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.moc.application;bundle-version="0.0.0";visibility:="reexport", + + org.gemoc.sample.sigpml.k3dsa;bundle-version="0.0.0";visibility:="reexport", + org.gemoc.execution.concurrent.ccsljavaxdsml.api;bundle-version="1.0.0", + org.gemoc.execution.concurrent.ccsljavaengine;bundle-version="1.0.0", + org.gemoc.executionframework.engine.mse.model;bundle-version="0.1.0", - org.gemoc.executionframework.extensions.sirius;bundle-version="0.1.0" + + org.gemoc.executionframework.extensions.sirius;bundle-version="0.0.0";visibility:="reexport" Bundle-ActivationPolicy: lazy Bundle-ManifestVersion: 2 Bundle-Activator: org.gemoc.sample.sigpml.xdsml.Activator diff --git a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/build.properties b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/build.properties index 45c4523db..7e17ee7c4 100644 --- a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/build.properties +++ b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/build.properties @@ -1,7 +1,5 @@ -source.. = src/main/java/,\ - src-gen/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - project.xdsml -output.. = bin/ +# +#Fri Jan 08 15:25:15 CET 2016 +output..=bin/ +bin.includes=META-INF/,.,plugin.xml,project.xdsml +source..=src/main/java/,src-gen/ diff --git a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/plugin.xml b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/plugin.xml index 5016e6de9..75b654dda 100644 --- a/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/plugin.xml +++ b/official_samples/SigPML/language_workbench/org.gemoc.sample.sigpml.xdsml/plugin.xml @@ -2,6 +2,6 @@ - + diff --git a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMAnimatorServices.java b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMAnimatorServices.java index 5ba183cd4..78eec8580 100644 --- a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMAnimatorServices.java +++ b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMAnimatorServices.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocAnimatorServices; +import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocAnimatorServices; public class TFSMAnimatorServices extends AbstractGemocAnimatorServices { diff --git a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMDebuggerServices.java b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMDebuggerServices.java index cc39db5da..2d42eb28a 100644 --- a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMDebuggerServices.java +++ b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.design/src/org/gemoc/sample/tfsm/design/services/TFSMDebuggerServices.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import org.gemoc.gemoc_language_workbench.extensions.sirius.services.AbstractGemocDebuggerServices; +import org.gemoc.executionframework.extensions.sirius.services.AbstractGemocDebuggerServices; public class TFSMDebuggerServices extends AbstractGemocDebuggerServices { diff --git a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/.project b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/.project index f41075d33..cc34fa8fe 100644 --- a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/.project +++ b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/.project @@ -26,13 +26,13 @@ - org.eclipse.pde.SchemaBuilder + org.gemoc.execution.concurrent.ccsljavaxdsml.ui.gemocLanguageDesignerBuilder - org.gemoc.gemoc_language_workbench.ui.gemocLanguageDesignerNature + org.gemoc.execution.concurrent.ccsljavaxdsml.ui.gemocLanguageDesignerNature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.xtext.ui.shared.xtextNature diff --git a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/build.properties b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/build.properties index f8f44b33a..6d3a6fcc8 100644 --- a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/build.properties +++ b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/build.properties @@ -1,8 +1,5 @@ -source.. = src/main/java/,\ - src/main/xdsml-java-gen/,\ - src-gen/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - project.xdsml -output.. = bin/ +# +#Fri Jan 08 15:27:05 CET 2016 +output..=bin/ +bin.includes=META-INF/,.,plugin.xml,project.xdsml +source..=src/main/java/,src/main/xdsml-java-gen/,src-gen/ diff --git a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/plugin.xml b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/plugin.xml index 1d19bdfd5..a3213ee82 100644 --- a/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/plugin.xml +++ b/official_samples/TFSM/language_workbench/org.gemoc.sample.tfsm.xdsml/plugin.xml @@ -2,6 +2,6 @@ - +