diff --git a/ros2rag.receiverstub/build.gradle b/ros2rag.receiverstub/build.gradle index 59f2bcc96d6aa72f86c9a96f0221ada6a7c65139..96029829e1428aa711270c05cc61193f45775c47 100644 --- a/ros2rag.receiverstub/build.gradle +++ b/ros2rag.receiverstub/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf' sourceCompatibility = 1.8 -mainClassName = 'de.tudresden.inf.st.ros2rag.receiverstub.Main' +mainClassName = 'de.tudresden.inf.st.ros2rag.receiverstub.ReceiverMain' repositories { jcenter() @@ -17,16 +17,16 @@ buildscript { } sourceSets.main.java.srcDir "src/gen/java" -jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.receiverstub.Main') +jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.receiverstub.ReceiverMain') dependencies { implementation project(':ros2rag.starter') - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" - 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: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' - implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' +// implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" +// implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" +// implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' +// implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' +// implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' protobuf files("$projectDir/../ros2rag.example/src/main/proto") } diff --git a/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/Main.java b/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/ReceiverMain.java similarity index 94% rename from ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/Main.java rename to ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/ReceiverMain.java index 56e0426d0f8e4aeae6de8667c2bb4eb8c8479cab..54b8458adb378b5d63c7dee3617cee1738acf926 100644 --- a/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/Main.java +++ b/ros2rag.receiverstub/src/main/java/de/tudresden/inf/st/ros2rag/receiverstub/ReceiverMain.java @@ -1,6 +1,7 @@ package de.tudresden.inf.st.ros2rag.receiverstub; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.google.protobuf.InvalidProtocolBufferException; import config.Dataconfig.DataConfig; import config.Robotconfig.RobotConfig; @@ -19,14 +20,14 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -public class Main { +public class ReceiverMain { - private static final Logger logger = LogManager.getLogger(Main.class); + private static final Logger logger = LogManager.getLogger(ReceiverMain.class); private String topicPattern; public static void main(String[] args) throws Exception { - Main main = new Main(); - ObjectMapper mapper = new ObjectMapper(); + ReceiverMain main = new ReceiverMain(); + ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); File configFile = new File(args[0]); System.out.println("Using config file: " + configFile.getAbsolutePath()); ActualConfiguration config = mapper.readValue(configFile, DataConfiguration.class).panda_mqtt_connector; diff --git a/ros2rag.senderstub/build.gradle b/ros2rag.senderstub/build.gradle index a7900a991d5a4b44ebb52e8e7b9d81f4d0e11fe2..4de593d825bc6616f440a4089051b4aa26326efd 100644 --- a/ros2rag.senderstub/build.gradle +++ b/ros2rag.senderstub/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.google.protobuf' sourceCompatibility = 1.8 -mainClassName = 'de.tudresden.inf.st.ros2rag.senderstub.Main' +mainClassName = 'de.tudresden.inf.st.ros2rag.senderstub.SenderMain' repositories { jcenter() @@ -17,16 +17,13 @@ buildscript { } sourceSets.main.java.srcDir "src/gen/java" -jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.senderstub.Main') +jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.senderstub.SenderMain') dependencies { implementation project(':ros2rag.starter') - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" - 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: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' - implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' +// implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' +// implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' protobuf files("$projectDir/../ros2rag.example/src/main/proto") } diff --git a/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/Main.java b/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/SenderMain.java similarity index 97% rename from ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/Main.java rename to ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/SenderMain.java index 5beeb153535b9f8c7941af75b879b571c5df3904..e518c86cfa2b7235744b349aae1dc22eedfe8efe 100644 --- a/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/Main.java +++ b/ros2rag.senderstub/src/main/java/de/tudresden/inf/st/ros2rag/senderstub/SenderMain.java @@ -5,7 +5,7 @@ import panda.Linkstate; import java.util.concurrent.TimeUnit; -public class Main { +public class SenderMain { public static void main(String[] args) throws Exception { // assume 4 arguments if (args.length < 4) { diff --git a/ros2rag.starter/build.gradle b/ros2rag.starter/build.gradle index b4aec98a67e1ddc6657e293bb90d4d9dfdf5ec29..748b742ab7eef4b2abdce04567f8fa3685fb1fd4 100644 --- a/ros2rag.starter/build.gradle +++ b/ros2rag.starter/build.gradle @@ -28,12 +28,12 @@ jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.ros2rag.starter.Start dependencies { implementation project (':ros2rag.base') baseRuntimeClasspath project (':ros2rag.base') - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" +// implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}" + api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" + api group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}" implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' - implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' - implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' + api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' + api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' jastadd2 "org.jastadd:jastadd:2.3.4" }