Merge branch 'master' into dependabot/maven/org.apache.mina-mina-core…

…-2.2.4

.github/workflows/build.yml

@@ -4,6 +4,9 @@ on:
     branches: 
       - main
       - master
+
+permissions: 
+  security-events: write
 jobs:
   code-style:
     runs-on: ubuntu-latest

README.md

@@ -323,4 +323,3 @@ Unicons by IconScout: [https://github.com/Iconscout/unicons](https://github.com/
 - Mailing List: [https://dev.eclipse.org/mailman/listinfo/dirigible-dev](https://dev.eclipse.org/mailman/listinfo/dirigible-dev)
 - Issues: [https://github.com/eclipse/dirigible/issues](https://github.com/eclipse/dirigible/issues)
 - Eclipse Foundation Help Desk: https://gitlab.eclipse.org/eclipsefdn/helpdesk
-

components/data/data-structures/src/main/java/org/eclipse/dirigible/components/data/structures/synchronizer/SchemasSynchronizer.java

@@ -21,6 +21,7 @@
 import org.eclipse.dirigible.components.base.synchronizer.MultitenantBaseSynchronizer;
 import org.eclipse.dirigible.components.base.synchronizer.SynchronizerCallback;
 import org.eclipse.dirigible.components.base.synchronizer.SynchronizersOrder;
+import org.eclipse.dirigible.components.data.sources.config.DefaultDataSourceName;
 import org.eclipse.dirigible.components.data.sources.manager.DataSourcesManager;
 import org.eclipse.dirigible.components.data.structures.domain.*;
 import org.eclipse.dirigible.components.data.structures.service.SchemaService;
@@ -76,6 +77,7 @@ public class SchemasSynchronizer extends MultitenantBaseSynchronizer<Schema, Lon
      * The view service.
      */
     private final ViewService viewService;
+    private final String defaultDataSourceName;
 
     /**
      * The datasources manager.
@@ -97,11 +99,12 @@ public class SchemasSynchronizer extends MultitenantBaseSynchronizer<Schema, Lon
      */
     @Autowired
     public SchemasSynchronizer(SchemaService schemaService, DataSourcesManager datasourcesManager, TableService tableService,
-            ViewService viewService) {
+            ViewService viewService, @DefaultDataSourceName String defaultDataSourceName) {
         this.schemaService = schemaService;
         this.datasourcesManager = datasourcesManager;
         this.tableService = tableService;
         this.viewService = viewService;
+        this.defaultDataSourceName = defaultDataSourceName;
     }
 
     /**
@@ -187,7 +190,7 @@ protected List<Schema> parseImpl(String location, byte[] content) throws ParseEx
      * @param content the content
      * @return the schema
      */
-    public static Schema parseSchema(String location, String content) {
+    public Schema parseSchema(String location, String content) {
         Schema result = new Schema();
 
         JsonElement root = GsonHelper.parseJson(content);
@@ -196,9 +199,9 @@ public static Schema parseSchema(String location, String content) {
                                    .getAsJsonObject()
                                    .get("structures")
                                    .getAsJsonArray();
-        String dataSource = root.getAsJsonObject()
-                                .get("datasource")
-                                .getAsString();
+        JsonElement datasourceJsonElement = root.getAsJsonObject()
+                                                .get("datasource");
+        String dataSource = datasourceJsonElement != null ? datasourceJsonElement.getAsString() : defaultDataSourceName;
         result.setDataSource(dataSource);
         for (int i = 0; i < structures.size(); i++) {
             JsonObject structure = structures.get(i)

components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/provider/BpmProviderFlowable.java

@@ -367,7 +367,11 @@ public void removeVariable(String executionId, String variableName) {
     public void cleanup() {
         logger.info("Cleaning [{}]...", this.getClass());
         if (null != processEngine) {
-            ProcessEngines.destroy();
+            try {
+                ProcessEngines.destroy();
+            } catch (Exception ex) {
+                logger.error("Error while cleaning up the process engines", ex);
+            }
             processEngine = null;
         }
     }

components/engine/engine-jobs/src/main/java/org/eclipse/dirigible/components/jobs/config/QuartzConfig.java

@@ -52,9 +52,6 @@ Scheduler scheduler(SchedulerFactoryBean factory, @Qualifier("SystemDB") DataSou
         Scheduler scheduler = factory.getScheduler();
         logger.debug("Starting Scheduler threads");
 
-        // give some time for spring auto configurations to pass before starting
-        scheduler.startDelayed(STARTUP_DELAY_SECONDS);
-
         scheduler.getListenerManager()
                  .addJobListener(jobExecutionsCountListener);
         scheduler.getListenerManager()
@@ -78,9 +75,7 @@ SchedulerFactoryBean schedulerFactoryBean(AutoWiringSpringBeanJobFactory jobFact
         SchedulerFactoryBean factory = new SchedulerFactoryBean();
         factory.setJobFactory(jobFactory);
         factory.setQuartzProperties(quartzProperties(systemDataSourceName));
-        // add startup delay - otherwise the scheduler triggers jobs execution
-        // before spring boot application full startup
-        factory.setStartupDelay(STARTUP_DELAY_SECONDS);
+
         return factory;
     }
 

components/group/group-platform-ide/pom.xml

@@ -35,6 +35,22 @@
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-components-perspective-database</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-perspective-operations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-perspective-jobs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-perspective-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-perspective-processes</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-components-view-welcome</artifactId>
@@ -111,6 +127,54 @@
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-components-view-transfer</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-artefacts</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-configurations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-data-structures</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-extensions</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-jobs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-listeners</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-loggers</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-logs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-registry</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-repository</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-websockets</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-view-security</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.dirigible</groupId>
@@ -148,6 +212,10 @@
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-components-service-git</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-service-extensions</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.dirigible</groupId>
@@ -165,11 +233,87 @@
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-components-editor-image</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-data-structures</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-extensions</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-jobs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-listeners</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-schema</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-websockets</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-integrations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-editor-report</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.dirigible</groupId>
 			<artifactId>dirigible-components-menu-bpm</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-database</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-entity</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-extensions</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-form-builder</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-jobs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-listeners</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-projects</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-schema</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.dirigible</groupId>
+			<artifactId>dirigible-components-menu-websockets</artifactId>
+		</dependency>
 
     </dependencies>
 

components/ide/ide-ui-registry/src/main/resources/META-INF/dirigible/ide-registry/js/registry.js

@@ -106,7 +106,6 @@ registryView.controller('RegistryController', [
 		$scope.jstreeWidget.on('dblclick.jstree', function (event) {
 			let node = $scope.jstreeWidget.jstree(true).get_node(event.target);
 			if (node.type === 'file') {
-				console.log(node);
 				openFile(node, 'monaco'); // Temporarily set monaco
 			}
 		});