move marking aspects to subdirectory

build.gradle

@@ -31,6 +31,10 @@ def jastaddGenSources = objects.sourceDirectorySet("resources", "Resources2")
 jastaddGenSources.srcDir 'src/gen'
 jastaddGenSources.include 'jastadd/*.relast', 'jastadd/*.ecore.jadd'
 
+def jastaddInheritedSources = objects.sourceDirectorySet("resources", "Resources3")
+jastaddInheritedSources.srcDir 'build/tmp/'
+jastaddInheritedSources.include 'jastadd/**'
+
 sourceSets {
     model {
         java {
@@ -43,6 +47,7 @@ sourceSets {
         resources {
             source(jastaddSources)
             source(jastaddGenSources)
+            source(jastaddInheritedSources)
         }
     }
     test {
@@ -111,7 +116,7 @@ test {
 
 // Generated files
 
-def relastInputFiles = ['build/tmp/jastadd/placeTransition.relast', 'src/main/jastadd/Marking.relast']
+def relastInputFiles = ['build/tmp/jastadd/pnml/placeTransition.relast', 'src/main/jastadd/marking/Marking.relast']
 def relastOutputFiles = ['src/gen/jastadd/placeTransition.ast', 'src/gen/jastadd/placeTransition.jadd']
 
 task extractJastAddSources(type: Sync) {

gradle.properties

 relast_version = 0.3.0-137
 jastaddgradle_version = 1.14.5
-pnml_relast_version = 0.4.0-5
\ No newline at end of file
+pnml_relast_version = 0.4.0-6
\ No newline at end of file