11 files changed, 38 insertions, 31 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
index 8f0e037a..6510a20a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Logic2viatra
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra,

- hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries,

- hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.util
-Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",

- hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",

- hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",

- hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",

- com.google.guava,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro,

- org.eclipse.viatra.query.runtime;bundle-version="1.5.0",

- org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",

- org.eclipse.viatra.query.patternlanguage;bundle-version="1.5.0",

- org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",

- com.google.inject;bundle-version="3.0.0",

- org.eclipse.xtext;bundle-version="2.10.0",

- org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.5.0",

+Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra,
+  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries,
+  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries.util
+Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ org.eclipse.viatra.query.runtime;bundle-version="1.5.0",
+ org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",
+ org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",
+ com.google.inject;bundle-version="3.0.0",
+ org.eclipse.xtext;bundle-version="2.10.0",
+ org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.5.0",
  org.eclipse.xtext.xbase;bundle-version="2.10.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/META-INF/MANIFEST.MF
index f0d42f2c..703a1cef 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Require-Bundle: com.google.guava,
  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",

  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/build.properties b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/build.properties
index aed85a48..704a86e2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/build.properties
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\

                .

 source.. = src/,\

-           src-gen/

+           src-gen/,\

+           xtend-gen/

 output.. = bin/

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
index ea971e17..91960c3a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
@@ -24,4 +24,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.viatra.query.runtime;bundle-version="1.5.0",

  org.eclipse.viatra.dse;bundle-version="0.15.0"

 Bundle-ActivationPolicy: lazy

+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage

 

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/build.properties b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/build.properties
index 72399047..b283764d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/build.properties
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/build.properties
@@ -6,5 +6,7 @@ bin.includes = .,\
                plugin.xml,\

                plugin.properties

 jars.compile.order = .

-source.. = ecore-gen/

+source.. = ecore-gen/,\

+           src/,\

+           xtend-gen/

 output.. = bin/

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF
index 13a297f2..ef1af4dd 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
  org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.log4j
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/build.properties b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/build.properties
index aed85a48..704a86e2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/build.properties
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\

                .

 source.. = src/,\

-           src-gen/

+           src-gen/,\

+           xtend-gen/

 output.. = bin/

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath
index 0a5954ed..88c4b9c4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.classpath
@@ -2,17 +2,12 @@
 <classpath>

         <classpathentry kind="src" path="src"/>

         <classpathentry kind="src" path="xtend-gen"/>

-        <classpathentry kind="src" path="tests"/>

-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">

-                <attributes>

-                        <attribute name="maven.pomderived" value="true"/>

-                </attributes>

-        </classpathentry>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

                 <attributes>

                         <attribute name="maven.pomderived" value="true"/>

                 </attributes>

         </classpathentry>

+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs
index 86260262..1ab2bb53 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
 eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

+org.eclipse.jdt.core.compiler.compliance=1.8

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
index c34c382d..18331278 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
@@ -15,4 +15,5 @@ Require-Bundle: com.google.guava,
  guru.nidi.graphviz-java;bundle-version="0.2.1"

 Import-Package: org.apache.log4j;version="1.2.15"

 Export-Package: hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz

+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.visualisation

 

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/build.properties b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/build.properties
index 41eb6ade..d6c49e5c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/build.properties
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/build.properties
@@ -1,4 +1,5 @@
-source.. = src/

+source.. = src/,\

+           xtend-gen/

 output.. = bin/

 bin.includes = META-INF/,\

                .