Split project into base and example.

.gitignore

@@ -4,8 +4,3 @@
 .classpath
 .idea/
 .gradle/
-build
-src/gen-res/
-src/gen/
-out/
-*.class

build.gradle

-
-apply plugin: 'java'
-apply plugin: 'jastadd'
-apply plugin: 'application'
-apply plugin: "idea"
-
-sourceCompatibility = 1.8
-
-mainClassName = 'org.jastadd.ros2rag.compiler.Compiler'
-
-repositories {
-    jcenter()
+plugins {
+    id "com.github.ben-manes.versions" version "0.20.0"
 }
 
-buildscript {
-    repositories.jcenter()
-    dependencies {
-        classpath 'org.jastadd:jastaddgradle:1.13.3'
-    }
+allprojects  {
+	group = 'de.tudresden.inf.st'
+	version = '0.1'
 }
 
-dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
-    testCompile 'org.assertj:assertj-core:3.12.1'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.9.8'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    compile 'org.jastadd:jastadd:2.3.4'
-    runtime 'org.jastadd:jastadd:2.3.4'
-    compile group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0'
-}
-
-sourceSets {
-    main {
-        java.srcDir "src/gen/java"
-        java.srcDir "buildSrc/gen/java"
-    }
-}
-
-test {
-    useJUnitPlatform()
-
-    maxHeapSize = '1G'
-}
-
-jar {
-    manifest {
-        attributes "Main-Class": 'org.jastadd.ros2rag.compiler.Compiler'
-    }
-
-    from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-}
+subprojects {
+	apply plugin: 'java'
+	apply plugin: 'idea'
 
-jastadd {
-    configureModuleBuild()
-    modules {
-        //noinspection GroovyAssignabilityCheck
-        module("RelAst") {
+	sourceCompatibility = 1.8
+	targetCompatibility = 1.8
 
-            java {
-                basedir "."
-                include "src/main/**/*.java"
-                include "src/gen/**/*.java"
+	task packageSources(type: Jar) {
+		classifier = 'sources'
+		from sourceSets.main.allSource
 	}
 
-            jastadd {
-                basedir "src/main/jastadd/"
-                include "**/*.ast"
-                include "**/*.jadd"
-                include "**/*.jrag"
+	artifacts.archives packageSources
+	configurations {
+		testArtifacts.extendsFrom testRuntime
 	}
 
-            scanner {
-                include "src/main/jastadd/RelAst.flex"
+	task testJar(type: Jar) {
+		classifier "test"
+		from sourceSets.test.output
 	}
 
-            parser {
-                include "src/main/jastadd/Preamble.parser"
-                include "src/main/jastadd/RelAst.parser"
-            }
-        }
+	artifacts {
+		testArtifacts testJar
 	}
 
-    cleanGen.doFirst {
-        delete "src/gen/java/org"
-        delete "src/gen-res/BuildInfo.properties"
+	repositories {
+		mavenCentral()
 	}
 
-    preprocessParser.doFirst {
-
-        args += ["--no-beaver-symbol"]
-
+	dependencies {
+		implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
+		implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
+		testImplementation group: 'junit', name: 'junit', version: '4.12'
+		testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
 	}
 
-    module = "RelAst"
-
-    astPackage = 'org.jastadd.ros2rag.ast'
-
-    parser.name = 'RelAstParser'
-
-    genDir = 'src/gen/java'
-
-    buildInfoDir = 'src/gen-res'
-
-    scanner.genDir = "src/gen/java/org/jastadd/ros2rag/scanner"
-    parser.genDir = "src/gen/java/org/jastadd/ros2rag/parser"
-
-    jastaddOptions = ["--lineColumnNumbers", "--safeLazy", "--visitCheck=true", "--rewrite=cnta", "--cache=all"]
 }
-

gradle.properties

+jackson_version = 2.9.8
+apache_httpcomponents_version = 4.5.8

ros2rag.base/.gitignore

+build
+src/gen-res/
+src/gen/
+out/
+*.class

ros2rag.base/build.gradle

+apply plugin: 'jastadd'
+apply plugin: 'application'
+
+sourceCompatibility = 1.8
+
+mainClassName = 'org.jastadd.ros2rag.compiler.Compiler'
+
+repositories {
+    jcenter()
+}
+
+buildscript {
+    repositories.jcenter()
+    dependencies {
+        classpath 'org.jastadd:jastaddgradle:1.13.3'
+    }
+}
+
+dependencies {
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
+    testCompile 'org.assertj:assertj-core:3.12.1'
+    compile "com.fasterxml.jackson.core:jackson-core:${jackson_version}"
+    compile "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
+    compile 'org.jastadd:jastadd:2.3.4'
+    runtime 'org.jastadd:jastadd:2.3.4'
+    compile group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.10.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0'
+}
+
+sourceSets {
+    main {
+        java.srcDir "src/gen/java"
+        java.srcDir "buildSrc/gen/java"
+    }
+}
+
+test {
+    useJUnitPlatform()
+
+    maxHeapSize = '1G'
+}
+
+jar {
+    manifest {
+        attributes "Main-Class": 'org.jastadd.ros2rag.compiler.Compiler'
+    }
+
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
+jastadd {
+    configureModuleBuild()
+    modules {
+        //noinspection GroovyAssignabilityCheck
+        module("RelAst") {
+
+            java {
+                basedir "."
+                include "src/main/**/*.java"
+                include "src/gen/**/*.java"
+            }
+
+            jastadd {
+                basedir "src/main/jastadd/"
+                include "**/*.ast"
+                include "**/*.jadd"
+                include "**/*.jrag"
+            }
+
+            scanner {
+                include "src/main/jastadd/RelAst.flex"
+            }
+
+            parser {
+                include "src/main/jastadd/Preamble.parser"
+                include "src/main/jastadd/RelAst.parser"
+            }
+        }
+    }
+
+    cleanGen.doFirst {
+        delete "src/gen/java/org"
+        delete "src/gen-res/BuildInfo.properties"
+    }
+
+    preprocessParser.doFirst {
+
+        args += ["--no-beaver-symbol"]
+
+    }
+
+    module = "RelAst"
+
+    astPackage = 'org.jastadd.ros2rag.ast'
+
+    parser.name = 'RelAstParser'
+
+    genDir = 'src/gen/java'
+
+    buildInfoDir = 'src/gen-res'
+
+    scanner.genDir = "src/gen/java/org/jastadd/ros2rag/scanner"
+    parser.genDir = "src/gen/java/org/jastadd/ros2rag/parser"
+
+    jastaddOptions = ["--lineColumnNumbers", "--safeLazy", "--visitCheck=true", "--rewrite=cnta", "--cache=all"]
+}
+

src/main/jastadd/backend/Aspect.jadd → ros2rag.base/src/main/jastadd/backend/Aspect.jadd

@@ -55,11 +55,10 @@ aspect Aspect {
     // or
     topicForJoint_CurrentPosition.put(topic, target);
   }
- */
  */
   @Override
   void ReadFromMqttDefinition.generateAspect(StringBuilder sb) {
-    sb.append("public void ").append(type).append(".connectTo(String topic) {\n")
+    sb.append("public void ").append("type").append(".connectTo(String topic) {\n")
       .append(aspectIndent).append("mqttUpdater().addConnection")
       .append(getTargetType().getID()).append("_")
       .append(getTargetChild())