Pass ProjectManager to CompilerChain

22 files changed, 64 insertions, 49 deletions

diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/AbstractCompilerChain.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/AbstractCompilerChain.java
index 59d102f9c..9b1badae3 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/AbstractCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/AbstractCompilerChain.java
@@ -36,6 +36,7 @@ import org.eclipse.ocl.examples.codegen.dynamic.JavaFileUtil;
 import org.eclipse.ocl.examples.codegen.dynamic.JavaSourceFileObject;
 import org.eclipse.ocl.pivot.internal.manager.MetamodelManagerInternal;
 import org.eclipse.ocl.pivot.internal.utilities.EnvironmentFactoryInternal;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.ocl.pivot.utilities.PivotUtil;
 import org.eclipse.ocl.pivot.utilities.ThreadLocalExecutor;
@@ -164,7 +165,7 @@ public abstract class AbstractCompilerChain extends CompilerUtil implements Comp
 			super(compilerChain, JAVA_STEP);
 		}
 
-		protected @NonNull JavaResult execute(@NonNull QVTiEnvironmentFactory environmentFactory, @NonNull URI txURI, @NonNull ImperativeTransformation iTransformation, @NonNull String ... genModelFiles) throws Exception {
+		protected @NonNull JavaResult execute(@NonNull QVTbaseEnvironmentFactory environmentFactory, @NonNull URI txURI, @NonNull ImperativeTransformation iTransformation, @NonNull String ... genModelFiles) throws Exception {
 			ResourceSet resourceSet = environmentFactory.getResourceSet();
 			URI javaFileURI = compilerChain.getURI(JAVA_STEP, URI_KEY);
 			URI classFileURI = compilerChain.getURI(CLASS_STEP, URI_KEY);
@@ -332,6 +333,8 @@ public abstract class AbstractCompilerChain extends CompilerUtil implements Comp
 		return step2fileExtension.get(key);
 	}
 
+	protected final @NonNull ProjectManager projectManager;
+
 	/**
 	 * The compilation chain options are potentially 3-layered. The outer layer is indexed by the
 	 * compilation step output such as QVTI_KEY. The next layer is indexed by the role such as VALIDATE_KEY.
@@ -360,7 +363,8 @@ public abstract class AbstractCompilerChain extends CompilerUtil implements Comp
 	protected final @NonNull QVTs2QVTiCompilerStep qvts2qvtiCompilerStep;
 	protected final @NonNull QVTi2JavaCompilerStep qvti2javaCompilerStep;
 
-	protected AbstractCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+	protected AbstractCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+		this.projectManager = projectManager;
 		this.txURI = txURI;
 		this.intermediateFileNamePrefixURI = intermediateFileNamePrefixURI;
 		this.options = options;
@@ -461,8 +465,7 @@ public abstract class AbstractCompilerChain extends CompilerUtil implements Comp
 	public void dispose() {}
 
 	public @NonNull Class<? extends Transformer> generate(@NonNull ImperativeTransformation asTransformation, @NonNull String... genModelFiles) throws Exception {
-		QVTiEnvironmentFactory environmentFactory = getEnvironmentFactory();
-		JavaResult javaResult = qvti2java(environmentFactory, asTransformation, genModelFiles);
+		JavaResult javaResult = qvti2java(asTransformation, genModelFiles);
 		return java2class(javaResult);
 	}
 
@@ -511,7 +514,8 @@ public abstract class AbstractCompilerChain extends CompilerUtil implements Comp
 		return qvtu2qvtmCompilerStep.execute(environmentFactory, uResource);
 	}
 
-	protected @NonNull JavaResult qvti2java(@NonNull QVTiEnvironmentFactory environmentFactory, @NonNull ImperativeTransformation iTransformation, @NonNull String ... genModelFiles) throws Exception {
+	protected @NonNull JavaResult qvti2java(@NonNull ImperativeTransformation iTransformation, @NonNull String ... genModelFiles) throws Exception {
+		QVTbaseEnvironmentFactory environmentFactory = qvti2javaCompilerStep.getEnvironmentFactory();
 		return qvti2javaCompilerStep.execute(environmentFactory, txURI, iTransformation, genModelFiles);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTcCompilerChain.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTcCompilerChain.java
index 3cd174661..3a1492a35 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTcCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTcCompilerChain.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.OperationCallExp;
 import org.eclipse.ocl.pivot.resource.ASResource;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.internal.common.TypedModelsConfiguration;
 import org.eclipse.qvtd.compiler.internal.common.TypedModelsConfigurations;
 import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseEnvironmentFactory;
@@ -56,8 +57,8 @@ public class QVTcCompilerChain extends AbstractCompilerChain
 
 	protected final @NonNull Xtext2QVTcCompilerStep xtext2qvtcCompilerStep;
 
-	public QVTcCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-		super(txURI, intermediateFileNamePrefixURI, options);
+	public QVTcCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+		super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		this.xtext2qvtcCompilerStep = createXtext2QVTcCompilerStep();
 	}
 
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTiCompilerChain.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTiCompilerChain.java
index 19d5aa226..1926e13a8 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTiCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTiCompilerChain.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.qvtd.compiler.internal.common.TypedModelsConfigurations;
 import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseEnvironmentFactory;
@@ -43,8 +44,8 @@ public class QVTiCompilerChain extends AbstractCompilerChain
 
 	protected final @NonNull Xtext2QVTiCompilerStep xtext2qvtiCompilerStep;
 
-	public QVTiCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-		super(txURI, intermediateFileNamePrefixURI, options);
+	public QVTiCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+		super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		this.xtext2qvtiCompilerStep = createXtext2QVTiCompilerStep();
 	}
 
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java
index 74d2fdf51..a70c64063 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/QVTrCompilerChain.java
@@ -444,8 +444,8 @@ public class QVTrCompilerChain extends AbstractCompilerChain
 	protected final @NonNull CreateGenModelCompilerStep createGenModelCompilerStep;
 	protected final @NonNull GenModelGenerateCompilerStep genmodelGenerateCompilerStep;
 
-	public QVTrCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-		super(txURI, intermediateFileNamePrefixURI, options);
+	public QVTrCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+		super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		this.xtext2qvtrCompilerStep = createXtext2QVTrCompilerStep();
 		this.qvtr2qvtsCompilerStep = createQVTr2QVTsCompilerStep();
 		this.createGenModelCompilerStep = createCreateGenModelCompilerStepStep();
diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java
index 3d5dd0fd5..fe37c0e3d 100644
--- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/OCL2QVTiCompilerChain.java
@@ -125,7 +125,7 @@ public class OCL2QVTiCompilerChain extends AbstractCompilerChain {
 	 */
 	public OCL2QVTiCompilerChain(@NonNull QVTimperative qvti, @NonNull CompilerOptions options,
 			@NonNull URI oclDocURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull URI... extendedDocURIs) throws CompilerChainException {
-		super(oclDocURI, intermediateFileNamePrefixURI, options);
+		super(qvti.getProjectManager(), oclDocURI, intermediateFileNamePrefixURI, options);
 		this.ocl2qvtmCompilerStep = new OCL2QVTmCompilerStep(this, qvti, options, oclDocURI, extendedDocURIs);
 	}
 
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
index e8d006cdf..8e10678a4 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
@@ -48,6 +48,7 @@ import org.eclipse.ocl.examples.debug.vm.ui.launching.LaunchingUtils;
 import org.eclipse.ocl.pivot.internal.manager.MetamodelManagerInternal;
 import org.eclipse.ocl.pivot.internal.utilities.OCLInternal;
 import org.eclipse.ocl.pivot.resource.BasicProjectManager;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.ocl.pivot.utilities.URIUtil;
 import org.eclipse.ocl.pivot.utilities.XMIUtil;
@@ -177,7 +178,7 @@ public abstract class MainTab<TX> extends AbstractMainTab implements QVTiLaunchC
 			SimpleConfigurations typedModelsConfigurations = new SimpleConfigurations(outputName);
 			options.setOption(CompilerChain.DEFAULT_STEP, CompilerChain.SAVE_OPTIONS_KEY, XMIUtil.createSaveOptions());
 			//	QVTimperative qvt = QVTimperative.newInstance(BasicProjectManager.CLASS_PATH, null);
-			CompilerChain compilerChain2 = createCompilerChain(txURI, options);
+			CompilerChain compilerChain2 = createCompilerChain(ProjectManager.CLASS_PATH, txURI, options);
 			compilerChain2.addListener(this);
 			if (isInterpreted()) {
 				compilerChain2.compile(typedModelsConfigurations);
@@ -562,7 +563,7 @@ public abstract class MainTab<TX> extends AbstractMainTab implements QVTiLaunchC
 		}
 	}
 
-	protected abstract @NonNull CompilerChain createCompilerChain(@NonNull URI txURI, @NonNull CompilerOptions options);
+	protected abstract @NonNull CompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull CompilerOptions options);
 
 	protected @NonNull DefaultCompilerOptions createCompilerOptions() {
 		return new DefaultCompilerOptions();
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcMainTab.java
index d3a28f8ce..d73c95670 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcMainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTcMainTab.java
@@ -17,6 +17,7 @@ import java.util.Map;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.QVTcCompilerChain;
 import org.eclipse.qvtd.compiler.CompilerOptions;
@@ -33,8 +34,8 @@ import com.google.common.collect.Lists;
 public class QVTcMainTab extends QVTDirectionalMainTab<Transformation>
 {
 	@Override
-	protected @NonNull QVTcCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull CompilerOptions options) {
-		return new QVTcCompilerChain(txURI, txURI, options);
+	protected @NonNull QVTcCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull CompilerOptions options) {
+		return new QVTcCompilerChain(projectManager, txURI, txURI, options);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java
index e76bcb3b9..151f1c027 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTiMainTab.java
@@ -17,6 +17,7 @@ import java.util.Map;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.ocl.pivot.utilities.XMIUtil;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.QVTiCompilerChain;
@@ -37,8 +38,8 @@ import com.google.common.collect.Lists;
 public class QVTiMainTab extends MainTab<Transformation> implements QVTiLaunchConstants
 {
 	@Override
-	protected @NonNull QVTiCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull CompilerOptions compilerOptions) {
-		return new QVTiCompilerChain(txURI, txURI, compilerOptions);
+	protected @NonNull QVTiCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull CompilerOptions compilerOptions) {
+		return new QVTiCompilerChain(projectManager, txURI, txURI, compilerOptions);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrMainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrMainTab.java
index cb35e916f..b71b5254c 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrMainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/QVTrMainTab.java
@@ -17,6 +17,7 @@ import java.util.Map;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.QVTrCompilerChain;
 import org.eclipse.qvtd.compiler.CompilerOptions;
@@ -35,9 +36,9 @@ import com.google.common.collect.Lists;
 public class QVTrMainTab extends QVTDirectionalMainTab<RelationalTransformation>
 {
 	@Override
-	protected @NonNull CompilerChain createCompilerChain(@NonNull URI txURI, @NonNull CompilerOptions options) {
+	protected @NonNull CompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull CompilerOptions options) {
 		QVTcoreStandaloneSetup.class.getName();			// QVTrCompilerChain doesn't initialize QVTc
-		return new QVTrCompilerChain(txURI, txURI, options);
+		return new QVTrCompilerChain(projectManager, txURI, txURI, options);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java
index b5d13b2ea..6cdc562ac 100644
--- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTcLaunchConfigurationDelegate.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.DefaultCompilerOptions;
 import org.eclipse.qvtd.compiler.QVTcCompilerChain;
@@ -83,7 +84,7 @@ public class QVTcLaunchConfigurationDelegate extends QVTiLaunchConfigurationDele
 				return false;
 			}
 		}
-		CompilerChain compilerChain = new QVTcCompilerChain(txURI, txURI, compilerOptions);
+		CompilerChain compilerChain = new QVTcCompilerChain(ProjectManager.CLASS_PATH, txURI, txURI, compilerOptions);
 		try {
 			if (interpreted) {
 				compilerChain.compile(typedModelsConfigurations);
diff --git a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java
index 09fb86941..0d6092a5f 100644
--- a/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.qvtd.debug/src/org/eclipse/qvtd/debug/launching/QVTrLaunchConfigurationDelegate.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.DefaultCompilerOptions;
 import org.eclipse.qvtd.compiler.QVTrCompilerChain;
@@ -88,7 +89,7 @@ public class QVTrLaunchConfigurationDelegate extends QVTiLaunchConfigurationDele
 				return false;
 			}
 		}
-		CompilerChain compilerChain = new QVTrCompilerChain(txURI, txURI, compilerOptions);
+		CompilerChain compilerChain = new QVTrCompilerChain(ProjectManager.CLASS_PATH, txURI, txURI, compilerOptions);
 		try {
 			if (interpreted) {
 				compilerChain.compile(typedModelsConfigurations);
diff --git a/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java
index 5bf831828..b5e29be53 100644
--- a/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXLaunchConfigurationDelegate.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.DefaultCompilerOptions;
 import org.eclipse.qvtd.compiler.internal.common.SimpleConfigurations;
@@ -79,7 +80,7 @@ public class UMLXLaunchConfigurationDelegate extends QVTiLaunchConfigurationDele
 				return false;
 			}
 		}
-		CompilerChain compilerChain = new UMLXCompilerChain(txURI, txURI, compilerOptions);
+		CompilerChain compilerChain = new UMLXCompilerChain(ProjectManager.CLASS_PATH, txURI, txURI, compilerOptions);
 		try {
 			if (interpreted) {
 				compilerChain.compile(typedModelsConfigurations);
diff --git a/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java
index 94bc57af8..efb277f10 100644
--- a/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java
+++ b/plugins/org.eclipse.qvtd.umlx.ui/src/org/eclipse/qvtd/umlx/ui/launching/UMLXMainTab.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.ocl.pivot.utilities.ClassUtil;
 import org.eclipse.ocl.pivot.utilities.PivotUtil;
 import org.eclipse.ocl.pivot.utilities.TreeIterable;
@@ -46,9 +47,9 @@ import com.google.common.collect.Lists;
 public class UMLXMainTab extends DirectionalMainTab<TxDiagram>
 {
 	@Override
-	protected @NonNull CompilerChain createCompilerChain(@NonNull URI txURI, @NonNull CompilerOptions compilerOptions) {
+	protected @NonNull CompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull CompilerOptions compilerOptions) {
 		QVTcoreStandaloneSetup.class.getName();			// QVTrCompilerChain doesn't initialize QVTc
-		return new UMLXCompilerChain(txURI, txURI, compilerOptions);
+		return new UMLXCompilerChain(projectManager, txURI, txURI, compilerOptions);
 	}
 
 	private void gatherOutputModels(@NonNull List<TxTypedModelNode> outputModels, @NonNull TxTypedModelNode typedModel) {
diff --git a/plugins/org.eclipse.qvtd.umlx/src/org/eclipse/qvtd/umlx/compiler/UMLXCompilerChain.java b/plugins/org.eclipse.qvtd.umlx/src/org/eclipse/qvtd/umlx/compiler/UMLXCompilerChain.java
index 2c794a391..9f22f445c 100644
--- a/plugins/org.eclipse.qvtd.umlx/src/org/eclipse/qvtd/umlx/compiler/UMLXCompilerChain.java
+++ b/plugins/org.eclipse.qvtd.umlx/src/org/eclipse/qvtd/umlx/compiler/UMLXCompilerChain.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.ocl.pivot.resource.ProjectManager;
 import org.eclipse.qvtd.compiler.AbstractCompilerStep;
 import org.eclipse.qvtd.compiler.CompilerChain;
 import org.eclipse.qvtd.compiler.CompilerChainException;
@@ -61,8 +62,8 @@ public class UMLXCompilerChain extends QVTrCompilerChain
 
 	protected final @NonNull UMLX2QVTrCompilerStep umlx2qvtrCompilerStep;
 
-	public UMLXCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-		super(txURI, intermediateFileNamePrefixURI, options);
+	public UMLXCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+		super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		this.umlx2qvtrCompilerStep = createUMLX2QVTrCompilerStep();
 	}
 
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java
index 667be374c..526b1e537 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/utilities/CompileQVTrTransformation.java
@@ -59,8 +59,8 @@ public class CompileQVTrTransformation extends AbstractWorkflowComponent
 		}
 
 		@Override
-		protected @NonNull QVTrCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-			QVTrCompilerChain compilerChain = new QVTrCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		protected @NonNull QVTrCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+			QVTrCompilerChain compilerChain = new QVTrCompilerChain(projectManager, txURI, intermediateFileNamePrefixURI, options);
 			compilerChain.addListener(new Listener()
 			{
 				@Override
diff --git a/tests/org.eclipse.qvtd.atl.tests/src/org/eclipse/qvtd/atl/tests/ATLExampleTests.java b/tests/org.eclipse.qvtd.atl.tests/src/org/eclipse/qvtd/atl/tests/ATLExampleTests.java
index 1e5a1cb73..bde735d0a 100644
--- a/tests/org.eclipse.qvtd.atl.tests/src/org/eclipse/qvtd/atl/tests/ATLExampleTests.java
+++ b/tests/org.eclipse.qvtd.atl.tests/src/org/eclipse/qvtd/atl/tests/ATLExampleTests.java
@@ -90,8 +90,8 @@ public class ATLExampleTests extends LoadTestCase
 		}
 
 		@Override
-		protected @NonNull AbstractCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-			return new QVTrCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		protected @NonNull AbstractCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+			return new QVTrCompilerChain(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
index 1e0fca178..7d3508cc6 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/OCL2QVTiTestCases.java
@@ -93,7 +93,7 @@ public class OCL2QVTiTestCases extends LoadTestCase
 		}
 
 		@Override
-		protected @NonNull AbstractCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+		protected @NonNull AbstractCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
 			try {
 				return new OCL2QVTiCompilerChain(this, createCompilerOptions(), txURI, getTestURIWithExtension(txURI, null));
 			} catch (CompilerChainException e) {
diff --git a/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java b/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java
index b7f7d2caa..ba9ead747 100644
--- a/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java
+++ b/tests/org.eclipse.qvtd.umlx.tests/src/org/eclipse/qvtd/umlx/tests/UMLXCompilerTests.java
@@ -57,8 +57,8 @@ public class UMLXCompilerTests extends LoadTestCase
 	{
 		protected class InstrumentedCompilerChain extends UMLXCompilerChain
 		{
-			protected InstrumentedCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @Nullable CompilerOptions options) {
-				super(txURI, intermediateFileNamePrefixURI, options);
+			protected InstrumentedCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @Nullable CompilerOptions options) {
+				super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 			}
 
 			@Override
@@ -85,8 +85,8 @@ public class UMLXCompilerTests extends LoadTestCase
 		}
 
 		@Override
-		protected @NonNull UMLXCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-			return new InstrumentedCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		protected @NonNull UMLXCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+			return new InstrumentedCompilerChain(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/AbstractTestQVT.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/AbstractTestQVT.java
index 5b29fee95..708f56ff1 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/AbstractTestQVT.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/AbstractTestQVT.java
@@ -376,7 +376,7 @@ public abstract class AbstractTestQVT extends QVTimperative
 		return classpath;
 	}
 
-	protected abstract @NonNull AbstractCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI,
+	protected abstract @NonNull AbstractCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI,
 			@NonNull CompilerOptions options);
 
 	protected @NonNull DefaultCompilerOptions createCompilerChainOptions() {
@@ -480,7 +480,7 @@ public abstract class AbstractTestQVT extends QVTimperative
 
 	protected @NonNull Class<? extends Transformer> doBuild(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull TypedModelsConfigurations typedModelsConfigurations,
 			@NonNull CompilerOptions options, @NonNull String @NonNull ... genModelFiles) throws Exception {
-		compilerChain = createCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		compilerChain = createCompilerChain(getTestProjectManager(), txURI, intermediateFileNamePrefixURI, options);
 		ImperativeTransformation asTransformation = compilerChain.compile(typedModelsConfigurations);
 		URI asURI = asTransformation.eResource().getURI();
 		if (asURI != null) {
@@ -492,7 +492,7 @@ public abstract class AbstractTestQVT extends QVTimperative
 
 	protected <EF extends EnvironmentFactoryInternal> @NonNull ImperativeTransformation doCompile(@NonNull EnvironmentThreadFactory<@NonNull EF> environmentThreadFactory, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI,
 			@NonNull TypedModelsConfigurations typedModelsConfigurations, @NonNull CompilerOptions options) throws Exception {
-		compilerChain = createCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		compilerChain = createCompilerChain(getTestProjectManager(), txURI, intermediateFileNamePrefixURI, options);
 		ImperativeTransformation transformation = compilerChain.compile(typedModelsConfigurations);
 		URI txASURI = transformation.eResource().getURI();
 		if (txASURI != null) {
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
index 4e8dc26c1..cf2919565 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcCompilerTests.java
@@ -78,8 +78,8 @@ public class QVTcCompilerTests extends LoadTestCase
 	{
 		protected class InstrumentedCompilerChain extends QVTcCompilerChain
 		{
-			protected InstrumentedCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-				super(txURI, intermediateFileNamePrefixURI, options);
+			protected InstrumentedCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+				super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 			}
 
 			@Override
@@ -116,8 +116,8 @@ public class QVTcCompilerTests extends LoadTestCase
 		}
 
 		@Override
-		protected @NonNull QVTcCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-			return new InstrumentedCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		protected @NonNull QVTcCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+			return new InstrumentedCompilerChain(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		}
 
 		@Override
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java
index 2f1c410bb..00d225813 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiInterpreterTests.java
@@ -74,8 +74,8 @@ public class QVTiInterpreterTests extends LoadTestCase
 		}
 
 		@Override
-		protected @NonNull AbstractCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-			return new QVTiCompilerChain(txURI, intermediateFileNamePrefixURI/*getTestURIWithExtension(txURI, null)*/, createCompilerOptions());
+		protected @NonNull AbstractCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+			return new QVTiCompilerChain(projectManager, txURI, intermediateFileNamePrefixURI/*getTestURIWithExtension(txURI, null)*/, createCompilerOptions());
 		}
 
 		@Override
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index e1e90d9c2..bb9c3efdb 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -111,8 +111,8 @@ public class QVTrCompilerTests extends LoadTestCase
 	{
 		protected class InstrumentedCompilerChain extends QVTrCompilerChain
 		{
-			protected InstrumentedCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-				super(txURI, intermediateFileNamePrefixURI, options);
+			protected InstrumentedCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+				super(projectManager, txURI, intermediateFileNamePrefixURI, options);
 			}
 
 			@Override
@@ -175,8 +175,8 @@ public class QVTrCompilerTests extends LoadTestCase
 		}
 
 		@Override
-		protected @NonNull QVTrCompilerChain createCompilerChain(@NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
-			return new InstrumentedCompilerChain(txURI, intermediateFileNamePrefixURI, options);
+		protected @NonNull QVTrCompilerChain createCompilerChain(@NonNull ProjectManager projectManager, @NonNull URI txURI, @NonNull URI intermediateFileNamePrefixURI, @NonNull CompilerOptions options) {
+			return new InstrumentedCompilerChain(projectManager, txURI, intermediateFileNamePrefixURI, options);
 		}
 
 		@Override