From 8bdafe0d0e85e57543785ea408786ddf7f8edde0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 24 Feb 2022 12:44:29 +0100
Subject: [PATCH] Move properties to common beam projects
---
.../uc1-beam-samza/build.gradle | 9 +++++++
.../uc2-beam-flink/build.gradle | 11 +++++++-
.../uc2-beam-samza/build.gradle | 11 +++++++-
.../resources/META-INF/application.properties | 17 -------------
.../resources/META-INF/application.properties | 0
.../uc3-beam-flink/build.gradle | 11 ++++++--
.../uc3-beam-samza/build.gradle | 13 ++++++++--
.../resources/META-INF/application.properties | 22 ----------------
.../resources/META-INF/application.properties | 0
.../uc4-beam-flink/build.gradle | 13 ++++++++--
.../uc4-beam-samza/build.gradle | 9 +++++++
.../resources/META-INF/application.properties | 25 -------------------
.../resources/META-INF/application.properties | 0
13 files changed, 69 insertions(+), 72 deletions(-)
delete mode 100644 theodolite-benchmarks/uc2-beam-samza/src/main/resources/META-INF/application.properties
rename theodolite-benchmarks/{uc2-beam-flink => uc2-beam}/src/main/resources/META-INF/application.properties (100%)
delete mode 100644 theodolite-benchmarks/uc3-beam-samza/src/main/resources/META-INF/application.properties
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/resources/META-INF/application.properties (100%)
delete mode 100644 theodolite-benchmarks/uc4-beam-samza/src/main/resources/META-INF/application.properties
rename theodolite-benchmarks/{uc4-beam-flink => uc4-beam}/src/main/resources/META-INF/application.properties (100%)
diff --git a/theodolite-benchmarks/uc1-beam-samza/build.gradle b/theodolite-benchmarks/uc1-beam-samza/build.gradle
index 54c070d96..7489af605 100644
--- a/theodolite-benchmarks/uc1-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc1-beam-samza/build.gradle
@@ -6,5 +6,14 @@ dependencies {
implementation project(':uc1-beam')
}
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc1-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
mainClassName = "application.Uc1BeamSamza"
diff --git a/theodolite-benchmarks/uc2-beam-flink/build.gradle b/theodolite-benchmarks/uc2-beam-flink/build.gradle
index 9ab898cd4..d7a89fd59 100644
--- a/theodolite-benchmarks/uc2-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc2-beam-flink/build.gradle
@@ -2,9 +2,18 @@ plugins {
id 'theodolite.beam.flink'
}
-
dependencies {
implementation project(':uc2-beam')
}
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc2-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
+
mainClassName = "application.Uc2BeamFlink"
diff --git a/theodolite-benchmarks/uc2-beam-samza/build.gradle b/theodolite-benchmarks/uc2-beam-samza/build.gradle
index 29d7f9ac0..67df31321 100644
--- a/theodolite-benchmarks/uc2-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc2-beam-samza/build.gradle
@@ -2,9 +2,18 @@ plugins {
id 'theodolite.beam.samza'
}
-
dependencies {
implementation project(':uc2-beam')
}
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc2-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
+
mainClassName = "application.Uc2BeamSamza"
diff --git a/theodolite-benchmarks/uc2-beam-samza/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-beam-samza/src/main/resources/META-INF/application.properties
deleted file mode 100644
index 1545a0f66..000000000
--- a/theodolite-benchmarks/uc2-beam-samza/src/main/resources/META-INF/application.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-application.name=theodolite-uc2-application
-application.version=0.0.1
-
-kafka.bootstrap.servers=localhost:9092
-kafka.input.topic=input
-kafka.output.topic=output
-kafka.window.duration.minutes=1
-
-schema.registry.url=http://localhost:8081
-
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
-specific.avro.reader=True
-enable.auto.commit.config=True
-auto.offset.reset.config=earliest
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc2-beam-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc2-beam/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc2-beam-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc2-beam/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc3-beam-flink/build.gradle b/theodolite-benchmarks/uc3-beam-flink/build.gradle
index 8f047c6dc..f3083d10b 100644
--- a/theodolite-benchmarks/uc3-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc3-beam-flink/build.gradle
@@ -2,11 +2,18 @@ plugins {
id 'theodolite.beam.flink'
}
-
dependencies {
implementation project(':uc3-beam')
}
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc3-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
-// This is the path of the main class, stored within ./src/main/java/
mainClassName = 'application.Uc3BeamFlink'
diff --git a/theodolite-benchmarks/uc3-beam-samza/build.gradle b/theodolite-benchmarks/uc3-beam-samza/build.gradle
index 513b85033..849a01033 100644
--- a/theodolite-benchmarks/uc3-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc3-beam-samza/build.gradle
@@ -2,9 +2,18 @@ plugins {
id 'theodolite.beam.samza'
}
-
dependencies {
implementation project(':uc3-beam')
}
-mainClassName = "application.Uc3BeamSamza"
\ No newline at end of file
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc3-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
+
+mainClassName = "application.Uc3BeamSamza"
diff --git a/theodolite-benchmarks/uc3-beam-samza/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-beam-samza/src/main/resources/META-INF/application.properties
deleted file mode 100644
index 2db723927..000000000
--- a/theodolite-benchmarks/uc3-beam-samza/src/main/resources/META-INF/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-application.name=theodolite-uc3-application
-application.version=0.0.1
-
-kafka.bootstrap.servers=localhost:9092
-kafka.input.topic=input
-kafka.output.topic=output
-kafka.window.duration.minutes=1
-
-schema.registry.url=http://localhost:8081
-
-aggregation.duration.days=30
-aggregation.advance.days=1
-
-trigger.interval=15
-
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
-specific.avro.reader=True
-enable.auto.commit.config=True
-auto.offset.reset.config=earliest
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
diff --git a/theodolite-benchmarks/uc4-beam-flink/build.gradle b/theodolite-benchmarks/uc4-beam-flink/build.gradle
index 7ace89a22..56cff477d 100644
--- a/theodolite-benchmarks/uc4-beam-flink/build.gradle
+++ b/theodolite-benchmarks/uc4-beam-flink/build.gradle
@@ -2,9 +2,18 @@ plugins {
id 'theodolite.beam.flink'
}
-
dependencies {
implementation project(':uc4-beam')
}
-mainClassName = 'application.Uc4BeamFlink'
\ No newline at end of file
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc4-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
+
+mainClassName = 'application.Uc4BeamFlink'
diff --git a/theodolite-benchmarks/uc4-beam-samza/build.gradle b/theodolite-benchmarks/uc4-beam-samza/build.gradle
index 90dcc76b0..8aecf1ea8 100644
--- a/theodolite-benchmarks/uc4-beam-samza/build.gradle
+++ b/theodolite-benchmarks/uc4-beam-samza/build.gradle
@@ -6,5 +6,14 @@ dependencies {
implementation project(':uc4-beam')
}
+sourceSets {
+ main {
+ resources {
+ srcDirs += [
+ project(':uc4-beam').sourceSets.main.resources
+ ]
+ }
+ }
+}
mainClassName = "application.Uc4BeamSamza"
diff --git a/theodolite-benchmarks/uc4-beam-samza/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-beam-samza/src/main/resources/META-INF/application.properties
deleted file mode 100644
index bc679580d..000000000
--- a/theodolite-benchmarks/uc4-beam-samza/src/main/resources/META-INF/application.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-application.name=theodolite-uc4-application
-application.version=0.0.1
-
-kafka.bootstrap.servers=localhost:9092
-kafka.input.topic=input
-kafka.output.topic=output
-kafka.configuration.topic=configuration
-kafka.feedback.topic=aggregation-feedback
-kafka.window.duration.minutes=1
-
-schema.registry.url=http://localhost:8081
-
-aggregation.duration.days=30
-aggregation.advance.days=1
-
-trigger.interval=15
-grace.period.ms=270
-
-num.threads=1
-commit.interval.ms=1000
-cache.max.bytes.buffering=-1
-
-specific.avro.reader=True
-enable.auto.commit.config=True
-auto.offset.reset.config=earliest
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc4-beam-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
similarity index 100%
rename from theodolite-benchmarks/uc4-beam-flink/src/main/resources/META-INF/application.properties
rename to theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
--
GitLab