Integrating changes into master branch

.github/workflows/docker-CI.yml

@@ -2,7 +2,7 @@ name: Docker Build and Push
 
 on:
   push:
-    branches: [ master, develop, java17 ]
+    branches: [ master, develop ]
 
 jobs:
   build:

.gitignore

@@ -21,6 +21,13 @@ archiva_credentials.xml
 /bin/
 # Ignore Gradle project-specific cache directory
 .gradle
-
 # Ignore Gradle build output directory
 build
+*.class
+.project
+las2peer-tmitocar-service/.project
+las2peer-tmitocar-service/export/jars/*.jar
+las2peer-tmitocar-service/.classpath
+las2peer-tmitocar-service/.settings/org.eclipse.jdt.core.prefs
+.vscode/settings.json
+.project

.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -13,15 +18,16 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1636657669747</id>
+			<id>1682508712897</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

Dockerfile

@@ -1,5 +1,11 @@
 # tmitocar dependencies (jq, ruby, coreutils)
-FROM openjdk:17.0.1-jdk-buster
+FROM openjdk:17-jdk-buster
+RUN set -x \
+    && apt-get update \
+    \
+    #: force installing jing due to different issues regarding to java runtime environment \
+    #: setup issues (see: https://stackoverflow.com/q/76872534/12171959)
+    && apt-get install jing -y 
 RUN apt-get update && apt-get install -y default-mysql-client ant jq build-essential libffi-dev ruby ruby-bundler dos2unix coreutils curl tzdata git gcc cmake libpng-dev graphviz wkhtmltopdf pandoc rsync poppler-utils pkg-config
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"

docker-entrypoint.sh

@@ -49,6 +49,20 @@ set_in_service_config lrsURL ${LRS_URL}
 set_in_service_config lrsAuthTokenLeipzig ${LRS_AUTH_TOKEN_LEIPZIG}
 set_in_service_config lrsAuthTokenDresden ${LRS_AUTH_TOKEN_DRESDEN}
 
+set_in_service_config mongoHost ${MONGO_HOST}
+set_in_service_config mongoDB ${MONGO_DB}
+set_in_service_config mongoUser ${MONGO_USER}
+set_in_service_config mongoPassword ${MONGO_PASSWORD}
+set_in_service_config mongoAuth ${MONGO_AUTH}
+
+set_in_service_config pgsqlHost ${PGSQL_HOST}
+set_in_service_config pgsqlPort ${PGSQL_PORT}
+set_in_service_config pgsqlUser ${PGSQL_USER}
+set_in_service_config pgsqlPassword ${PGSQL_PASSWORD}
+set_in_service_config pgsqlDB ${PGSQL_DB}
+
+set_in_service_config xapiUrl ${XAPI_URL}
+set_in_service_config xapiHomepage ${XAPI_HOMEPAGE}
 # prevent glob expansion in lib/*
 set -f
 LAUNCH_COMMAND='java -cp lib/* --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED i5.las2peer.tools.L2pNodeLauncher -s service -p '"${LAS2PEER_PORT} ${SERVICE_EXTRA_ARGS}"

etc/i5.las2peer.connectors.webConnector.WebConnector.properties

@@ -10,4 +10,4 @@ enableCrossOriginResourceSharing = TRUE
 onlyLocalServices = FALSE
 defaultLoginUser = anonymous
 defaultLoginPassword = anonymous
-oidcProviders = https://api.learning-layers.eu/o/oauth2,https://accounts.google.com
+oidcProviders = https://auth.las2peer.org/auth/realms/main,https://accounts.google.com

etc/i5.las2peer.services.tmitocar.TmitocarService.properties

@@ -2,4 +2,17 @@ privateKey=
 publicKey=
 lrsURL=
 lrsAuthTokenLeipzig=
-lrsAuthTokenDresden=
+lrsAuthTokenDresden=
+mongoUser = 
+mongoPassword = 
+mongoDB = 
+mongoHost = 
+mongoAuth = 
+pgsqlHost = 
+pgsqlPort = 
+pgsqlUser = 
+pgsqlPassword = 
+pgsqlDB = 
+address = http://127.0.0.1:8080
+xapiUrl = 
+xapiHomepage = 

gradle.properties

@@ -1,4 +1,4 @@
-core.version=1.2.3
+core.version=1.4.0
 service.name=i5.las2peer.services.tmitocar
 service.class=TmitocarService
 service.version=1.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

las2peer-tmitocar-service/.project

@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>las2peer-tmitocar-service-las2peer-tmitocar-service</name>
-	<comment>Project las2peer-tmitocar-service-las2peer-tmitocar-service created by Buildship.</comment>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1636379772470</id>
+			<id>1682582758667</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

las2peer-tmitocar-service/build.gradle

@@ -7,15 +7,6 @@ plugins {
 repositories {
     // Use JCenter for resolving dependencies.
     mavenCentral()
-
-    // DBIS Archiva
-    maven {
-        url "https://archiva.dbis.rwth-aachen.de:9911/repository/internal/"
-    }
-
-    maven {
-        url "https://archiva.dbis.rwth-aachen.de:9911/repository/snapshots/"
-    }
 }
 
 dependencies {
@@ -24,11 +15,26 @@ dependencies {
 
     // las2peer bundle which is not necessary in the runtime path
     // compileOnly will be moved into the lib dir afterwards
-    implementation "i5:las2peer-bundle:${project.property('core.version')}"
+    implementation "io.github.rwth-acis.org.las2peer:las2peer-bundle:${project.property('core.version')}"
 
     implementation "org.jacoco:org.jacoco.ant:0.8.5"
     implementation "net.minidev:json-smart:1.3.1"
 	implementation "org.apache.pdfbox:pdfbox-ant:1.8.16"
+    implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.3'
+    implementation "org.apache.tika:tika-core:2.7.0"
+
+    // MongoDB Java driver GridFS
+    implementation "org.mongodb:mongodb-driver-sync:4.9.0"
+    implementation "org.mongodb:bson:4.9.0"
+
+    // Jackson (for JSON serialization/deserialization)
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.14.2"
+
+    implementation "com.google.code.gson:gson:2.10.1"
+
+    // for writing tasks postgresql connection
+    implementation "org.apache.commons:commons-dbcp2:2.9.0"
+    implementation 'org.postgresql:postgresql:42.6.0'
 
      //   javax.websocket-api;version="1.1", jslack;version="1.8.1", rocketchat-common;version="0.7.1, rocketchat-core;version="0.7.1, rocketchat-livechat;version="0.7.1"
 }
@@ -114,15 +120,27 @@ build.dependsOn copyJar
 build.dependsOn copyToLib
 
 task startscripts {
-    new File("$rootDir/bin", "start_network.sh").text = """#!/bin/bash
+    def binDir = new File("$rootDir/bin")
+    if (!binDir.exists()) {
+        binDir.mkdirs()
+    }
+    def file = new File("$rootDir/bin/start_network.sh")
+    if (!file.exists()) {
+        file.createNewFile()
+    }
+    file.text = """#!/bin/bash
 
 # this script is autogenerated by 'gradle startscripts'
 # it starts a las2peer node providing the service '${project.property('service.name')}.${project.property('service.class')}' of this project
 # pls execute it from the root folder of your deployment, e. g. ./bin/start_network.sh
 
 java -cp "lib/*" --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED i5.las2peer.tools.L2pNodeLauncher --port 9011 --service-directory service uploadStartupDirectory startService\\(\\'${project.property('service.name')}.${project.property('service.class')}@${project.property('service.version')}\\'\\) startWebConnector interactive
 """ 
-    new File("$rootDir/bin", "start_network.bat").text = """:: this script is autogenerated by 'gradle startscripts'
+    def file2 = new File("$rootDir/bin/start_network.bat")
+    if (!file2.exists()) {
+        file2.createNewFile()
+    }
+    file2.text =  """:: this script is autogenerated by 'gradle startscripts'
 :: it starts a las2peer node providing the service '${project.property('service.name')}.${project.property('service.class')}' of this project
 :: pls execute it from the bin folder of your deployment by double-clicking on it