merge

build.gradle

@@ -28,7 +28,7 @@ buildscript {
 idea.module.generatedSourceDirs += file('src/gen/java')
 
 sourceSets.main.java.srcDir "src/gen/java"
-jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.pnml.Main')
+jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.pnml.splitter.Main')
 
 
 configurations {
@@ -36,6 +36,9 @@ configurations {
 }
 
 dependencies {
+
+    implementation project(':pnml-relast-base')
+
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
     implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
@@ -66,13 +69,11 @@ dependencies {
 // Default run configuration
 
 run {
-    mainClassName = 'de.tudresden.inf.st.pnml.Main'
+    mainClassName = 'de.tudresden.inf.st.pnml.splitter.Main'
     standardInput = System.in
 }
 
 // Generated files
-def ecoreFile = "./src/main/resources/placeTransition.ecore"
-def relastAspect = "./src/gen/jastadd/pnml/placeTransition.ecore.jadd"
 def relastFile = "./src/gen/jastadd/pnml/placeTransition.relast"
 
 jar {
@@ -93,24 +94,6 @@ jar {
 
 }
 
-// First phase: Ecore -> RelAst
-task ecoreToRelast(type: JavaExec) {
-    group = 'Build'
-    main = "-jar"
-
-
-    doFirst {
-        delete "src/gen/jastadd"
-        mkdir "src/gen/jastadd/pnml"
-    }
-
-    args "libs/ecore2relast-0.1.jar", ecoreFile, relastFile
-
-    inputs.files file(ecoreFile)
-    outputs.files file(relastFile), file(relastAspect)
-}
-
-// Second phase: RelAst -> JastAdd
 task relastToJastAdd(type: JavaExec) {
     group = 'Build'
     main = "-jar"
@@ -128,30 +111,6 @@ task relastToJastAdd(type: JavaExec) {
             "../pnml-relast-base/src/main/jastadd/clauses/expressions.relast"
 }
 
-task generateBeaver(type: JavaExec) {
-
-    inputs.files {
-        project.file("../pnml-relast-base/src/main/jastadd/clauses/Parser.beaver")
-    }
-    outputs.dir {
-        // This closure is needed to delay reading the genDir setting.
-        project.file("../pnml-relast-base/src/gen/java/de/tudresden/inf/st/pnml/jastadd/parser")
-    }
-
-    classpath = configurations.myBeaver
-    main = 'beaver.comp.run.Make'
-
-    doFirst {
-        def outdir = project.file("src/gen/java/de/tudresden/inf/st/pnml/jastadd/parser")
-        if (!outdir.isDirectory()) {
-            outdir.mkdirs()
-        }
-        def inputFile = project.file("../pnml-relast-base/src/main/jastadd/clauses/Parser.beaver")
-        args ([ '-d', outdir.path, '-t', '-c', '-w', inputFile.path ])
-    }
-}
-
-// Third phase: JastAdd -> Java (using JastAdd Gradle plugin)
 jastadd {
 
     configureModuleBuild()
@@ -168,28 +127,28 @@ jastadd {
             }
 
             jastadd {
-                include "src/main/jastadd/**/*.ast"
-                include "src/main/jastadd/**/*.jadd"
-                include "src/main/jastadd/**/*.jrag"
-                include "src/gen/jastadd/**/*.ast"
-                include "src/gen/jastadd/**/*.jadd"
-                include "src/gen/jastadd/**/*.jrag"
+                basedir ".."
+                include "pnml-relast-splitter/src/main/jastadd/**/*.ast"
+                include "pnml-relast-splitter/src/main/jastadd/**/*.jadd"
+                include "pnml-relast-splitter/src/main/jastadd/**/*.jrag"
 
-                include "../pnml-relast-base/src/main/jastadd/**/*.ast"
-                include "../pnml-relast-base/src/main/jastadd/**/*.jadd"
-                include "../pnml-relast-base/src/main/jastadd/**/*.jrag"
-                include "../pnml-relast-base/src/gen/jastadd/**/*.ast"
-                include "../pnml-relast-base/src/gen/jastadd/**/*.jadd"
-                include "../pnml-relast-base/src/gen/jastadd/**/*.jrag"
+                include "pnml-relast-base/src/main/jastadd/**/*.ast"
+                include "pnml-relast-base/src/main/jastadd/**/*.jadd"
+                include "pnml-relast-base/src/main/jastadd/**/*.jrag"
+                include "pnml-relast-base/src/gen/jastadd/**/*.ast"
+                include "pnml-relast-base/src/gen/jastadd/**/*.jadd"
+                include "pnml-relast-base/src/gen/jastadd/**/*.jrag"
             }
 
             scanner {
-                include "../pnml-relast-base/main/jastadd/PnmlScanner.flex"
-                include "../pnml-relast-base/jastadd/clauses/expressions.flex"
+                basedir ".."
+                include "pnml-relast-base/main/jastadd/PnmlScanner.flex"
+                include "pnml-relast-base/jastadd/clauses/expressions.flex"
             }
 
             parser {
-                include "../pnml-relast-base/jastadd/PnmlParser.parser"
+                basedir ".."
+                include "pnml-relast-base/jastadd/PnmlParser.parser"
             }
         }
     }
@@ -215,8 +174,9 @@ jastadd {
 }
 
 // Workflow configuration for phases
-relastToJastAdd.dependsOn ecoreToRelast
+relastToJastAdd.dependsOn ":pnml-relast-base:ecoreToRelast"
 generateAst.dependsOn relastToJastAdd
-compileJava.dependsOn generateBeaver
+compileJava.dependsOn ":pnml-relast-base:generateBeaver"
 //// always run jastadd
 //jastadd.outputs.upToDateWhen {false}
+

settings.gradle

-rootProject.name = 'pnml-splitter'

src/main/jastadd/conversion/PrimitiveElements.jadd

 aspect PrimitivesConversion {
 
     syn fr.lip6.move.pnml.ptnet.hlapi.TransitionHLAPI InputSignalTransition.convertToPnmlObject(){
-        return de.tudresden.inf.st.export.PrimitiveElementsConverter.convertTransitionToPnmlObject(this);
+        return de.tudresden.inf.st.pnml.splitter.export.PrimitiveElementsConverter.convertTransitionToPnmlObject(this);
     }
 
     syn fr.lip6.move.pnml.ptnet.hlapi.PlaceHLAPI OutputSignalPlace.convertToPnmlObject(){
-        return de.tudresden.inf.st.export.PrimitiveElementsConverter.convertPlaceToPnmlObject(this);
+        return de.tudresden.inf.st.pnml.splitter.export.PrimitiveElementsConverter.convertPlaceToPnmlObject(this);
     }
 
     //syn fr.lip6.move.pnml.ptnet.hlapi.ArcHLAPI Arc.convertToPnmlObject(){

src/main/java/de/tudresden/inf/st/pnml/splitter/Main.java

 package de.tudresden.inf.st.pnml.splitter;
 
+import de.tudresden.inf.st.pnml.base.parsing.PnmlParser;
 import de.tudresden.inf.st.pnml.splitter.export.PnmlExporter;
 import de.tudresden.inf.st.pnml.jastadd.model.*;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.PetriNet;
 import de.tudresden.inf.st.pnml.splitter.postprocessing.GlobalToLocalNetsPostProcessor;
 import de.tudresden.inf.st.pnml.splitter.postprocessing.PostProcessingUtils;
 import fr.lip6.move.pnml.framework.utils.exception.InvalidIDException;

src/main/java/de/tudresden/inf/st/pnml/splitter/copy/CopyPrimitiveElements.java

 package de.tudresden.inf.st.pnml.splitter.copy;
 
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.DefaultTransitionInformation;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.InputSignalBinding;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.InputSignalTransition;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.TransitionInformation;
+import de.tudresden.inf.st.pnml.jastadd.model.DefaultTransitionInformation;
+import de.tudresden.inf.st.pnml.jastadd.model.InputSignalBinding;
+import de.tudresden.inf.st.pnml.jastadd.model.InputSignalTransition;
+import de.tudresden.inf.st.pnml.jastadd.model.TransitionInformation;
 
 public class CopyPrimitiveElements {
 

src/main/java/de/tudresden/inf/st/pnml/splitter/export/ComplexElementsConverter.java

 package de.tudresden.inf.st.pnml.splitter.export;
 
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.Page;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.PetriNet;
+import de.tudresden.inf.st.pnml.jastadd.model.Page;
+import de.tudresden.inf.st.pnml.jastadd.model.PetriNet;
 import fr.lip6.move.pnml.framework.utils.exception.InvalidIDException;
 import fr.lip6.move.pnml.framework.utils.exception.VoidRepositoryException;
 import fr.lip6.move.pnml.ptnet.PNType;

src/main/java/de/tudresden/inf/st/pnml/splitter/export/PnmlExporter.java

 package de.tudresden.inf.st.pnml.splitter.export;
 
 import de.tudresden.inf.st.pnml.jastadd.model.*;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.*;
 import fr.lip6.move.pnml.framework.general.PnmlExport;
 import fr.lip6.move.pnml.framework.utils.ModelRepository;
 import fr.lip6.move.pnml.framework.utils.exception.*;

src/main/java/de/tudresden/inf/st/pnml/splitter/export/PrimitiveElementsConverter.java

 package de.tudresden.inf.st.pnml.splitter.export;
 
 import de.tudresden.inf.st.pnml.jastadd.model.*;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.*;
 import fr.lip6.move.pnml.framework.utils.exception.InvalidIDException;
 import fr.lip6.move.pnml.framework.utils.exception.VoidRepositoryException;
 import fr.lip6.move.pnml.ptnet.hlapi.*;

src/main/java/de/tudresden/inf/st/pnml/splitter/postprocessing/GlobalToLocalNetsPostProcessor.java

 package de.tudresden.inf.st.pnml.splitter.postprocessing;
 
 import de.tudresden.inf.st.pnml.splitter.constants.SplitterPnmlConstants;
-import de.tudresden.inf.st.constants.PnmlConstants;
+import de.tudresden.inf.st.pnml.base.constants.PnmlConstants;
 import de.tudresden.inf.st.pnml.splitter.export.PnmlExporter;
-import de.tudresden.inf.st.pnml.PnmlParser;
+import de.tudresden.inf.st.pnml.base.parsing.*;
 import de.tudresden.inf.st.pnml.jastadd.model.*;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.*;
 import fr.lip6.move.pnml.framework.utils.exception.InvalidIDException;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

src/main/java/de/tudresden/inf/st/pnml/splitter/postprocessing/PostProcessingUtils.java

 package de.tudresden.inf.st.pnml.splitter.postprocessing;
 
-import de.tudresden.inf.st.constants.PnmlConstants;
+import de.tudresden.inf.st.pnml.base.constants.PnmlConstants;
 import de.tudresden.inf.st.pnml.splitter.copy.CopyPrimitiveElements;
 import de.tudresden.inf.st.pnml.splitter.data.Tuple3;
 import de.tudresden.inf.st.pnml.jastadd.model.*;