refactor: moved processors and packages into common directory

rdf-connect · Aug 7, 2024 · 10bcb8d · 10bcb8d
1 parent 125a107
commit 10bcb8d
Show file tree

Hide file tree

Showing 157 changed files with 80 additions and 26 deletions.
diff --git a/processors/file-utils-kt/.gitignore → packages/file-utils-kt/.gitignore b/processors/file-utils-kt/.gitignore → packages/file-utils-kt/.gitignore
diff --git a/processors/file-utils-kt/build.gradle.kts → packages/file-utils-kt/build.gradle.kts b/processors/file-utils-kt/build.gradle.kts → packages/file-utils-kt/build.gradle.kts
diff --git a/processors/file-utils-kt/gradle.properties → packages/file-utils-kt/gradle.properties b/processors/file-utils-kt/gradle.properties → packages/file-utils-kt/gradle.properties
diff --git a/...tils-kt/gradle/wrapper/gradle-wrapper.jar → ...tils-kt/gradle/wrapper/gradle-wrapper.jar b/...tils-kt/gradle/wrapper/gradle-wrapper.jar → ...tils-kt/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/processors/file-utils-kt/gradlew → packages/file-utils-kt/gradlew b/processors/file-utils-kt/gradlew → packages/file-utils-kt/gradlew
diff --git a/processors/file-utils-kt/gradlew.bat → packages/file-utils-kt/gradlew.bat b/processors/file-utils-kt/gradlew.bat → packages/file-utils-kt/gradlew.bat
diff --git a/processors/file-utils-kt/index.ttl → packages/file-utils-kt/index.ttl b/processors/file-utils-kt/index.ttl → packages/file-utils-kt/index.ttl
diff --git a/processors/file-utils-kt/settings.gradle.kts → packages/file-utils-kt/settings.gradle.kts b/processors/file-utils-kt/settings.gradle.kts → packages/file-utils-kt/settings.gradle.kts
diff --git a/...le-utils-kt/src/main/kotlin/FileReader.kt → ...le-utils-kt/src/main/kotlin/FileReader.kt b/...le-utils-kt/src/main/kotlin/FileReader.kt → ...le-utils-kt/src/main/kotlin/FileReader.kt
diff --git a/...le-utils-kt/src/main/kotlin/FileWriter.kt → ...le-utils-kt/src/main/kotlin/FileWriter.kt b/...le-utils-kt/src/main/kotlin/FileWriter.kt → ...le-utils-kt/src/main/kotlin/FileWriter.kt
diff --git a/...rs/file-utils-kt/src/main/resources/.keep → ...es/file-utils-kt/src/main/resources/.keep b/...rs/file-utils-kt/src/main/resources/.keep → ...es/file-utils-kt/src/main/resources/.keep
diff --git a/...ssors/file-utils-kt/src/test/kotlin/.keep → packages/file-utils-kt/src/test/kotlin/.keep b/...ssors/file-utils-kt/src/test/kotlin/.keep → packages/file-utils-kt/src/test/kotlin/.keep
diff --git a/...rs/file-utils-kt/src/test/resources/.keep → ...es/file-utils-kt/src/test/resources/.keep b/...rs/file-utils-kt/src/test/resources/.keep → ...es/file-utils-kt/src/test/resources/.keep
diff --git a/processors/file-utils-ts/.eslintignore → packages/file-utils-ts/.eslintignore b/processors/file-utils-ts/.eslintignore → packages/file-utils-ts/.eslintignore
diff --git a/processors/file-utils-ts/.eslintrc.json → packages/file-utils-ts/.eslintrc.json b/processors/file-utils-ts/.eslintrc.json → packages/file-utils-ts/.eslintrc.json
diff --git a/processors/file-utils-ts/.gitignore → packages/file-utils-ts/.gitignore b/processors/file-utils-ts/.gitignore → packages/file-utils-ts/.gitignore
diff --git a/processors/file-utils-ts/.npmignore → packages/file-utils-ts/.npmignore b/processors/file-utils-ts/.npmignore → packages/file-utils-ts/.npmignore
diff --git a/processors/file-utils-ts/.prettierignore → packages/file-utils-ts/.prettierignore b/processors/file-utils-ts/.prettierignore → packages/file-utils-ts/.prettierignore
diff --git a/processors/file-utils-ts/.prettierrc.json → packages/file-utils-ts/.prettierrc.json b/processors/file-utils-ts/.prettierrc.json → packages/file-utils-ts/.prettierrc.json
diff --git a/processors/file-utils-ts/index.ttl → packages/file-utils-ts/index.ttl b/processors/file-utils-ts/index.ttl → packages/file-utils-ts/index.ttl
diff --git a/...sors/shacl-validator-ts/package-lock.json → packages/file-utils-ts/package-lock.json b/...sors/shacl-validator-ts/package-lock.json → packages/file-utils-ts/package-lock.json
diff --git a/processors/shacl-validator-ts/package.json → packages/file-utils-ts/package.json b/processors/shacl-validator-ts/package.json → packages/file-utils-ts/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@rdfjs/formats": "^4.0.0",
     "@rdfjs/serializer-turtle": "^1.1.3",
-    "jvm-runner-ts": "file:../../runners/nodejs",
+    "jvm-runner-ts": "file:../runner-ts",
     "rdf-ext": "^2.5.2",
     "shacl-engine": "^1.0.0"
   }

diff --git a/processors/file-utils-ts/src/FileReader.ts → packages/file-utils-ts/src/FileReader.ts b/processors/file-utils-ts/src/FileReader.ts → packages/file-utils-ts/src/FileReader.ts
diff --git a/processors/file-utils-ts/src/FileWriter.ts → packages/file-utils-ts/src/FileWriter.ts b/processors/file-utils-ts/src/FileWriter.ts → packages/file-utils-ts/src/FileWriter.ts
diff --git a/processors/file-utils-ts/test/index.test.ts → packages/file-utils-ts/test/index.test.ts b/processors/file-utils-ts/test/index.test.ts → packages/file-utils-ts/test/index.test.ts
diff --git a/processors/file-utils-ts/tsconfig.json → packages/file-utils-ts/tsconfig.json b/processors/file-utils-ts/tsconfig.json → packages/file-utils-ts/tsconfig.json
diff --git a/processors/file-utils-ts/vite.config.ts → packages/file-utils-ts/vite.config.ts b/processors/file-utils-ts/vite.config.ts → packages/file-utils-ts/vite.config.ts
diff --git a/processors/http-utils-kt/.gitignore → packages/http-utils-kt/.gitignore b/processors/http-utils-kt/.gitignore → packages/http-utils-kt/.gitignore
diff --git a/processors/http-utils-kt/build.gradle.kts → packages/http-utils-kt/build.gradle.kts b/processors/http-utils-kt/build.gradle.kts → packages/http-utils-kt/build.gradle.kts
diff --git a/processors/http-utils-kt/gradle.properties → packages/http-utils-kt/gradle.properties b/processors/http-utils-kt/gradle.properties → packages/http-utils-kt/gradle.properties
diff --git a/...tils-kt/gradle/wrapper/gradle-wrapper.jar → ...tils-kt/gradle/wrapper/gradle-wrapper.jar b/...tils-kt/gradle/wrapper/gradle-wrapper.jar → ...tils-kt/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/processors/http-utils-kt/gradlew → packages/http-utils-kt/gradlew b/processors/http-utils-kt/gradlew → packages/http-utils-kt/gradlew
diff --git a/processors/http-utils-kt/gradlew.bat → packages/http-utils-kt/gradlew.bat b/processors/http-utils-kt/gradlew.bat → packages/http-utils-kt/gradlew.bat
diff --git a/processors/http-utils-kt/index.ttl → packages/http-utils-kt/index.ttl b/processors/http-utils-kt/index.ttl → packages/http-utils-kt/index.ttl
diff --git a/processors/http-utils-kt/settings.gradle.kts → packages/http-utils-kt/settings.gradle.kts b/processors/http-utils-kt/settings.gradle.kts → packages/http-utils-kt/settings.gradle.kts
diff --git a/...ttp-utils-kt/src/main/kotlin/HttpFetch.kt → ...ttp-utils-kt/src/main/kotlin/HttpFetch.kt b/...ttp-utils-kt/src/main/kotlin/HttpFetch.kt → ...ttp-utils-kt/src/main/kotlin/HttpFetch.kt
diff --git a/...rs/http-utils-kt/src/main/resources/.keep → ...es/http-utils-kt/src/main/resources/.keep b/...rs/http-utils-kt/src/main/resources/.keep → ...es/http-utils-kt/src/main/resources/.keep
diff --git a/...ssors/http-utils-kt/src/test/kotlin/.keep → packages/http-utils-kt/src/test/kotlin/.keep b/...ssors/http-utils-kt/src/test/kotlin/.keep → packages/http-utils-kt/src/test/kotlin/.keep
diff --git a/...rs/http-utils-kt/src/test/resources/.keep → ...es/http-utils-kt/src/test/resources/.keep b/...rs/http-utils-kt/src/test/resources/.keep → ...es/http-utils-kt/src/test/resources/.keep
diff --git a/runners/python/.gitignore → packages/runner-py/.gitignore b/runners/python/.gitignore → packages/runner-py/.gitignore
diff --git a/runners/python/.python-version → packages/runner-py/.python-version b/runners/python/.python-version → packages/runner-py/.python-version
diff --git a/runners/python/README.md → packages/runner-py/README.md b/runners/python/README.md → packages/runner-py/README.md
diff --git a/runners/python/index.ttl → packages/runner-py/index.ttl b/runners/python/index.ttl → packages/runner-py/index.ttl
@@ -7,9 +7,7 @@ rdfc:PythonPackage
   rdfc:description "A gRPC based Python runner." ;
   rdfc:repo "https://github.com/rdf-connect/orchestrator" ;
   rdfc:license "MIT" ;
-  rdfc:prepare (
-    "hatch build"
-  ) ;
+  rdfc:prepare ( "hatch run test -h" "hatch build" ) ;
   rdfc:runners rdfc:PythonRunner .
 
 rdfc:PythonRunner

diff --git a/runners/python/pyproject.toml → packages/runner-py/pyproject.toml b/runners/python/pyproject.toml → packages/runner-py/pyproject.toml
diff --git a/runners/python/src/rdfc/__init__.py → packages/runner-py/src/rdfc/__init__.py b/runners/python/src/rdfc/__init__.py → packages/runner-py/src/rdfc/__init__.py
diff --git a/runners/python/src/rdfc/__main__.py → packages/runner-py/src/rdfc/__main__.py b/runners/python/src/rdfc/__main__.py → packages/runner-py/src/rdfc/__main__.py
diff --git a/runners/python/src/rdfc/grpc/__init__.py → packages/runner-py/src/rdfc/grpc/__init__.py b/runners/python/src/rdfc/grpc/__init__.py → packages/runner-py/src/rdfc/grpc/__init__.py
diff --git a/runners/python/src/rdfc/grpc/arguments.py → ...ages/runner-py/src/rdfc/grpc/arguments.py b/runners/python/src/rdfc/grpc/arguments.py → ...ages/runner-py/src/rdfc/grpc/arguments.py
diff --git a/runners/python/src/rdfc/grpc/server.py → packages/runner-py/src/rdfc/grpc/server.py b/runners/python/src/rdfc/grpc/server.py → packages/runner-py/src/rdfc/grpc/server.py
diff --git a/...sors/shacl-validator-py/tests/__init__.py → ...ages/runner-py/src/rdfc/proto/__init__.py b/...sors/shacl-validator-py/tests/__init__.py → ...ages/runner-py/src/rdfc/proto/__init__.py
diff --git a/runners/python/src/rdfc/proto/channel_pb2.py → ...s/runner-py/src/rdfc/proto/channel_pb2.py b/runners/python/src/rdfc/proto/channel_pb2.py → ...s/runner-py/src/rdfc/proto/channel_pb2.py
diff --git a/...ers/python/src/rdfc/proto/channel_pb2.pyi → .../runner-py/src/rdfc/proto/channel_pb2.pyi b/...ers/python/src/rdfc/proto/channel_pb2.pyi → .../runner-py/src/rdfc/proto/channel_pb2.pyi
diff --git a/...python/src/rdfc/proto/channel_pb2_grpc.py → ...ner-py/src/rdfc/proto/channel_pb2_grpc.py b/...python/src/rdfc/proto/channel_pb2_grpc.py → ...ner-py/src/rdfc/proto/channel_pb2_grpc.py
diff --git a/runners/python/src/rdfc/proto/index_pb2.py → ...ges/runner-py/src/rdfc/proto/index_pb2.py b/runners/python/src/rdfc/proto/index_pb2.py → ...ges/runner-py/src/rdfc/proto/index_pb2.py
diff --git a/runners/python/src/rdfc/proto/index_pb2.pyi → ...es/runner-py/src/rdfc/proto/index_pb2.pyi b/runners/python/src/rdfc/proto/index_pb2.pyi → ...es/runner-py/src/rdfc/proto/index_pb2.pyi
diff --git a/...s/python/src/rdfc/proto/index_pb2_grpc.py → ...unner-py/src/rdfc/proto/index_pb2_grpc.py b/...s/python/src/rdfc/proto/index_pb2_grpc.py → ...unner-py/src/rdfc/proto/index_pb2_grpc.py
diff --git a/...python/src/rdfc/proto/intermediate_pb2.py → ...ner-py/src/rdfc/proto/intermediate_pb2.py b/...python/src/rdfc/proto/intermediate_pb2.py → ...ner-py/src/rdfc/proto/intermediate_pb2.py
diff --git a/...ython/src/rdfc/proto/intermediate_pb2.pyi → ...er-py/src/rdfc/proto/intermediate_pb2.pyi b/...ython/src/rdfc/proto/intermediate_pb2.pyi → ...er-py/src/rdfc/proto/intermediate_pb2.pyi
diff --git a/...n/src/rdfc/proto/intermediate_pb2_grpc.py → ...y/src/rdfc/proto/intermediate_pb2_grpc.py b/...n/src/rdfc/proto/intermediate_pb2_grpc.py → ...y/src/rdfc/proto/intermediate_pb2_grpc.py
diff --git a/runners/python/src/rdfc/runtime/__init__.py → ...es/runner-py/src/rdfc/runtime/__init__.py b/runners/python/src/rdfc/runtime/__init__.py → ...es/runner-py/src/rdfc/runtime/__init__.py
diff --git a/runners/python/src/rdfc/runtime/arguments.py → ...s/runner-py/src/rdfc/runtime/arguments.py b/runners/python/src/rdfc/runtime/arguments.py → ...s/runner-py/src/rdfc/runtime/arguments.py
diff --git a/runners/python/src/rdfc/runtime/processor.py → ...s/runner-py/src/rdfc/runtime/processor.py b/runners/python/src/rdfc/runtime/processor.py → ...s/runner-py/src/rdfc/runtime/processor.py
diff --git a/runners/python/src/rdfc/runtime/reader.py → ...ages/runner-py/src/rdfc/runtime/reader.py b/runners/python/src/rdfc/runtime/reader.py → ...ages/runner-py/src/rdfc/runtime/reader.py
diff --git a/...ers/python/src/rdfc/runtime/repository.py → .../runner-py/src/rdfc/runtime/repository.py b/...ers/python/src/rdfc/runtime/repository.py → .../runner-py/src/rdfc/runtime/repository.py
diff --git a/runners/python/src/rdfc/runtime/writer.py → ...ages/runner-py/src/rdfc/runtime/writer.py b/runners/python/src/rdfc/runtime/writer.py → ...ages/runner-py/src/rdfc/runtime/writer.py
diff --git a/runners/python/src/rdfc/util/__init__.py → packages/runner-py/src/rdfc/util/__init__.py b/runners/python/src/rdfc/util/__init__.py → packages/runner-py/src/rdfc/util/__init__.py
diff --git a/.../python/src/rdfc/util/callback_channel.py → ...nner-py/src/rdfc/util/callback_channel.py b/.../python/src/rdfc/util/callback_channel.py → ...nner-py/src/rdfc/util/callback_channel.py
diff --git a/runners/python/src/rdfc/util/channel.py → packages/runner-py/src/rdfc/util/channel.py b/runners/python/src/rdfc/util/channel.py → packages/runner-py/src/rdfc/util/channel.py
diff --git a/...hon/src/rdfc/util/dictionary_arguments.py → ...-py/src/rdfc/util/dictionary_arguments.py b/...hon/src/rdfc/util/dictionary_arguments.py → ...-py/src/rdfc/util/dictionary_arguments.py
diff --git a/runners/python/src/rdfc/util/wheel.py → packages/runner-py/src/rdfc/util/wheel.py b/runners/python/src/rdfc/util/wheel.py → packages/runner-py/src/rdfc/util/wheel.py
diff --git a/runners/python/src/rdfc/proto/__init__.py → packages/runner-py/tests/__init__.py b/runners/python/src/rdfc/proto/__init__.py → packages/runner-py/tests/__init__.py
diff --git a/packages/runner-py/tests/runner_test.py b/packages/runner-py/tests/runner_test.py
@@ -0,0 +1,6 @@
+import unittest
+
+
+class RunnerTest(unittest.IsolatedAsyncioTestCase):
+    async def test_success(self):
+        self.assertEquals(1, 1)
diff --git a/processors/shacl-validator-ts/.eslintignore → packages/runner-ts/.eslintignore b/processors/shacl-validator-ts/.eslintignore → packages/runner-ts/.eslintignore
diff --git a/runners/nodejs/.eslintrc.json → packages/runner-ts/.eslintrc.json b/runners/nodejs/.eslintrc.json → packages/runner-ts/.eslintrc.json
diff --git a/processors/shacl-validator-ts/.gitignore → packages/runner-ts/.gitignore b/processors/shacl-validator-ts/.gitignore → packages/runner-ts/.gitignore
diff --git a/processors/shacl-validator-ts/.npmignore → packages/runner-ts/.npmignore b/processors/shacl-validator-ts/.npmignore → packages/runner-ts/.npmignore
diff --git a/...essors/shacl-validator-ts/.prettierignore → packages/runner-ts/.prettierignore b/...essors/shacl-validator-ts/.prettierignore → packages/runner-ts/.prettierignore
diff --git a/...ssors/shacl-validator-ts/.prettierrc.json → packages/runner-ts/.prettierrc.json b/...ssors/shacl-validator-ts/.prettierrc.json → packages/runner-ts/.prettierrc.json
diff --git a/runners/nodejs/README.md → packages/runner-ts/README.md b/runners/nodejs/README.md → packages/runner-ts/README.md
diff --git a/runners/nodejs/index.ttl → packages/runner-ts/index.ttl b/runners/nodejs/index.ttl → packages/runner-ts/index.ttl
diff --git a/runners/nodejs/package-lock.json → packages/runner-ts/package-lock.json b/runners/nodejs/package-lock.json → packages/runner-ts/package-lock.json
diff --git a/runners/nodejs/package.json → packages/runner-ts/package.json b/runners/nodejs/package.json → packages/runner-ts/package.json
diff --git a/runners/nodejs/src/error.ts → packages/runner-ts/src/error.ts b/runners/nodejs/src/error.ts → packages/runner-ts/src/error.ts
diff --git a/runners/nodejs/src/index.ts → packages/runner-ts/src/index.ts b/runners/nodejs/src/index.ts → packages/runner-ts/src/index.ts
diff --git a/...nodejs/src/interfaces/callback_channel.ts → ...ner-ts/src/interfaces/callback_channel.ts b/...nodejs/src/interfaces/callback_channel.ts → ...ner-ts/src/interfaces/callback_channel.ts
diff --git a/runners/nodejs/src/interfaces/channel.ts → packages/runner-ts/src/interfaces/channel.ts b/runners/nodejs/src/interfaces/channel.ts → packages/runner-ts/src/interfaces/channel.ts
diff --git a/runners/nodejs/src/interfaces/log.ts → packages/runner-ts/src/interfaces/log.ts b/runners/nodejs/src/interfaces/log.ts → packages/runner-ts/src/interfaces/log.ts
diff --git a/runners/nodejs/src/interfaces/processor.ts → ...ges/runner-ts/src/interfaces/processor.ts b/runners/nodejs/src/interfaces/processor.ts → ...ges/runner-ts/src/interfaces/processor.ts
diff --git a/runners/nodejs/src/interfaces/reader.ts → packages/runner-ts/src/interfaces/reader.ts b/runners/nodejs/src/interfaces/reader.ts → packages/runner-ts/src/interfaces/reader.ts
diff --git a/runners/nodejs/src/interfaces/writer.ts → packages/runner-ts/src/interfaces/writer.ts b/runners/nodejs/src/interfaces/writer.ts → packages/runner-ts/src/interfaces/writer.ts
diff --git a/...acl-validator-kt/src/main/resources/.keep → packages/runner-ts/src/proto/.keep b/...acl-validator-kt/src/main/resources/.keep → packages/runner-ts/src/proto/.keep
diff --git a/runners/nodejs/src/proto/README.md → packages/runner-ts/src/proto/README.md b/runners/nodejs/src/proto/README.md → packages/runner-ts/src/proto/README.md
diff --git a/runners/nodejs/src/proto/channel.ts → packages/runner-ts/src/proto/channel.ts b/runners/nodejs/src/proto/channel.ts → packages/runner-ts/src/proto/channel.ts
diff --git a/runners/nodejs/src/proto/empty.ts → packages/runner-ts/src/proto/empty.ts b/runners/nodejs/src/proto/empty.ts → packages/runner-ts/src/proto/empty.ts
diff --git a/...nodejs/src/proto/google/protobuf/empty.ts → ...ner-ts/src/proto/google/protobuf/empty.ts b/...nodejs/src/proto/google/protobuf/empty.ts → ...ner-ts/src/proto/google/protobuf/empty.ts
diff --git a/...js/src/proto/google/protobuf/timestamp.ts → ...ts/src/proto/google/protobuf/timestamp.ts b/...js/src/proto/google/protobuf/timestamp.ts → ...ts/src/proto/google/protobuf/timestamp.ts
diff --git a/runners/nodejs/src/proto/index.ts → packages/runner-ts/src/proto/index.ts b/runners/nodejs/src/proto/index.ts → packages/runner-ts/src/proto/index.ts
diff --git a/runners/nodejs/src/proto/intermediate.ts → packages/runner-ts/src/proto/intermediate.ts b/runners/nodejs/src/proto/intermediate.ts → packages/runner-ts/src/proto/intermediate.ts
diff --git a/runners/nodejs/src/runtime/arguments.ts → packages/runner-ts/src/runtime/arguments.ts b/runners/nodejs/src/runtime/arguments.ts → packages/runner-ts/src/runtime/arguments.ts
diff --git a/runners/nodejs/src/runtime/index.ts → packages/runner-ts/src/runtime/index.ts b/runners/nodejs/src/runtime/index.ts → packages/runner-ts/src/runtime/index.ts
diff --git a/runners/nodejs/src/runtime/runner.ts → packages/runner-ts/src/runtime/runner.ts b/runners/nodejs/src/runtime/runner.ts → packages/runner-ts/src/runtime/runner.ts
diff --git a/runners/nodejs/src/runtime/server.ts → packages/runner-ts/src/runtime/server.ts b/runners/nodejs/src/runtime/server.ts → packages/runner-ts/src/runtime/server.ts
diff --git a/runners/nodejs/src/runtime/util.ts → packages/runner-ts/src/runtime/util.ts b/runners/nodejs/src/runtime/util.ts → packages/runner-ts/src/runtime/util.ts
diff --git a/runners/nodejs/src/std/transparent.ts → packages/runner-ts/src/std/transparent.ts b/runners/nodejs/src/std/transparent.ts → packages/runner-ts/src/std/transparent.ts
diff --git a/...ers/nodejs/test/runtime/arguments.test.ts → .../runner-ts/test/runtime/arguments.test.ts b/...ers/nodejs/test/runtime/arguments.test.ts → .../runner-ts/test/runtime/arguments.test.ts
diff --git a/runners/nodejs/tsconfig.json → packages/runner-ts/tsconfig.json b/runners/nodejs/tsconfig.json → packages/runner-ts/tsconfig.json
diff --git a/processors/shacl-validator-ts/vite.config.ts → packages/runner-ts/vite.config.ts b/processors/shacl-validator-ts/vite.config.ts → packages/runner-ts/vite.config.ts
diff --git a/processors/shacl-validator-kt/.gitignore → packages/shacl-validator-kt/.gitignore b/processors/shacl-validator-kt/.gitignore → packages/shacl-validator-kt/.gitignore
diff --git a/...ssors/shacl-validator-kt/build.gradle.kts → packages/shacl-validator-kt/build.gradle.kts b/...ssors/shacl-validator-kt/build.gradle.kts → packages/shacl-validator-kt/build.gradle.kts
diff --git a/...sors/shacl-validator-kt/gradle.properties → ...ages/shacl-validator-kt/gradle.properties b/...sors/shacl-validator-kt/gradle.properties → ...ages/shacl-validator-kt/gradle.properties
diff --git a/...ator-kt/gradle/wrapper/gradle-wrapper.jar → ...ator-kt/gradle/wrapper/gradle-wrapper.jar b/...ator-kt/gradle/wrapper/gradle-wrapper.jar → ...ator-kt/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/processors/shacl-validator-kt/gradlew → packages/shacl-validator-kt/gradlew b/processors/shacl-validator-kt/gradlew → packages/shacl-validator-kt/gradlew
diff --git a/processors/shacl-validator-kt/gradlew.bat → packages/shacl-validator-kt/gradlew.bat b/processors/shacl-validator-kt/gradlew.bat → packages/shacl-validator-kt/gradlew.bat
diff --git a/processors/shacl-validator-kt/index.ttl → packages/shacl-validator-kt/index.ttl b/processors/shacl-validator-kt/index.ttl → packages/shacl-validator-kt/index.ttl
diff --git a/...rs/shacl-validator-kt/settings.gradle.kts → ...es/shacl-validator-kt/settings.gradle.kts b/...rs/shacl-validator-kt/settings.gradle.kts → ...es/shacl-validator-kt/settings.gradle.kts
diff --git a/...ator-kt/src/main/kotlin/SHACLValidator.kt → ...ator-kt/src/main/kotlin/SHACLValidator.kt b/...ator-kt/src/main/kotlin/SHACLValidator.kt → ...ator-kt/src/main/kotlin/SHACLValidator.kt
diff --git a/runners/nodejs/src/proto/.keep → ...acl-validator-kt/src/main/resources/.keep b/runners/nodejs/src/proto/.keep → ...acl-validator-kt/src/main/resources/.keep
diff --git a/...-kt/src/test/kotlin/SHACLValidatorTest.kt → ...-kt/src/test/kotlin/SHACLValidatorTest.kt b/...-kt/src/test/kotlin/SHACLValidatorTest.kt → ...-kt/src/test/kotlin/SHACLValidatorTest.kt
diff --git a/...lidator-kt/src/test/resources/invalid.ttl → ...lidator-kt/src/test/resources/invalid.ttl b/...lidator-kt/src/test/resources/invalid.ttl → ...lidator-kt/src/test/resources/invalid.ttl
diff --git a/...alidator-kt/src/test/resources/shapes.ttl → ...alidator-kt/src/test/resources/shapes.ttl b/...alidator-kt/src/test/resources/shapes.ttl → ...alidator-kt/src/test/resources/shapes.ttl
diff --git a/...validator-kt/src/test/resources/valid.ttl → ...validator-kt/src/test/resources/valid.ttl b/...validator-kt/src/test/resources/valid.ttl → ...validator-kt/src/test/resources/valid.ttl
diff --git a/processors/shacl-validator-py/.gitignore → packages/shacl-validator-py/.gitignore b/processors/shacl-validator-py/.gitignore → packages/shacl-validator-py/.gitignore
diff --git a/processors/shacl-validator-py/README.md → packages/shacl-validator-py/README.md b/processors/shacl-validator-py/README.md → packages/shacl-validator-py/README.md
diff --git a/processors/shacl-validator-py/index.ttl → packages/shacl-validator-py/index.ttl b/processors/shacl-validator-py/index.ttl → packages/shacl-validator-py/index.ttl
@@ -10,7 +10,7 @@
   rdfc:description "A SHACL Validator processor, written in Python." ;
   rdfc:repo "https://github.com/rdf-connect/orchestrator.git" ;
   rdfc:license "MIT" ;
-  rdfc:prepare ( "hatch build" ) ;
+  rdfc:prepare ( "hatch run test -h" "hatch build" ) ;
   rdfc:processors rdfc:SHACLValidatorPY .
 
 rdfc:SHACLValidatorPY

diff --git a/processors/shacl-validator-py/pyproject.toml → packages/shacl-validator-py/pyproject.toml b/processors/shacl-validator-py/pyproject.toml → packages/shacl-validator-py/pyproject.toml
@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "pyshacl>=0.26.0",
     "rdflib>=7.0.0",
-    "rdfc @ {root:parent:parent:uri}/runners/python/dist/rdfc-0.1.0-py3-none-any.whl"
+    "rdfc @ {root:parent:uri}/runner-py/dist/rdfc-0.1.0-py3-none-any.whl"
 ]
 readme = "README.md"
 requires-python = ">= 3.8"

diff --git a/...ssors/shacl-validator-py/requirements.txt → packages/shacl-validator-py/requirements.txt b/...ssors/shacl-validator-py/requirements.txt → packages/shacl-validator-py/requirements.txt
diff --git a/...l-validator-py/src/rdfc_shacl/__init__.py → ...l-validator-py/src/rdfc_shacl/__init__.py b/...l-validator-py/src/rdfc_shacl/__init__.py → ...l-validator-py/src/rdfc_shacl/__init__.py
diff --git a/...hacl/__pycache__/__init__.cpython-312.pyc → ...hacl/__pycache__/__init__.cpython-312.pyc b/...hacl/__pycache__/__init__.cpython-312.pyc → ...hacl/__pycache__/__init__.cpython-312.pyc
diff --git a/...acl/__pycache__/validator.cpython-312.pyc → ...acl/__pycache__/validator.cpython-312.pyc b/...acl/__pycache__/validator.cpython-312.pyc → ...acl/__pycache__/validator.cpython-312.pyc
diff --git a/...-validator-py/src/rdfc_shacl/validator.py → ...-validator-py/src/rdfc_shacl/validator.py b/...-validator-py/src/rdfc_shacl/validator.py → ...-validator-py/src/rdfc_shacl/validator.py
diff --git a/runners/python/tests/__init__.py → ...ages/shacl-validator-py/tests/__init__.py b/runners/python/tests/__init__.py → ...ages/shacl-validator-py/tests/__init__.py
diff --git a/...-validator-py/tests/resources/invalid.ttl → ...-validator-py/tests/resources/invalid.ttl b/...-validator-py/tests/resources/invalid.ttl → ...-validator-py/tests/resources/invalid.ttl
diff --git a/...l-validator-py/tests/resources/shapes.ttl → ...l-validator-py/tests/resources/shapes.ttl b/...l-validator-py/tests/resources/shapes.ttl → ...l-validator-py/tests/resources/shapes.ttl
diff --git a/...cl-validator-py/tests/resources/valid.ttl → ...cl-validator-py/tests/resources/valid.ttl b/...cl-validator-py/tests/resources/valid.ttl → ...cl-validator-py/tests/resources/valid.ttl
diff --git a/...hacl-validator-py/tests/validator_test.py → ...hacl-validator-py/tests/validator_test.py b/...hacl-validator-py/tests/validator_test.py → ...hacl-validator-py/tests/validator_test.py
diff --git a/runners/nodejs/.eslintignore → packages/shacl-validator-ts/.eslintignore b/runners/nodejs/.eslintignore → packages/shacl-validator-ts/.eslintignore
diff --git a/processors/shacl-validator-ts/.eslintrc.json → packages/shacl-validator-ts/.eslintrc.json b/processors/shacl-validator-ts/.eslintrc.json → packages/shacl-validator-ts/.eslintrc.json
diff --git a/runners/nodejs/.gitignore → packages/shacl-validator-ts/.gitignore b/runners/nodejs/.gitignore → packages/shacl-validator-ts/.gitignore
diff --git a/runners/nodejs/.npmignore → packages/shacl-validator-ts/.npmignore b/runners/nodejs/.npmignore → packages/shacl-validator-ts/.npmignore
diff --git a/runners/nodejs/.prettierignore → packages/shacl-validator-ts/.prettierignore b/runners/nodejs/.prettierignore → packages/shacl-validator-ts/.prettierignore
diff --git a/runners/nodejs/.prettierrc.json → packages/shacl-validator-ts/.prettierrc.json b/runners/nodejs/.prettierrc.json → packages/shacl-validator-ts/.prettierrc.json
diff --git a/processors/shacl-validator-ts/index.ttl → packages/shacl-validator-ts/index.ttl b/processors/shacl-validator-ts/index.ttl → packages/shacl-validator-ts/index.ttl
diff --git a/processors/file-utils-ts/package-lock.json → ...ages/shacl-validator-ts/package-lock.json b/processors/file-utils-ts/package-lock.json → ...ages/shacl-validator-ts/package-lock.json
diff --git a/processors/file-utils-ts/package.json → packages/shacl-validator-ts/package.json b/processors/file-utils-ts/package.json → packages/shacl-validator-ts/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@rdfjs/formats": "^4.0.0",
     "@rdfjs/serializer-turtle": "^1.1.3",
-    "jvm-runner-ts": "file:../../runners/nodejs",
+    "jvm-runner-ts": "file:../runner-ts",
     "rdf-ext": "^2.5.2",
     "shacl-engine": "^1.0.0"
   }

diff --git a/processors/shacl-validator-ts/src/index.ts → packages/shacl-validator-ts/src/index.ts b/processors/shacl-validator-ts/src/index.ts → packages/shacl-validator-ts/src/index.ts
diff --git a/...ors/shacl-validator-ts/test/index.test.ts → ...ges/shacl-validator-ts/test/index.test.ts b/...ors/shacl-validator-ts/test/index.test.ts → ...ges/shacl-validator-ts/test/index.test.ts
diff --git a/processors/shacl-validator-ts/tsconfig.json → packages/shacl-validator-ts/tsconfig.json b/processors/shacl-validator-ts/tsconfig.json → packages/shacl-validator-ts/tsconfig.json
diff --git a/...hacl-validator-ts/types/shacl-engine.d.ts → ...hacl-validator-ts/types/shacl-engine.d.ts b/...hacl-validator-ts/types/shacl-engine.d.ts → ...hacl-validator-ts/types/shacl-engine.d.ts
diff --git a/runners/nodejs/vite.config.ts → packages/shacl-validator-ts/vite.config.ts b/runners/nodejs/vite.config.ts → packages/shacl-validator-ts/vite.config.ts
diff --git a/processors/README.md b/processors/README.md
diff --git a/runners/README.md b/runners/README.md
diff --git a/src/test/resources/e2e/jvm.ttl b/src/test/resources/e2e/jvm.ttl
@@ -23,9 +23,9 @@ test:JVMTestingPipeline
     test:HttpFetch ,
     test:HttpWriter ;
   rdfc:dependency
-    <../../../../processors/http-utils-kt> ,
-    <../../../../processors/file-utils-kt> ,
-    <../../../../processors/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 b/src/test/resources/e2e/node.ttl
@@ -20,9 +20,9 @@ test:NodePipeline
     test:FileWriter ,
     test:ReportWriter ;
   rdfc:dependency
-    <../../../../runners/nodejs> ,
-    <../../../../processors/file-utils-ts> ,
-    <../../../../processors/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 b/src/test/resources/e2e/python.ttl
@@ -20,9 +20,9 @@ test:PythonPipeline
     test:ReportWriter ,
     test:PythonProcessor ;
   rdfc:dependency
-    <../../../../runners/python> ,
-    <../../../../processors/file-utils-kt> ,
-    <../../../../processors/shacl-validator-py> .
+    <../../../../packages/runner-py> ,
+    <../../../../packages/file-utils-kt> ,
+    <../../../../packages/shacl-validator-py> .
 
 test:FileReader
   a rdfc:FileReaderKT ;