merge from main

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      packages: read 
+      packages: read
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
@@ -20,4 +20,7 @@ jobs:
       - name: Build package
         uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
         with:
-          arguments: build 
+          arguments: build
+        env:
+          USERNAME: ${{ github.actor }}
+          TOKEN: ${{ github.token }}

.gitignore

@@ -1,5 +1,8 @@
 .DS_Store
 .idea/
+/**/.classpath
+/**/.settings
+/**/.project
 
 # Ignore Gradle project-specific cache directory
 .gradle

build.gradle.kts

@@ -41,6 +41,16 @@ allprojects {
     repositories {
         mavenCentral()
         mavenLocal()
+        repositories {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/ids-basecamp/ids-infomodel-java")
+                credentials {
+                    username = System.getenv("USERNAME")
+                    password = System.getenv("TOKEN")
+                }
+            }
+        }
     }
 }
 

gradle.properties

@@ -5,9 +5,9 @@ assertj=3.23.1
 jupiterVersion=5.8.2
 mockitoVersion=4.8.0
 okHttpVersion=4.10.0
-jsonVersion=20230618
+jsonVersion=20231013
 jettyGroup=org.eclipse.jetty
 jettyVersion=11.0.15
 
 org.gradle.jvmargs=-Xmx1024m
-version=0.1.1
+version=0.3.2

logging-house-client/README.md

@@ -0,0 +1,3 @@
+# Logging House Client
+
+## Notes

logging-house-client/build.gradle.kts

@@ -13,9 +13,19 @@ val jsonVersion: String by project
 
 dependencies {
     implementation("${edcGroup}:control-plane-core:${edcVersion}")
+    implementation("${edcGroup}:http-spi:${edcVersion}")
+    implementation("${edcGroup}:sql-core:${edcVersion}")
+    implementation("${edcGroup}:transaction-datasource-spi:${edcVersion}")
 
     implementation("com.squareup.okhttp3:okhttp:${okHttpVersion}")
     implementation("org.json:json:${jsonVersion}")
+    implementation("org.glassfish.jersey.media:jersey-media-multipart:3.1.3")
+
+    implementation("de.fraunhofer.iais.eis.ids.infomodel:infomodel-java:1.0.2-basecamp")
+    implementation("de.fraunhofer.iais.eis.ids.infomodel:infomodel-util:1.0.2-basecamp")
+
+    implementation("org.postgresql:postgresql:42.4.5")
+    implementation("org.flywaydb:flyway-core:9.0.1")
 
     testImplementation("org.assertj:assertj-core:${assertj}")
     testImplementation("org.junit.jupiter:junit-jupiter-api:${jupiterVersion}")

logging-house-client/src/main/java/com/truzzt/extension/logginghouse/client/ConfigConstants.java

@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2024 truzzt GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       truzzt GmbH - Initial implementation
+ *
+ */
+
+package com.truzzt.extension.logginghouse.client;
+
+public class ConfigConstants {
+
+    static final String LOGGINGHOUSE_ENABLED_SETTING = "edc.logginghouse.extension.enabled";
+
+    static final String LOGGINGHOUSE_URL_SETTING = "edc.logginghouse.extension.url";
+
+    static final String LOGGINGHOUSE_FLYWAY_REPAIR_SETTING = "edc.logginghouse.extension.flyway.repair";
+
+    static final String LOGGINGHOUSE_FLYWAY_CLEAN_SETTING = "edc.logginghouse.extension.flyway.clean";
+
+    static final String LOGGINGHOUSE_EXTENSION_MAX_WORKERS = "edc.logginghouse.extension.workers.max";
+
+    static final String LOGGINGHOUSE_EXTENSION_WORKERS_DELAY = "edc.logginghouse.extension.workers.delay";
+
+    static final String LOGGINGHOUSE_EXTENSION_WORKERS_PERIOD = "edc.logginghouse.extension.workers.period";
+}