Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF5
-rw-r--r--examples/org.eclipse.etrice.tutorials/genAllTutorials.mwe2.launch20
-rw-r--r--examples/org.eclipse.etrice.tutorials/src/workflow/genAllModels.mwe245
-rw-r--r--tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch23
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java9
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java17
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe218
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java9
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java11
-rw-r--r--tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java11
11 files changed, 0 insertions, 172 deletions
diff --git a/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF b/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF
index fb587f647..f92677694 100644
--- a/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.etrice.tutorials/META-INF/MANIFEST.MF
@@ -3,14 +3,9 @@ Bundle-ManifestVersion: 2
Bundle-Name: Tutorials
Bundle-SymbolicName: org.eclipse.etrice.tutorials
Bundle-Version: 0.1.0.qualifier
-Export-Package: workflow
Require-Bundle: org.eclipse.etrice.generator.java;bundle-version="0.1.0",
org.eclipse.etrice.generator;bundle-version="0.1.0",
org.eclipse.etrice.modellib;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
- org.eclipse.emf.mwe.utils;bundle-version="1.0.0";visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15",
- org.apache.commons.logging;bundle-version="1.0.4",
org.eclipse.jface.text;bundle-version="3.6.0",
org.eclipse.jdt.core;bundle-version="3.6.0",
org.eclipse.xtend.util.stdlib;bundle-version="1.0.0",
diff --git a/examples/org.eclipse.etrice.tutorials/genAllTutorials.mwe2.launch b/examples/org.eclipse.etrice.tutorials/genAllTutorials.mwe2.launch
deleted file mode 100644
index a2833d117..000000000
--- a/examples/org.eclipse.etrice.tutorials/genAllTutorials.mwe2.launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.tutorials"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;org.eclipse.etrice.tutorials&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;org.eclipse.etrice.tutorials&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/org.eclipse.etrice.modellib&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/org.eclipse.etrice.tutorials/src/workflow&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/workflow/genAllModels.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.tutorials"/>
-</launchConfiguration>
diff --git a/examples/org.eclipse.etrice.tutorials/src/workflow/genAllModels.mwe2 b/examples/org.eclipse.etrice.tutorials/src/workflow/genAllModels.mwe2
deleted file mode 100644
index e9bb14667..000000000
--- a/examples/org.eclipse.etrice.tutorials/src/workflow/genAllModels.mwe2
+++ /dev/null
@@ -1,45 +0,0 @@
-module workflow.tutorials
-
-import org.eclipse.emf.mwe.utils.*
-import workflow.ExecuteCommand.*
-
-var destDir = "src-gen"
-
-Workflow {
-
- component = DirectoryCleaner {
- directory = destDir
- }
-
- component = @workflow.RoomGenerator {
- sourceDir = "model/Blinky"
- targetDir = destDir
- }
-
- component = @workflow.RoomGenerator {
- sourceDir = "model/HelloWorld"
- targetDir = destDir
- }
-
- component = @workflow.RoomGenerator {
- sourceDir = "model/PedLightsController"
- targetDir = destDir
- }
- component = @workflow.RoomGenerator {
- sourceDir = "model/SendingData"
- targetDir = destDir
- }
-
- component = @workflow.RoomGenerator {
- sourceDir = "model/scratch"
- targetDir = destDir
- }
-
-// component = org.eclipse.etrice.generator.workflow.ExecuteCommand {
-// commandString = "dot -osrc-gen/PingPong/SubSystem_PingPong.jpg -Tjpg src-gen/PingPong/SubSystem_PingPong.dot"
-// }
-//
-// component = org.eclipse.etrice.generator.workflow.ExecuteCommand {
-// commandString = "dot -osrc-gen/PingPongFast/SubSystem_PingPong.jpg -Tjpg src-gen/PingPongFast/SubSystem_PingPong.dot"
-// }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF
index 020de0bcd..fcd2e4b28 100644
--- a/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.integration.tests/META-INF/MANIFEST.MF
@@ -7,10 +7,6 @@ Export-Package: org.eclipse.etrice.integration.tests
Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
org.eclipse.etrice.modellib;bundle-version="0.1.0",
org.eclipse.etrice.generator.java;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
- org.eclipse.emf.mwe.utils;bundle-version="1.0.0";visibility:=reexport,
- org.apache.log4j;bundle-version="1.2.15",
- org.apache.commons.logging;bundle-version="1.0.4",
org.eclipse.jface.text;bundle-version="3.6.0",
org.eclipse.jdt.core;bundle-version="3.6.0",
org.eclipse.xtend.util.stdlib;bundle-version="1.0.0",
diff --git a/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch b/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch
deleted file mode 100644
index e835ba6f5..000000000
--- a/tests/org.eclipse.etrice.integration.tests/gen_integration_test.mwe2.launch
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.etrice.integration.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;org.eclipse.etrice.integration.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/org.eclipse.etrice.modellib/models&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;org.eclipse.etrice.integration.tests&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.etrice.integration.tests"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
index 294ce4cdb..35924c572 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestChoicePoint.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.ChoicePointTest.SubSystem_CPTest;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +26,6 @@ import org.junit.Test;
public class IntegrationTestChoicePoint extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
index 4149f6598..ccf7fde8e 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.java
@@ -15,32 +15,15 @@ package org.eclipse.etrice.integration.tests;
import static org.junit.Assert.assertEquals;
-import org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher;
-import org.eclipse.etrice.integration.tests.SubSystemHFSMTest;
-import org.eclipse.etrice.integration.tests.a_HFSM_Tester;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.messaging.RTServices;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
public class IntegrationTestFSMGenerator extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2 b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2
deleted file mode 100644
index ead7343a2..000000000
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestFSMGenerator.mwe2
+++ /dev/null
@@ -1,18 +0,0 @@
-module integration_test_fsm
-
-import workflow.RoomGenerator
-import org.eclipse.emf.mwe.utils.*
-
-var destDir = "src-gen"
-
-Workflow {
-
- component = DirectoryCleaner {
- directory = destDir
- }
-
- component = @RoomGenerator {
- sourceDir = "model"
- targetDir = destDir
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
index dfc6d85ff..23e602e25 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestHandler.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.HandlerTest.SubSystem_HandlerTest;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +26,6 @@ import org.junit.Test;
public class IntegrationTestHandler extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
index 0da06b16c..ec336a155 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThread.java
@@ -17,24 +17,13 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.PingPongThreadTest.SubSystem_PingPong;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
-
public class IntegrationTestPingPongThread extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=10000)
diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
index 85bb9dfa0..d09736500 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
@@ -17,24 +17,13 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.etrice.integration.SendingDataByValueTest.SubSys_SendingData;
import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.eclipse.etrice.runtime.java.modelbase.SubSystemClassBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
-
public class IntegrationTestSendingDataByValue extends IntegrationTestBase {
@Before
public void setUp() throws Exception {
- // we have to launch a JUnit Plugin test since for the build we need an Eclipse environment
- // in this context the Mwe2Launcher suffers from https://bugs.eclipse.org/bugs/show_bug.cgi?id=318721
- /*
- Mwe2Launcher.main(new String[]{"/org.eclipse.etrice.integration.tests/src/de/protos/etrice/integration/test/IntegrationTestFSMGenerator.mwe2"});
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject("/org.eclipse.etrice.integration.tests");
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
- */
}
@Test (timeout=5000)

Back to the top