[460516] Bundle ANTLR 3.1.b1 and use Epsilon interim
diff --git a/features/org.eclipse.qvtd.epsilon-feature/feature.xml b/features/org.eclipse.qvtd.epsilon-feature/feature.xml
index 5f66b24..44815a8 100644
--- a/features/org.eclipse.qvtd.epsilon-feature/feature.xml
+++ b/features/org.eclipse.qvtd.epsilon-feature/feature.xml
@@ -80,4 +80,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.antlr.runtime_3.1.b1"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/EolTask.java b/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/EolTask.java
index d18eae5..e8236d6 100644
--- a/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/EolTask.java
+++ b/plugins/org.eclipse.qvtd.build.etl/src/org/eclipse/qvtd/build/etl/EolTask.java
@@ -18,7 +18,7 @@
import org.eclipse.epsilon.common.parse.problem.ParseProblem;
import org.eclipse.epsilon.eol.EolModule;
import org.eclipse.epsilon.eol.IEolExecutableModule;
-//import org.eclipse.epsilon.eol.dom.Operation;
+import org.eclipse.epsilon.eol.dom.Operation;
import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
import org.eclipse.epsilon.eol.models.IModel;
@@ -137,7 +137,7 @@
* @throws QvtMtcExecutionException If there was an error executing the operation.
*/
public void executeFromFirstOperation() throws QvtMtcExecutionException {
-/* prepare();
+ prepare();
Operation operation = module.getDeclaredOperations().get(0);
preProcess();
try {
@@ -156,7 +156,7 @@
}
}
module.getContext().getModelRepository().removeModel(model);
- } */
+ }
}
/**
@@ -168,7 +168,7 @@
* @throws QvtMtcExecutionException the execution exception
*/
private Object executeOperation(IEolExecutableModule module, String operationName) throws QvtMtcExecutionException {
-/* Operation operation = module.getDeclaredOperations().getOperation(operationName);
+ Operation operation = module.getDeclaredOperations().getOperation(operationName);
if(operation != null) {
try {
return operation.execute(null, Collections.EMPTY_LIST, module.getContext());
@@ -176,7 +176,7 @@
e.printStackTrace();
throw new QvtMtcExecutionException(e.getMessage());
}
- } */
+ }
return null;
}
diff --git a/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap b/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
index d573668..2b3ff3d 100644
--- a/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
+++ b/releng/org.eclipse.qvtd.releng.buckminster/releng/qvtd.rmap
@@ -369,6 +369,13 @@
</rm:provider>
</rm:searchPath>
<rm:searchPath name="epsilon">
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&(resolve.target.platform=true)(|(build.type=I)(build.type=N)))" readerType="p2" source="false" mutable="false">
+ <rm:property key="buckminster.source" value="false"/>
+ <rm:property key="buckminster.mutable" value="false"/>
+ <rm:uri format="{0}/epsilon/interim/">
+ <bc:propertyRef key="eclipse.download"/>
+ </rm:uri>
+ </rm:provider>
<rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(resolve.target.platform=true)" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
