Merge branch 'eclipse:master' into spring-admin

eclipse-dirigible · Dec 19, 2023 · 4337f5a · 4337f5a
2 parents 5bf3ca2 + 87b1056
commit 4337f5a
Show file tree

Hide file tree

Showing 279 changed files with 741 additions and 301 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,11 +6,11 @@ on:
       releaseVersion:
         description: Release Version
         required: true
-        default: 8.0.0
+        default: 9.0.0
       snapshotVersion:
         description: Snapshot Version
         required: true
-        default: 9.0.0-SNAPSHOT
+        default: 10.0.0-SNAPSHOT
 
 run-name: 'version set to ${{ github.event.inputs.releaseVersion }} for release'
 

diff --git a/build/application/pom.xml b/build/application/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-build-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -212,11 +212,12 @@
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 		</dependency>
-		<!--
+
 		<dependency>
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-database-mongodb-jdbc</artifactId>
 		</dependency>
+		<!--
 		<dependency>
 			<groupId>com.sap.cloud.db.jdbc</groupId>
 			<artifactId>ngdbc</artifactId>

diff --git a/build/pom.xml b/build/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-bpm/pom.xml b/components/api/api-bpm/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-cms/pom.xml b/components/api/api-cms/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-core/pom.xml b/components/api/api-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-database/pom.xml b/components/api/api-database/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-etcd/pom.xml b/components/api/api-etcd/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-extensions/pom.xml b/components/api/api-extensions/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-git/pom.xml b/components/api/api-git/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-http/pom.xml b/components/api/api-http/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-indexing/pom.xml b/components/api/api-indexing/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-io/pom.xml b/components/api/api-io/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-job/pom.xml b/components/api/api-job/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-junit/pom.xml b/components/api/api-junit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.eclipse.dirigible</groupId>
         <artifactId>dirigible-components-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api/api-kafka/pom.xml b/components/api/api-kafka/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.dirigible</groupId>
         <artifactId>dirigible-components-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api/api-log/pom.xml b/components/api/api-log/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-mail/pom.xml b/components/api/api-mail/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-messaging/pom.xml b/components/api/api-messaging/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-modules-javascript/pom.xml b/components/api/api-modules-javascript/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.dirigible</groupId>
         <artifactId>dirigible-components-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...nts/api/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/project.json b/...nts/api/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/project.json
@@ -9,7 +9,7 @@
             },
             {
                 "os": "windows",
-                "command": "CMD /c build-source.bat"
+                "command": "cmd /c build-source.bat"
             }
         ],
         "publish": true

diff --git a/...i/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/http/upload.ts b/...i/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/http/upload.ts
@@ -59,10 +59,6 @@ class FileItem {
     }
 
     public getName() {
-        return this.native.getName();
-    }
-
-    public getOriginalFilename() {
         return this.native.getOriginalFilename();
     }
 

diff --git a/...pi-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/mongodb/client.ts b/...pi-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/mongodb/client.ts
@@ -14,8 +14,8 @@ const MongoDBFacade = Java.type("org.eclipse.dirigible.components.api.mongodb.Mo
 const TimeUnit = Java.type("java.util.concurrent.TimeUnit");
 import * as uuid from "@dirigible/utils/uuid";
 
-export function getClient() {
-    var native = MongoDBFacade.getClient();
+export function getClient(uri: string, user: string, password: string) {
+    var native = MongoDBFacade.getClient(uri, user, password);
     return new Client(native);
 };
 

diff --git a/...i/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/mongodb/dao.ts b/...i/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/mongodb/dao.ts
@@ -15,8 +15,11 @@ import * as globals from "@dirigible/core/globals";
 import * as mongodb from "./client"
 import * as dirigibleOrm from "@dirigible/db/orm";
 import * as logging from "@dirigible/log/logging";
+import * as configurations from "@dirigible/core/configurations";
 
-const mongoClient = mongodb.getClient();
+const dbUri = configurations.get("DIRIGIBLE_MONGODB_CLIENT_URI", "mongodb://localhost:27017");
+
+const mongoClient = mongodb.getClient(dbUri, null, null);
 const db = mongoClient.getDB();
 
 export class DAO {

diff --git a/components/api/api-modules-python/pom.xml b/components/api/api-modules-python/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.dirigible</groupId>
         <artifactId>dirigible-components-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api/api-mongodb/pom.xml b/components/api/api-mongodb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -31,6 +31,12 @@
 			<artifactId>dirigible-components-engine-javascript</artifactId>
 		</dependency>
 
+		<!-- Engine -->
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-database-mongodb-jdbc</artifactId>
+		</dependency>
+
 		<!-- Libs -->
 		<dependency>
 	        <groupId>org.mongodb</groupId>

diff --git a/...api-mongodb/src/main/java/org/eclipse/dirigible/components/api/mongodb/MongoDBFacade.java b/...api-mongodb/src/main/java/org/eclipse/dirigible/components/api/mongodb/MongoDBFacade.java
@@ -10,15 +10,17 @@
  */
 package org.eclipse.dirigible.components.api.mongodb;
 
+import java.net.URI;
+
 import org.eclipse.dirigible.commons.config.Configuration;
+import org.eclipse.dirigible.mongodb.jdbc.MongoDBConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
 
 /**
  * The Class MongoDBFacade.
@@ -45,14 +47,15 @@ public class MongoDBFacade {
     /**
      * Gets the client.
      *
+     * @param uri the uri
+     * @param user the user
+     * @param password the password
      * @return the client
      */
-    public static MongoClient getClient() {
-
-        String clientUri = Configuration.get(DIRIGIBLE_MONGODB_CLIENT_URI, CLIENT_URI);
-
-        MongoClient mongoClient = new MongoClient(new MongoClientURI(clientUri));
-
+    public static MongoClient getClient(String uri, String user, String password) {
+        String defaultUri = Configuration.get(DIRIGIBLE_MONGODB_CLIENT_URI, CLIENT_URI);
+        URI dbUri = URI.create(uri != null ? uri : defaultUri);
+        MongoClient mongoClient = MongoDBConnection.createMongoClient(dbUri.toString(), user, password);
         return mongoClient;
     }
 

diff --git a/components/api/api-mongodb/src/main/resources/META-INF/dirigible/mongodb/client.js b/components/api/api-mongodb/src/main/resources/META-INF/dirigible/mongodb/client.js
@@ -9,9 +9,9 @@
  * SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-exports.getClient = function() {
+exports.getClient = function(uri, user, password) {
 	var client = new Client();
-	var native = org.eclipse.dirigible.components.api.mongodb.MongoDBFacade.getClient();
+	var native = org.eclipse.dirigible.components.api.mongodb.MongoDBFacade.getClient(uri, user, password);
 	client.native = native;
 	return client;
 };

diff --git a/components/api/api-net/pom.xml b/components/api/api-net/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-pdf/pom.xml b/components/api/api-pdf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.eclipse.dirigible</groupId>
         <artifactId>dirigible-components-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api/api-platform/pom.xml b/components/api/api-platform/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-qldb/pom.xml b/components/api/api-qldb/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-qunit/pom.xml b/components/api/api-qunit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-rabbitmq/pom.xml b/components/api/api-rabbitmq/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.dirigible</groupId>
         <artifactId>dirigible-components-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api/api-redis/pom.xml b/components/api/api-redis/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

diff --git a/components/api/api-security/pom.xml b/components/api/api-security/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.dirigible</groupId>
 		<artifactId>dirigible-components-parent</artifactId>
-		<version>9.0.0-SNAPSHOT</version>
+		<version>10.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>