- removed old constraints implementation and epsilon dependencies, #89 (6cf9abc0) · Commits · TDL Open Source / TOP IDE

features/org.etsi.mts.tdl.constraints.feature/feature.xml

+2 −18

Original line number	Diff line number	Diff line
		@@ -306,21 +306,11 @@ any resulting litigation.

		<requires>
		<import plugin="org.eclipse.emf.common"/>
		<import plugin="org.eclipse.epsilon.common"/>
		<import plugin="org.eclipse.epsilon.emc.emf"/>
		<import plugin="org.eclipse.epsilon.eol.engine"/>
		<import plugin="org.eclipse.epsilon.erl.engine"/>
		<import plugin="org.eclipse.epsilon.evl.engine"/>
		<import plugin="org.eclipse.epsilon.evl.emf.validation"/>
		<import plugin="org.eclipse.epsilon.etl.engine"/>
		<import plugin="org.eclipse.epsilon.profiling"/>
		<import plugin="org.eclipse.epsilon.eol.tools"/>
		<import plugin="org.eclipse.core.runtime"/>
		<import plugin="org.eclipse.emf.ecore"/>
		<import plugin="org.eclipse.emf.ecore.xmi"/>
		<import plugin="org.etsi.mts.tdl.model"/>
		<import plugin="org.eclipse.xtext"/>
		<import plugin="org.eclipse.epsilon.common.dt"/>
		<import plugin="org.eclipse.ocl.xtext.completeocl"/>
		<import plugin="org.eclipse.ui"/>
		<import plugin="org.eclipse.core.resources"/>
		@@ -335,16 +325,10 @@ any resulting litigation.

		<plugin
		id="org.etsi.mts.tdl.constraints"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.constraints.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		</feature>

features/org.etsi.mts.tdl.ttcn3.feature/feature.xml

+2 −24

Original line number	Diff line number	Diff line
		@@ -305,38 +305,16 @@ any resulting litigation.
		</license>

		<requires>
		<import plugin="org.eclipse.emf.common"/>
		<import plugin="org.eclipse.core.runtime"/>
		<import plugin="org.eclipse.emf.ecore"/>
		<import plugin="org.eclipse.osgi"/>
		<import plugin="org.etsi.mts.tdl.model"/>
		<import plugin="de.ugoe.cs.swe.TTCN3"/>
		<import plugin="org.eclipse.epsilon.common"/>
		<import plugin="org.eclipse.epsilon.emc.emf"/>
		<import plugin="org.eclipse.epsilon.eol.engine"/>
		<import plugin="org.eclipse.epsilon.etl.engine"/>
		<import plugin="org.eclipse.ui"/>
		<import plugin="org.eclipse.core.resources"/>
		<import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
		<import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
		<import plugin="org.eclipse.ui.workbench"/>
		<import plugin="org.eclipse.xtext"/>
		<import plugin="org.eclipse.xtext.ui"/>
		<import plugin="de.ugoe.cs.swe.TTCN3.ui"/>
		</requires>

		<plugin
		id="org.etsi.mts.tdl.ttcn3"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		<plugin
		id="org.etsi.mts.tdl.ttcn3.ui"
		download-size="0"
		install-size="0"
		version="0.0.0"
		unpack="false"/>
		version="0.0.0"/>

		</feature>

org.etsi.mts.tdl.parent/pom.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -53,9 +53,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
		<module>../plugins/org.etsi.mts.tdl.wizards</module>
		<module>../plugins/org.etsi.mts.tdl.execution.java</module>
		<module>../plugins/org.etsi.mts.tdl.execution.java.codegen</module>
		<!-- Constraints -->
		<!-- Constraints legacy -->
		<!--
		<module>../plugins/org.etsi.mts.tdl.constraints</module>
		<module>../plugins/org.etsi.mts.tdl.constraints.ui</module>
		-->
		<module>../plugins/org.etsi.mts.tdl.constraints.helper</module>
		<!-- GR -->
		<module>../plugins/org.etsi.mts.tdl.graphical.labels.data</module>
		@@ -67,7 +69,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
		<module>../features/org.etsi.mts.tdl.txi.feature</module>
		<module>../plugins/org.etsi.mts.tdl.TDLan2.feature</module>
		<module>../plugins/org.etsi.mts.tdl.TPLan2.feature</module>
		<!--
		<module>../features/org.etsi.mts.tdl.constraints.feature</module>
		-->
		<module>../features/org.etsi.mts.tdl.converters.feature</module>
		<module>../features/org.etsi.mts.tdl.util.feature</module>
		<module>../features/org.etsi.mts.tdl.tools.to.docx.feature</module>

plugins/org.etsi.mts.tdl.standalone/META-INF/MANIFEST.MF

+1 −3

Original line number	Diff line number	Diff line
		@@ -10,15 +10,13 @@ Require-Bundle: org.eclipse.core.runtime,
		org.eclipse.core.resources,
		org.eclipse.emf.ecore,
		org.eclipse.xtext,
		org.eclipse.ocl.xtext.essentialocl,
		org.eclipse.ocl.xtext.completeocl,
		org.etsi.mts.tdl.model,
		org.etsi.mts.tdl.common,
		org.etsi.mts.tdl.helper,
		org.etsi.mts.tdl.to2tdl,
		org.etsi.mts.tdl.asn2tdl,
		org.etsi.mts.tdl.openapi2tdl.next,
		org.etsi.mts.tdl.constraints,
		org.eclipse.epsilon.evl.engine,
		org.etsi.mts.tdl.tools.to.docx.poi,
		org.etsi.mts.tdl.json2tdl,
		org.eclipse.emf.common,

plugins/org.etsi.mts.tdl.standalone/src/org/etsi/mts/tdl/standalone/Standalone.java

+9 −11

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.resource.Resource;
		import org.eclipse.emf.ecore.resource.ResourceSet;
		import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
		import org.eclipse.emf.ecore.util.EcoreUtil;
		import org.eclipse.epsilon.evl.execute.UnsatisfiedConstraint;
		import org.eclipse.ocl.pivot.ExpressionInOCL;
		import org.eclipse.ocl.pivot.utilities.OCL;
		import org.eclipse.ocl.pivot.utilities.ParserException;
		@@ -41,7 +40,6 @@ import org.etsi.mts.tdl.TestDescription;
		import org.etsi.mts.tdl.tdlFactory;
		import org.etsi.mts.tdl.tdlPackage;
		import org.etsi.mts.tdl.asn2tdl.ASN2TDLTranslator;
		import org.etsi.mts.tdl.constraints.evl.Validator;
		import org.etsi.mts.tdl.helper.TDLHelper;
		import org.etsi.mts.tdl.json2tdl.JSON2TDLTranslator;
		import org.etsi.mts.tdl.json2tdl.TDL2JSONTranslator;
		@@ -349,21 +347,21 @@ public class Standalone {

		private void validate(String path) {
		Resource resource = ResourceHandler.load(path);
		Validator validator = new Validator();
		// Validator validator = new Validator();
		//TODO: make robust against unresolved imports
		//TODO: report parsing / resolution errors
		try {
		List<UnsatisfiedConstraint> violations = validator.validate(resource);
		validator.dumpViolations(violations, true);
		} catch (Exception e) {
		e.printStackTrace();
		}
		// try {
		// List<UnsatisfiedConstraint> violations = validator.validate(resource);
		// validator.dumpViolations(violations, true);
		// } catch (Exception e) {
		// e.printStackTrace();
		// }
		}

		private void validateOCL(String path) {
		Resource resource = ResourceHandler.load(path);
		Validator validator = new Validator();
		validator.validateOCL2(resource);
		// Validator validator = new Validator();
		// validator.validateOCL2(resource);
		}

		private void evaluateOCLInline(String path) {