[java8] Avoid use of build plugin by tests plugin
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/mwe/Generate OCL Test Models.launch b/examples/org.eclipse.ocl.examples.build/.launches/Generate OCL Test Models.launch
similarity index 82%
rename from tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/mwe/Generate OCL Test Models.launch
rename to examples/org.eclipse.ocl.examples.build/.launches/Generate OCL Test Models.launch
index a2e3100..9bd1824 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/mwe/Generate OCL Test Models.launch
+++ b/examples/org.eclipse.ocl.examples.build/.launches/Generate OCL Test Models.launch
@@ -9,8 +9,7 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<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/ocl/examples/xtext/tests/mwe/GenerateTestModels.mwe2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ocl.examples.build"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx512M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:org.eclipse.ocl.examples.xtext.tests}"/>
</launchConfiguration>
diff --git a/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF
index 87b9cbd..f150548 100644
--- a/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF
@@ -30,7 +30,8 @@
org.eclipse.ocl.examples.autogen;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
org.eclipse.ocl.examples.uml25;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
org.eclipse.ocl.examples.debug.vm;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.qvtd.cs2as.compiler;resolution:=optional
+ org.eclipse.qvtd.cs2as.compiler;resolution:=optional,
+ org.eclipse.ocl.examples.xtext.tests
Import-Package: org.apache.commons.logging,
org.apache.log4j;version="[1.2.15,2.0.0)"
Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/mwe/GenerateTestModels.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2
similarity index 100%
rename from tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/mwe/GenerateTestModels.mwe2
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateTestModels.mwe2
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
index 7f2f6b5..1600cbc 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
@@ -29,12 +29,9 @@
org.eclipse.ocl.examples.emf.validation.validity,
org.eclipse.xtext.junit4;bundle-version="[2.3.0,3.0.0)",
org.eclipse.ocl.examples.debug,
- org.objectweb.asm;bundle-version="[5.0.0,6.0.0)",
org.eclipse.debug.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ocl.examples.validity;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ocl.examples.project.royalandloyal;resolution:=optional,
- org.eclipse.ocl.examples.build,
- org.eclipse.emf.mwe2.launch
+ org.eclipse.ocl.examples.project.royalandloyal;resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
