refactor: moved orchestrator to separate dir [no ci]

rdf-connect · Sep 12, 2024 · f32a43e · f32a43e
1 parent 724974e
commit f32a43e
Show file tree

Hide file tree

Showing 75 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle.kts → orchestrator/build.gradle.kts b/build.gradle.kts → orchestrator/build.gradle.kts
@@ -38,7 +38,7 @@ tasks.test {
 }
 
 /** We define these explicitly due to the reliance on Protobuf and gRPC. */
-sourceSets { main { proto { srcDir("proto") } } }
+sourceSets { main { proto { srcDir("../proto") } } }
 
 /*
  * Check this document for more info on the section below:

diff --git a/gradle.properties → orchestrator/gradle.properties b/gradle.properties → orchestrator/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar → ...strator/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar → ...strator/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew → orchestrator/gradlew b/gradlew → orchestrator/gradlew
diff --git a/gradlew.bat → orchestrator/gradlew.bat b/gradlew.bat → orchestrator/gradlew.bat
diff --git a/settings.gradle.kts → orchestrator/settings.gradle.kts b/settings.gradle.kts → orchestrator/settings.gradle.kts
diff --git a/src/main/kotlin/Main.kt → orchestrator/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt → orchestrator/src/main/kotlin/Main.kt
diff --git a/src/main/kotlin/Orchestrator.kt → orchestrator/src/main/kotlin/Orchestrator.kt b/src/main/kotlin/Orchestrator.kt → orchestrator/src/main/kotlin/Orchestrator.kt
diff --git a/src/main/kotlin/broker/Broker.kt → ...estrator/src/main/kotlin/broker/Broker.kt b/src/main/kotlin/broker/Broker.kt → ...estrator/src/main/kotlin/broker/Broker.kt
diff --git a/src/main/kotlin/broker/BrokerClient.kt → ...or/src/main/kotlin/broker/BrokerClient.kt b/src/main/kotlin/broker/BrokerClient.kt → ...or/src/main/kotlin/broker/BrokerClient.kt
diff --git a/src/main/kotlin/broker/impl/SimpleBroker.kt → ...c/main/kotlin/broker/impl/SimpleBroker.kt b/src/main/kotlin/broker/impl/SimpleBroker.kt → ...c/main/kotlin/broker/impl/SimpleBroker.kt
diff --git a/src/main/kotlin/exception/RunnerException.kt → .../main/kotlin/exception/RunnerException.kt b/src/main/kotlin/exception/RunnerException.kt → .../main/kotlin/exception/RunnerException.kt
diff --git a/src/main/kotlin/extensions/Channel.kt → ...tor/src/main/kotlin/extensions/Channel.kt b/src/main/kotlin/extensions/Channel.kt → ...tor/src/main/kotlin/extensions/Channel.kt
diff --git a/src/main/kotlin/extensions/File.kt → ...trator/src/main/kotlin/extensions/File.kt b/src/main/kotlin/extensions/File.kt → ...trator/src/main/kotlin/extensions/File.kt
diff --git a/src/main/kotlin/extensions/Model.kt → ...rator/src/main/kotlin/extensions/Model.kt b/src/main/kotlin/extensions/Model.kt → ...rator/src/main/kotlin/extensions/Model.kt
diff --git a/src/main/kotlin/intermediate/IRArgument.kt → ...rc/main/kotlin/intermediate/IRArgument.kt b/src/main/kotlin/intermediate/IRArgument.kt → ...rc/main/kotlin/intermediate/IRArgument.kt
diff --git a/src/main/kotlin/intermediate/IRDependency.kt → .../main/kotlin/intermediate/IRDependency.kt b/src/main/kotlin/intermediate/IRDependency.kt → .../main/kotlin/intermediate/IRDependency.kt
diff --git a/src/main/kotlin/intermediate/IRPackage.kt → ...src/main/kotlin/intermediate/IRPackage.kt b/src/main/kotlin/intermediate/IRPackage.kt → ...src/main/kotlin/intermediate/IRPackage.kt
diff --git a/src/main/kotlin/intermediate/IRParameter.kt → ...c/main/kotlin/intermediate/IRParameter.kt b/src/main/kotlin/intermediate/IRParameter.kt → ...c/main/kotlin/intermediate/IRParameter.kt
diff --git a/src/main/kotlin/intermediate/IRPipeline.kt → ...rc/main/kotlin/intermediate/IRPipeline.kt b/src/main/kotlin/intermediate/IRPipeline.kt → ...rc/main/kotlin/intermediate/IRPipeline.kt
diff --git a/src/main/kotlin/intermediate/IRProcessor.kt → ...c/main/kotlin/intermediate/IRProcessor.kt b/src/main/kotlin/intermediate/IRProcessor.kt → ...c/main/kotlin/intermediate/IRProcessor.kt
diff --git a/src/main/kotlin/intermediate/IRRunner.kt → .../src/main/kotlin/intermediate/IRRunner.kt b/src/main/kotlin/intermediate/IRRunner.kt → .../src/main/kotlin/intermediate/IRRunner.kt
diff --git a/src/main/kotlin/intermediate/IRStage.kt → ...r/src/main/kotlin/intermediate/IRStage.kt b/src/main/kotlin/intermediate/IRStage.kt → ...r/src/main/kotlin/intermediate/IRStage.kt
diff --git a/src/main/kotlin/parser/Parser.kt → ...estrator/src/main/kotlin/parser/Parser.kt b/src/main/kotlin/parser/Parser.kt → ...estrator/src/main/kotlin/parser/Parser.kt
diff --git a/...ain/kotlin/parser/impl/jena/JenaParser.kt → ...ain/kotlin/parser/impl/jena/JenaParser.kt b/...ain/kotlin/parser/impl/jena/JenaParser.kt → ...ain/kotlin/parser/impl/jena/JenaParser.kt
diff --git a/src/main/kotlin/parser/impl/jena/RDFC.kt → .../src/main/kotlin/parser/impl/jena/RDFC.kt b/src/main/kotlin/parser/impl/jena/RDFC.kt → .../src/main/kotlin/parser/impl/jena/RDFC.kt
diff --git a/...in/kotlin/parser/impl/jena/ShaclShapes.kt → ...in/kotlin/parser/impl/jena/ShaclShapes.kt b/...in/kotlin/parser/impl/jena/ShaclShapes.kt → ...in/kotlin/parser/impl/jena/ShaclShapes.kt
diff --git a/src/main/kotlin/resolver/Resolver.kt → ...ator/src/main/kotlin/resolver/Resolver.kt b/src/main/kotlin/resolver/Resolver.kt → ...ator/src/main/kotlin/resolver/Resolver.kt
diff --git a/...n/kotlin/resolver/impl/GenericResolver.kt → ...n/kotlin/resolver/impl/GenericResolver.kt b/...n/kotlin/resolver/impl/GenericResolver.kt → ...n/kotlin/resolver/impl/GenericResolver.kt
diff --git a/src/main/kotlin/resolver/impl/GitResolver.kt → .../main/kotlin/resolver/impl/GitResolver.kt b/src/main/kotlin/resolver/impl/GitResolver.kt → .../main/kotlin/resolver/impl/GitResolver.kt
diff --git a/...ain/kotlin/resolver/impl/LocalResolver.kt → ...ain/kotlin/resolver/impl/LocalResolver.kt b/...ain/kotlin/resolver/impl/LocalResolver.kt → ...ain/kotlin/resolver/impl/LocalResolver.kt
diff --git a/src/main/kotlin/runner/Runner.kt → ...estrator/src/main/kotlin/runner/Runner.kt b/src/main/kotlin/runner/Runner.kt → ...estrator/src/main/kotlin/runner/Runner.kt
diff --git a/src/main/kotlin/runner/impl/grpc/Config.kt → ...rc/main/kotlin/runner/impl/grpc/Config.kt b/src/main/kotlin/runner/impl/grpc/Config.kt → ...rc/main/kotlin/runner/impl/grpc/Config.kt
diff --git a/...ain/kotlin/runner/impl/grpc/GRPCRunner.kt → ...ain/kotlin/runner/impl/grpc/GRPCRunner.kt b/...ain/kotlin/runner/impl/grpc/GRPCRunner.kt → ...ain/kotlin/runner/impl/grpc/GRPCRunner.kt
diff --git a/...tlin/runner/impl/grpc/HostedGRPCRunner.kt → ...tlin/runner/impl/grpc/HostedGRPCRunner.kt b/...tlin/runner/impl/grpc/HostedGRPCRunner.kt → ...tlin/runner/impl/grpc/HostedGRPCRunner.kt
diff --git a/...main/kotlin/runner/impl/grpc/Serialize.kt → ...main/kotlin/runner/impl/grpc/Serialize.kt b/...main/kotlin/runner/impl/grpc/Serialize.kt → ...main/kotlin/runner/impl/grpc/Serialize.kt
diff --git a/src/main/kotlin/runner/impl/jvm/Arguments.kt → .../main/kotlin/runner/impl/jvm/Arguments.kt b/src/main/kotlin/runner/impl/jvm/Arguments.kt → .../main/kotlin/runner/impl/jvm/Arguments.kt
diff --git a/src/main/kotlin/runner/impl/jvm/JVMRunner.kt → .../main/kotlin/runner/impl/jvm/JVMRunner.kt b/src/main/kotlin/runner/impl/jvm/JVMRunner.kt → .../main/kotlin/runner/impl/jvm/JVMRunner.kt
diff --git a/src/main/kotlin/runner/impl/jvm/Processor.kt → .../main/kotlin/runner/impl/jvm/Processor.kt b/src/main/kotlin/runner/impl/jvm/Processor.kt → .../main/kotlin/runner/impl/jvm/Processor.kt
diff --git a/src/main/kotlin/util/Log.kt → orchestrator/src/main/kotlin/util/Log.kt b/src/main/kotlin/util/Log.kt → orchestrator/src/main/kotlin/util/Log.kt
diff --git a/src/main/kotlin/util/ManagedProcess.kt → ...or/src/main/kotlin/util/ManagedProcess.kt b/src/main/kotlin/util/ManagedProcess.kt → ...or/src/main/kotlin/util/ManagedProcess.kt
diff --git a/src/main/kotlin/util/Retries.kt → orchestrator/src/main/kotlin/util/Retries.kt b/src/main/kotlin/util/Retries.kt → orchestrator/src/main/kotlin/util/Retries.kt
diff --git a/src/main/resources/pipeline.ttl → orchestrator/src/main/resources/pipeline.ttl b/src/main/resources/pipeline.ttl → orchestrator/src/main/resources/pipeline.ttl
diff --git a/src/test/kotlin/OrchestratorTest.kt → ...rator/src/test/kotlin/OrchestratorTest.kt b/src/test/kotlin/OrchestratorTest.kt → ...rator/src/test/kotlin/OrchestratorTest.kt
diff --git a/src/test/kotlin/e2e/E2ETest.kt → orchestrator/src/test/kotlin/e2e/E2ETest.kt b/src/test/kotlin/e2e/E2ETest.kt → orchestrator/src/test/kotlin/e2e/E2ETest.kt
diff --git a/src/test/kotlin/extensions/ChannelTest.kt → ...src/test/kotlin/extensions/ChannelTest.kt b/src/test/kotlin/extensions/ChannelTest.kt → ...src/test/kotlin/extensions/ChannelTest.kt
diff --git a/src/test/kotlin/extensions/FileTest.kt → ...or/src/test/kotlin/extensions/FileTest.kt b/src/test/kotlin/extensions/FileTest.kt → ...or/src/test/kotlin/extensions/FileTest.kt
diff --git a/src/test/kotlin/parser/ParserTest.kt → ...ator/src/test/kotlin/parser/ParserTest.kt b/src/test/kotlin/parser/ParserTest.kt → ...ator/src/test/kotlin/parser/ParserTest.kt
diff --git a/src/test/kotlin/processors/TappedReader.kt → ...rc/test/kotlin/processors/TappedReader.kt b/src/test/kotlin/processors/TappedReader.kt → ...rc/test/kotlin/processors/TappedReader.kt
diff --git a/src/test/kotlin/processors/TappedWriter.kt → ...rc/test/kotlin/processors/TappedWriter.kt b/src/test/kotlin/processors/TappedWriter.kt → ...rc/test/kotlin/processors/TappedWriter.kt
diff --git a/...t/kotlin/runner/impl/jvm/ArgumentsTest.kt → ...t/kotlin/runner/impl/jvm/ArgumentsTest.kt b/...t/kotlin/runner/impl/jvm/ArgumentsTest.kt → ...t/kotlin/runner/impl/jvm/ArgumentsTest.kt
diff --git a/src/test/resources/.gitignore → orchestrator/src/test/resources/.gitignore b/src/test/resources/.gitignore → orchestrator/src/test/resources/.gitignore
diff --git a/src/test/resources/e2e/data/invalid.ttl → ...r/src/test/resources/e2e/data/invalid.ttl b/src/test/resources/e2e/data/invalid.ttl → ...r/src/test/resources/e2e/data/invalid.ttl
diff --git a/src/test/resources/e2e/data/valid.ttl → ...tor/src/test/resources/e2e/data/valid.ttl b/src/test/resources/e2e/data/valid.ttl → ...tor/src/test/resources/e2e/data/valid.ttl
diff --git a/src/test/resources/e2e/jvm.ttl → orchestrator/src/test/resources/e2e/jvm.ttl b/src/test/resources/e2e/jvm.ttl → orchestrator/src/test/resources/e2e/jvm.ttl
@@ -23,9 +23,9 @@ test:JVMTestingPipeline
     test:HttpFetch ,
     test:HttpWriter ;
   rdfc:dependency
-    <../../../../packages/http-utils-kt> ,
-    <../../../../packages/file-utils-kt> ,
-    <../../../../packages/shacl-validator-kt> .
+    <../../../../../packages/http-utils-kt> ,
+    <../../../../../packages/file-utils-kt> ,
+    <../../../../../packages/shacl-validator-kt> .
 
 test:HttpFetch
   a rdfc:HttpFetchKT ;

diff --git a/src/test/resources/e2e/node.ttl → orchestrator/src/test/resources/e2e/node.ttl b/src/test/resources/e2e/node.ttl → orchestrator/src/test/resources/e2e/node.ttl
@@ -20,9 +20,9 @@ test:NodePipeline
     test:FileWriter ,
     test:ReportWriter ;
   rdfc:dependency
-    <../../../../packages/runner-ts> ,
-    <../../../../packages/file-utils-ts> ,
-    <../../../../packages/shacl-validator-ts> .
+    <../../../../../packages/runner-ts> ,
+    <../../../../../packages/file-utils-ts> ,
+    <../../../../../packages/shacl-validator-ts> .
 
 test:FileReader
   a rdfc:FileReaderTS ;

diff --git a/src/test/resources/e2e/python.ttl → ...strator/src/test/resources/e2e/python.ttl b/src/test/resources/e2e/python.ttl → ...strator/src/test/resources/e2e/python.ttl
@@ -20,9 +20,9 @@ test:PythonPipeline
     test:ReportWriter ,
     test:PythonProcessor ;
   rdfc:dependency
-    <../../../../packages/runner-py> ,
-    <../../../../packages/file-utils-kt> ,
-    <../../../../packages/shacl-validator-py> .
+    <../../../../../packages/runner-py> ,
+    <../../../../../packages/file-utils-kt> ,
+    <../../../../../packages/shacl-validator-py> .
 
 test:FileReader
   a rdfc:FileReaderKT ;

diff --git a/src/test/resources/e2e/shacl/shapes.ttl → ...r/src/test/resources/e2e/shacl/shapes.ttl b/src/test/resources/e2e/shacl/shapes.ttl → ...r/src/test/resources/e2e/shacl/shapes.ttl
diff --git a/src/test/resources/packages/.keep → ...strator/src/test/resources/packages/.keep b/src/test/resources/packages/.keep → ...strator/src/test/resources/packages/.keep
diff --git a/src/test/resources/packages/basic/index.ttl → ...c/test/resources/packages/basic/index.ttl b/src/test/resources/packages/basic/index.ttl → ...c/test/resources/packages/basic/index.ttl
diff --git a/...st/resources/packages/basic/processor.ttl → ...st/resources/packages/basic/processor.ttl b/...st/resources/packages/basic/processor.ttl → ...st/resources/packages/basic/processor.ttl
diff --git a/src/test/resources/packages/dummy/index.ttl → ...c/test/resources/packages/dummy/index.ttl b/src/test/resources/packages/dummy/index.ttl → ...c/test/resources/packages/dummy/index.ttl
diff --git a/...st/resources/packages/dummy/processor.ttl → ...st/resources/packages/dummy/processor.ttl b/...st/resources/packages/dummy/processor.ttl → ...st/resources/packages/dummy/processor.ttl
diff --git a/src/test/resources/packages/dummy/runner.ttl → .../test/resources/packages/dummy/runner.ttl b/src/test/resources/packages/dummy/runner.ttl → .../test/resources/packages/dummy/runner.ttl
diff --git a/src/test/resources/pipeline.ttl → orchestrator/src/test/resources/pipeline.ttl b/src/test/resources/pipeline.ttl → orchestrator/src/test/resources/pipeline.ttl
diff --git a/src/test/resources/pipelines/basic/index.ttl → .../test/resources/pipelines/basic/index.ttl b/src/test/resources/pipelines/basic/index.ttl → .../test/resources/pipelines/basic/index.ttl
diff --git a/src/test/resources/pipelines/basic/stage.ttl → .../test/resources/pipelines/basic/stage.ttl b/src/test/resources/pipelines/basic/stage.ttl → .../test/resources/pipelines/basic/stage.ttl
diff --git a/src/test/resources/pipelines/dummy/index.ttl → .../test/resources/pipelines/dummy/index.ttl b/src/test/resources/pipelines/dummy/index.ttl → .../test/resources/pipelines/dummy/index.ttl
diff --git a/src/test/resources/pipelines/dummy/stage.ttl → .../test/resources/pipelines/dummy/stage.ttl b/src/test/resources/pipelines/dummy/stage.ttl → .../test/resources/pipelines/dummy/stage.ttl
diff --git a/packages/file-utils-kt/build.gradle.kts b/packages/file-utils-kt/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
   implementation("org.reflections:reflections:0.10.2")
 
   // Processor class and other utilities.
-  implementation(files("../../build/libs/technology.idlab.jvm-runner-0.0.4-all.jar"))
+  implementation(files("../../orchestrator/build/libs/technology.idlab.jvm-runner-0.0.4-all.jar"))
 
   // RDF dependencies.
   implementation("org.apache.jena:apache-jena-libs:5.0.0")

diff --git a/packages/http-utils-kt/build.gradle.kts b/packages/http-utils-kt/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
   implementation("org.reflections:reflections:0.10.2")
 
   // Processor class and other utilities.
-  implementation(files("../../build/libs/technology.idlab.jvm-runner-0.0.4-all.jar"))
+  implementation(files("../../orchestrator/build/libs/technology.idlab.jvm-runner-0.0.4-all.jar"))
 
   // RDF dependencies.
   implementation("org.apache.jena:apache-jena-libs:5.0.0")

diff --git a/packages/shacl-validator-kt/build.gradle.kts b/packages/shacl-validator-kt/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
   implementation("org.reflections:reflections:0.10.2")
 
   // Processor class and other utilities.
-  implementation(files("../../build/libs/technology.idlab.jvm-runner-0.0.4-all.jar"))
+  implementation(files("../../orchestrator/build/libs/technology.idlab.jvm-runner-0.0.4-all.jar"))
 
   // RDF dependencies.
   implementation("org.apache.jena:apache-jena-libs:5.0.0")

diff --git a/packages/shacl-validator-py/src/rdfc_shacl/__pycache__/__init__.cpython-312.pyc b/packages/shacl-validator-py/src/rdfc_shacl/__pycache__/__init__.cpython-312.pyc
diff --git a/packages/shacl-validator-py/src/rdfc_shacl/__pycache__/validator.cpython-312.pyc b/packages/shacl-validator-py/src/rdfc_shacl/__pycache__/validator.cpython-312.pyc