summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahaase2008-03-01 11:04:09 (EST)
committer ahaase2008-03-01 11:04:09 (EST)
commit378b5b8a841e3cb4971d6b5d42a2f6f88d20394b (patch)
tree274536c4cc10dd40a415a9faf641ee45bad07c49
parent72579e2a35cd4524e1177a84f76c9db1d73ee2c6 (diff)
downloadorg.eclipse.xpand-378b5b8a841e3cb4971d6b5d42a2f6f88d20394b.zip
org.eclipse.xpand-378b5b8a841e3cb4971d6b5d42a2f6f88d20394b.tar.gz
org.eclipse.xpand-378b5b8a841e3cb4971d6b5d42a2f6f88d20394b.tar.bz2
merged middleend plugin into backend
-rw-r--r--plugins/org.eclipse.xtend.backend/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.xtend.backend/build.properties3
-rw-r--r--plugins/org.eclipse.xtend.backend/plugin.xml6
-rw-r--r--plugins/org.eclipse.xtend.backend/schema/MiddleEnd.exsd (renamed from plugins/org.eclipse.xtend.middleend/schema/MiddleEnd.exsd)0
-rw-r--r--plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/MiddleEnd.java (renamed from plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/MiddleEnd.java)0
-rw-r--r--plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/MiddleEndFactory.java (renamed from plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/MiddleEndFactory.java)0
-rw-r--r--plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/internal/Activator.java (renamed from plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/internal/Activator.java)2
-rw-r--r--plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEnd.java (renamed from plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEnd.java)0
-rw-r--r--plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEndFactory.java (renamed from plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEndFactory.java)0
-rw-r--r--plugins/org.eclipse.xtend.backend/todo.txt36
-rw-r--r--plugins/org.eclipse.xtend.middleend.old/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.xtend.middleend.old/plugin.xml4
-rw-r--r--plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandBackendFacade.java39
-rw-r--r--plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandComponent.java2
-rw-r--r--plugins/org.eclipse.xtend.middleend/DELETE_THIS_PLUGIN0
-rw-r--r--plugins/org.eclipse.xtend.middleend/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.xtend.middleend/plugin.xml1
-rw-r--r--tests/org.eclipse.xtend.backend.test/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.xtend.middleend.old.test/META-INF/MANIFEST.MF1
19 files changed, 66 insertions, 47 deletions
diff --git a/plugins/org.eclipse.xtend.backend/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtend.backend/META-INF/MANIFEST.MF
index c56797d..4357b09 100644
--- a/plugins/org.eclipse.xtend.backend/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtend.backend/META-INF/MANIFEST.MF
@@ -1,9 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Backend Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.xtend.backend
+Bundle-SymbolicName: org.eclipse.xtend.backend;singleton:=true
Bundle-Version: 0.7.0
-Export-Package: org.eclipse.xtend.backend;uses:="org.eclipse.xtend.backend.common",
+Export-Package: org.eclipose.xtend.middleend,
+ org.eclipose.xtend.middleend.internal;x-internal:=true,
+ org.eclipose.xtend.middleend.plugins,
+ org.eclipse.xtend.backend;uses:="org.eclipse.xtend.backend.common",
org.eclipse.xtend.backend.aop,
org.eclipse.xtend.backend.aop.internal;x-internal:=true,
org.eclipse.xtend.backend.common,
@@ -19,4 +22,8 @@ Export-Package: org.eclipse.xtend.backend;uses:="org.eclipse.xtend.backend.commo
org.eclipse.xtend.backend.types.java.internal;x-internal:=true,
org.eclipse.xtend.backend.util
Require-Bundle: org.apache.commons.logging,
- org.eclipse.emf.ecore
+ org.eclipse.emf.ecore,
+ org.eclipse.osgi,
+ org.eclipse.equinox.registry
+Eclipse-LazyStart: true
+Bundle-Activator: org.eclipose.xtend.middleend.internal.Activator
diff --git a/plugins/org.eclipse.xtend.backend/build.properties b/plugins/org.eclipse.xtend.backend/build.properties
index 34d2e4d..e9863e2 100644
--- a/plugins/org.eclipse.xtend.backend/build.properties
+++ b/plugins/org.eclipse.xtend.backend/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.xml
diff --git a/plugins/org.eclipse.xtend.backend/plugin.xml b/plugins/org.eclipse.xtend.backend/plugin.xml
new file mode 100644
index 0000000..13fa2cf
--- /dev/null
+++ b/plugins/org.eclipse.xtend.backend/plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="MiddleEnd" name="Middle End" schema="schema/MiddleEnd.exsd"/>
+
+</plugin>
diff --git a/plugins/org.eclipse.xtend.middleend/schema/MiddleEnd.exsd b/plugins/org.eclipse.xtend.backend/schema/MiddleEnd.exsd
index 1bea36e..1bea36e 100644
--- a/plugins/org.eclipse.xtend.middleend/schema/MiddleEnd.exsd
+++ b/plugins/org.eclipse.xtend.backend/schema/MiddleEnd.exsd
diff --git a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/MiddleEnd.java b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/MiddleEnd.java
index c7ba558..c7ba558 100644
--- a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/MiddleEnd.java
+++ b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/MiddleEnd.java
diff --git a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/MiddleEndFactory.java b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/MiddleEndFactory.java
index b2679ef..b2679ef 100644
--- a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/MiddleEndFactory.java
+++ b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/MiddleEndFactory.java
diff --git a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/internal/Activator.java b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/internal/Activator.java
index bea98d8..bad81b2 100644
--- a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/internal/Activator.java
+++ b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/internal/Activator.java
@@ -76,7 +76,7 @@ public class Activator implements BundleActivator {
_middleEndContributions.clear ();
try {
- final IConfigurationElement[] confEl = RegistryFactory.getRegistry().getConfigurationElementsFor ("org.eclipse.xtend.middleend.MiddleEnd");
+ final IConfigurationElement[] confEl = RegistryFactory.getRegistry().getConfigurationElementsFor ("org.eclipse.xtend.backend.MiddleEnd");
for (IConfigurationElement curEl: confEl) {
final Object o = curEl.createExecutableExtension ("class");
diff --git a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEnd.java b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEnd.java
index 351cd17..351cd17 100644
--- a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEnd.java
+++ b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEnd.java
diff --git a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEndFactory.java b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEndFactory.java
index feb6915..feb6915 100644
--- a/plugins/org.eclipse.xtend.middleend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEndFactory.java
+++ b/plugins/org.eclipse.xtend.backend/src/org/eclipose/xtend/middleend/plugins/LanguageSpecificMiddleEndFactory.java
diff --git a/plugins/org.eclipse.xtend.backend/todo.txt b/plugins/org.eclipse.xtend.backend/todo.txt
index 8b918b9..929c503 100644
--- a/plugins/org.eclipse.xtend.backend/todo.txt
+++ b/plugins/org.eclipse.xtend.backend/todo.txt
@@ -1,18 +1,20 @@
todo
----
-registry of handlers for different kinds of resources (including classes and byte code (?)); classes need way to express their fdc!!! --> rethink fdc concept?
+merge middleend and backend
+merge emftypes into backend?
+
+"compiled" LangueSpecificMiddleEnd
+move to m2t.common
+
+compiler / registry of handlers for different kinds of resources (including classes and byte code (?)); classes need way to express/serialize their fdc!!! --> rethink fdc concept?
--> via extension point (with a static "priority" getter to allow ordering)? Compiled first?
-make the concept of the "XyzRegistry" explicit, common abstraction --> interoperability of languages
-globalVars rauswerfen? --> ContributionStateContext?
JavaBeansType: Interfaces als Supertypen
-UML type system
-AOP
Profiler
Protected Region Resolver
+Classic
complete syslib: toUpper etc., List.sortBy(closure)
-new String --> ""
static properties; enums
@@ -20,8 +22,6 @@ kommentieren
dead code elimination?
-isInstance
-
syslib-Funktion: allFunctions (List<Type>) --> auch Funktionen ohne Parameter zur Laufzeit
finden (oder built-in? --> syslib-Aufruf verlässt den Scope)
Function-Match (z.B. &myFunc (String, Foo) --> spät binden! --> dynamisch durchgereichter Kram
@@ -36,11 +36,6 @@ Initialisierung der Functions mit FunctionDefContext: Nicht zwingend eager
zusätzlich zu statisch unterschiedenem this / Collection-Sonderfall außerdem
den generischen Fall --> aber nur dann (Ref-Typ "Object"), wenn es statisch
nicht entscheidbar ist. --> volle Rückwärtskompatibilität
-globale Type-Registry für alle zurückgegebenen Objekte --> nach beliebigem Rumreichen
- kann man an ihnen zumindest die eingebauten Operations aufrufen, auf ihre Properties
- zugreifen
-
-Konzept für stufenweises Überschreiben - syslib --> built-in operation --> Extension (oder so)
Debugger: ein Source-Primitive kann aus mehreren Runtime-Primitives bestehen - in der RT
markieren, wo neuer Source-Primitive beginnt? Oder einfach Mapping in Rückrichtung
@@ -48,12 +43,6 @@ Debugger: ein Source-Primitive kann aus mehreren Runtime-Primitives bestehen - i
tail recursion
replace/add von Extensions im dynamischen Scope
-equals auf Type-Implementierungen
-
-move to m2t.common
-
-JET support: JET templates are treated just like any other Java Bean
-
Unterstützung
-------------
UML und EMF testen
@@ -69,6 +58,7 @@ Collection.remove, Collection.removeAll return a boolean instead of the collecti
many collection operations (e.g. "flatten") retain the collection type now instead of always returning a list
renamed "flatten" to "flattenedCopy"
removed Collection.forAll (--> duplicate for notExists) and List.sortBy (very special functionality)
+JET support: JET templates are treated just like any other Java Bean
Ideen für die Zukunft
---------------------
@@ -103,3 +93,11 @@ potential bug - EfficientLazyString is mutable || return value from cached funct
flag "isImmutable" in EfficientLazyString; static method "concat" insetad of "append" to treat this transparently
logNullDeRef: log call stack including call parameters - runtime flag to log "verbosely"?
Map als Builtin-Typ
+globalVars rauswerfen? --> ContributionStateContext?
+UML type system
+equals auf Type-Implementierungen
+new String --> ""
+Optimierung: recursiveSupertypes initial ermitteln, speichern, bereitstellen & f. isAssignableFrom verwenden
+AOP
+Check
+make the concept of the "XyzRegistry" explicit, common abstraction --> interoperability of languages
diff --git a/plugins/org.eclipse.xtend.middleend.old/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtend.middleend.old/META-INF/MANIFEST.MF
index 2b81a61..27913d0 100644
--- a/plugins/org.eclipse.xtend.middleend.old/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtend.middleend.old/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.xtend.middleend.old;singleton:=true
Bundle-Version: 0.7.0
Require-Bundle: org.eclipse.xtend.backend,
org.eclipse.emf.ecore,
- org.eclipse.xtend.middleend,
org.eclipse.xtend.backend.emftypes,
org.eclipse.xtend,
org.eclipse.xpand,
diff --git a/plugins/org.eclipse.xtend.middleend.old/plugin.xml b/plugins/org.eclipse.xtend.middleend.old/plugin.xml
index f8207ba..efd115e 100644
--- a/plugins/org.eclipse.xtend.middleend.old/plugin.xml
+++ b/plugins/org.eclipse.xtend.middleend.old/plugin.xml
@@ -2,13 +2,13 @@
<?eclipse version="3.2"?>
<plugin>
<extension
- point="org.eclipse.xtend.middleend.MiddleEnd">
+ point="org.eclipse.xtend.backend.MiddleEnd">
<element_1
class="org.eclipse.xtend.middleend.old.plugin.OldXtendRegistryFactory">
</element_1>
</extension>
<extension
- point="org.eclipse.xtend.middleend.MiddleEnd">
+ point="org.eclipse.xtend.backend.MiddleEnd">
<element_1
class="org.eclipse.xtend.middleend.old.plugin.OldXpandRegistryFactory">
</element_1>
diff --git a/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandBackendFacade.java b/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandBackendFacade.java
index 6fccaf7..0f00cc1 100644
--- a/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandBackendFacade.java
+++ b/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandBackendFacade.java
@@ -38,6 +38,7 @@ import org.eclipse.xpand2.output.PostProcessor;
import org.eclipse.xtend.backend.BackendFacade;
import org.eclipse.xtend.backend.common.ExecutionContext;
import org.eclipse.xtend.backend.common.ExpressionBase;
+import org.eclipse.xtend.backend.common.FunctionDefContext;
import org.eclipse.xtend.backend.common.NamedFunction;
import org.eclipse.xtend.backend.functions.FunctionDefContextFactory;
import org.eclipse.xtend.backend.functions.FunctionDefContextInternal;
@@ -61,6 +62,7 @@ import org.eclipse.xtend.typesystem.MetaModel;
* @author Arno Haase (http://www.haase-consulting.com)
*/
public final class XpandBackendFacade {
+ private final String _xpandFile;
private final MiddleEnd _middleEnd;
private final String _fileEncoding;
@@ -96,9 +98,9 @@ public final class XpandBackendFacade {
* Both the "variables" and "outlets" parameter may be null.
*/
public static Object executeStatement (String code, String fileEncoding, Collection<MetaModel> mms, Map<String, Object> variables, Collection <Outlet> outlets) {
- return executeStatement(code, fileEncoding, mms, variables, outlets, null);
+ return executeStatement (code, fileEncoding, mms, variables, outlets, null);
}
-
+
/**
* This method executes Xpand code that is passed in as a string, script language style.<br>
*
@@ -109,17 +111,21 @@ public final class XpandBackendFacade {
* Secondly, no IMPORT or EXTENSION statements are possible. So types must be referenced by their fully qualified names, and no calls
* to extensions are possible. Calls to other templates that are available as files are possible, just as you would expect.<br>
*
- * The "variables", "outlets" and "advice" parameters parameter may be null.
+ * The "variables", "outlets" and "advice" parameter may be null.
*/
public static Object executeStatement (String code, String fileEncoding, Collection<MetaModel> mms, Map<String, Object> variables, Collection <Outlet> outlets, List<String> advice) {
- return createForFile (fileEncoding, mms, outlets).executeStatement (code, variables, advice);
+ return createForFile (null, fileEncoding, mms, outlets).executeStatement (code, variables, advice);
}
+
public Object executeStatement (String code, Map<String, Object> variables, List<String> advice) {
if (variables == null)
variables = new HashMap<String, Object> ();
if (advice == null)
advice = new ArrayList<String> ();
+
+ for (String adv: advice)
+ _middleEnd.applyAdvice (adv);
final Template tpl = XpandParseFacade.file (new StringReader (XpandTokens.LT + "DEFINE dUmMy FOR dUmMy" + XpandTokens.RT + code + XpandTokens.RT + XpandTokens.LT + "ENDDEFINE" + XpandTokens.RT), null);
final Statement[] statements = ((Definition) tpl.getDefinitions()[0]).getBody();
@@ -145,7 +151,7 @@ public final class XpandBackendFacade {
return converted.evaluate (backendCtx);
}
- private static void registerOutlets (ExecutionContext ctx, Collection<Outlet> outlets) {
+ public static void registerOutlets (ExecutionContext ctx, Collection<Outlet> outlets) {
for (Outlet oldOutlet: outlets) {
final FileOutlet newOutlet = new FileOutlet ();
newOutlet.setAppend (oldOutlet.isAppend());
@@ -239,8 +245,8 @@ public final class XpandBackendFacade {
}
}
- public static XpandBackendFacade createForFile (String fileEncoding, Collection<MetaModel> mms, Collection <Outlet> outlets) {
- return new XpandBackendFacade (fileEncoding, mms, outlets);
+ public static XpandBackendFacade createForFile (String xpandFilename, String fileEncoding, Collection<MetaModel> mms, Collection <Outlet> outlets) {
+ return new XpandBackendFacade (xpandFilename, fileEncoding, mms, outlets);
}
@@ -269,21 +275,28 @@ public final class XpandBackendFacade {
return result;
}
- private XpandBackendFacade (String fileEncoding, Collection<MetaModel> mms, Collection <Outlet> outlets) {
+
+ private XpandBackendFacade (String xpandFilename, String fileEncoding, Collection<MetaModel> mms, Collection <Outlet> outlets) {
if (outlets == null)
outlets = new ArrayList<Outlet> ();
- //TODO replace with version without OSGi dependency!
- //TODO externalize middleend initialization into the workflow!
+ _xpandFile = OldHelper.normalizeXpandResourceName (xpandFilename);
_middleEnd = MiddleEndFactory.create (OldHelper.guessTypesystem (mms), createSpecificParameters (fileEncoding, mms, outlets));
_fileEncoding = fileEncoding;
_mms = mms;
_outlets = outlets;
}
-
- public void applyAdvice (String resourceName) {
- _middleEnd.applyAdvice (resourceName);
+
+ public Collection<NamedFunction> getContributedFunctions () {
+ return _middleEnd.getFunctions(_xpandFile).getPublicFunctions();
+ }
+
+ public FunctionDefContext getFunctionDefContext () {
+ if (_xpandFile == null)
+ return new FunctionDefContextFactory (_middleEnd.getTypesystem()).create();
+
+ return _middleEnd.getFunctions (_xpandFile);
}
}
diff --git a/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandComponent.java b/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandComponent.java
index 6d92b16..d007ab4 100644
--- a/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandComponent.java
+++ b/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/XpandComponent.java
@@ -136,7 +136,7 @@ public class XpandComponent extends AbstractExpressionsUsingWorkflowComponent {
for (String name: wfContext.getSlotNames())
variables.put (name, wfContext.get (name));
- XpandBackendFacade.executeStatement (code, code, metaModels, variables, _outlets, _advice);
+ XpandBackendFacade.executeStatement (code, _fileEncoding, metaModels, variables, _outlets, _advice);
}
public void addOutlet (Outlet outlet) {
diff --git a/plugins/org.eclipse.xtend.middleend/DELETE_THIS_PLUGIN b/plugins/org.eclipse.xtend.middleend/DELETE_THIS_PLUGIN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/plugins/org.eclipse.xtend.middleend/DELETE_THIS_PLUGIN
diff --git a/plugins/org.eclipse.xtend.middleend/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtend.middleend/META-INF/MANIFEST.MF
index 79a8c03..9fbc71b 100644
--- a/plugins/org.eclipse.xtend.middleend/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xtend.middleend/META-INF/MANIFEST.MF
@@ -8,7 +8,5 @@ Require-Bundle: org.eclipse.xtend.backend,
org.eclipse.equinox.registry,
org.eclipse.osgi,
org.apache.commons.logging
-Export-Package: org.eclipose.xtend.middleend,
- org.eclipose.xtend.middleend.plugins
Bundle-Activator: org.eclipose.xtend.middleend.internal.Activator
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.xtend.middleend/plugin.xml b/plugins/org.eclipse.xtend.middleend/plugin.xml
index 4fa5641..33ca93c 100644
--- a/plugins/org.eclipse.xtend.middleend/plugin.xml
+++ b/plugins/org.eclipse.xtend.middleend/plugin.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="MiddleEnd" name="Middle Enf" schema="schema/MiddleEnd.exsd"/>
</plugin>
diff --git a/tests/org.eclipse.xtend.backend.test/META-INF/MANIFEST.MF b/tests/org.eclipse.xtend.backend.test/META-INF/MANIFEST.MF
index 852efeb..ff7c111 100644
--- a/tests/org.eclipse.xtend.backend.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtend.backend.test/META-INF/MANIFEST.MF
@@ -4,5 +4,4 @@ Bundle-Name: Test Plug-in
Bundle-SymbolicName: org.eclipse.xtend.backend.test
Bundle-Version: 1.0.0
Require-Bundle: org.eclipse.xtend.backend,
- org.junit4,
- org.eclipse.xtend.middleend
+ org.junit4
diff --git a/tests/org.eclipse.xtend.middleend.old.test/META-INF/MANIFEST.MF b/tests/org.eclipse.xtend.middleend.old.test/META-INF/MANIFEST.MF
index 1cf2aef..8054ef9 100644
--- a/tests/org.eclipse.xtend.middleend.old.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xtend.middleend.old.test/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.xtend.middleend.old.test
Bundle-Version: 1.0.0
Require-Bundle: org.eclipse.xtend.backend,
org.eclipse.xtend.middleend.old,
- org.eclipse.xtend.middleend,
org.eclipse.xtend,
org.eclipse.xpand,
org.eclipse.emf.mwe.core,