diff --git a/apps/dnet-is-application/pom.xml b/apps/dnet-is-application/pom.xml
index f563dabe..27cb2137 100644
--- a/apps/dnet-is-application/pom.xml
+++ b/apps/dnet-is-application/pom.xml
@@ -25,7 +25,7 @@
dnet-data-services
${project.version}
-
+
org.springframework.boot
diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java
index 5978f4ac..882363e9 100644
--- a/apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java
+++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java
@@ -20,7 +20,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(entityManagerFactoryRef = "mainEntityManagerFactory", transactionManagerRef = "mainTransactionManager", basePackages = {
- "eu.dnetlib.is", "eu.dnetlib.data.mdstore", "eu.dnetlib.manager"
+ "eu.dnetlib.is",
+ "eu.dnetlib.common",
+ "eu.dnetlib.manager.history",
+ // "eu.dnetlib.manager.wf",
+ "eu.dnetlib.data.mdstore"
})
public class MainDBConfig {
@@ -38,7 +42,9 @@ public class MainDBConfig {
@Qualifier("mainDataSource") final DataSource ds) {
return builder
.dataSource(ds)
- .packages("eu.dnetlib.is.model", "eu.dnetlib.manager.wf.model", "eu.dnetlib.data.mdstore.model")
+ .packages("eu.dnetlib.is.model", "eu.dnetlib.manager.history.model", "eu.dnetlib.common.model",
+ // "eu.dnetlib.manager.wf.model",
+ "eu.dnetlib.data.mdstore.model")
.persistenceUnit("is")
.build();
}
diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java
index 55a4590e..d5ff171b 100644
--- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java
+++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java
@@ -21,7 +21,6 @@ public class ZeppelinAjaxController extends AbstractDnetController {
@GetMapping("/templates")
public List getTemplates() throws MDStoreManagerException {
try {
- // if (zeppelinClient.get)
return zeppelinClient.listTemplates();
} catch (final Throwable e) {
throw new MDStoreManagerException("Zeppelin is unreachable", e);
diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/WfHistoryImporter.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/WfHistoryImporter.java
index a1eaa4b0..1a6c6b27 100644
--- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/WfHistoryImporter.java
+++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/WfHistoryImporter.java
@@ -19,8 +19,8 @@ import org.springframework.stereotype.Service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.dnetlib.manager.wf.model.WfProcessExecution;
-import eu.dnetlib.manager.wf.repository.WfProcessExecutionRepository;
+import eu.dnetlib.manager.history.model.WfProcessExecution;
+import eu.dnetlib.manager.history.repository.WfProcessExecutionRepository;
@Service
public class WfHistoryImporter {
diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/manager/wf/WfHistoryAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/manager/wf/WfHistoryAjaxController.java
index cccf4db3..dc4b18f5 100644
--- a/apps/dnet-is-application/src/main/java/eu/dnetlib/manager/wf/WfHistoryAjaxController.java
+++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/manager/wf/WfHistoryAjaxController.java
@@ -9,7 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import eu.dnetlib.manager.wf.model.WfProcessExecution;
+import eu.dnetlib.manager.history.WorkflowLogger;
+import eu.dnetlib.manager.history.model.WfProcessExecution;
@RestController
@RequestMapping("/ajax/wfs")
diff --git a/apps/dnet-is-application/src/main/resources/application.properties b/apps/dnet-is-application/src/main/resources/application.properties
index a2a29b36..1c0c6fc5 100644
--- a/apps/dnet-is-application/src/main/resources/application.properties
+++ b/apps/dnet-is-application/src/main/resources/application.properties
@@ -11,7 +11,7 @@ maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dnet-is-application/effective-po
spring.main.banner-mode = off
-logging.level.root = INFO
+logging.level.root = WARN
#logging.level.org.springframework = DEBUG
management.endpoints.web.exposure.include = prometheus,health
diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/EmailTemplate.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/common/model/EmailTemplate.java
similarity index 95%
rename from libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/EmailTemplate.java
rename to libs/dnet-is-common/src/main/java/eu/dnetlib/common/model/EmailTemplate.java
index 0ba91984..bd1a2849 100644
--- a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/EmailTemplate.java
+++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/common/model/EmailTemplate.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.manager.wf.model;
+package eu.dnetlib.common.model;
import java.io.Serializable;
diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/history/model/WfProcessExecution.java
similarity index 98%
rename from libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java
rename to libs/dnet-is-common/src/main/java/eu/dnetlib/manager/history/model/WfProcessExecution.java
index 4bafb574..cbd78045 100644
--- a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java
+++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/history/model/WfProcessExecution.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.manager.wf.model;
+package eu.dnetlib.manager.history.model;
import java.io.Serializable;
import java.time.LocalDateTime;
diff --git a/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/repository/EmailTemplateRepository.java b/libs/dnet-is-services/src/main/java/eu/dnetlib/common/repository/EmailTemplateRepository.java
similarity index 62%
rename from libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/repository/EmailTemplateRepository.java
rename to libs/dnet-is-services/src/main/java/eu/dnetlib/common/repository/EmailTemplateRepository.java
index 5e98cf23..f1ce156b 100644
--- a/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/repository/EmailTemplateRepository.java
+++ b/libs/dnet-is-services/src/main/java/eu/dnetlib/common/repository/EmailTemplateRepository.java
@@ -1,8 +1,8 @@
-package eu.dnetlib.manager.wf.repository;
+package eu.dnetlib.common.repository;
import org.springframework.data.jpa.repository.JpaRepository;
-import eu.dnetlib.manager.wf.model.EmailTemplate;
+import eu.dnetlib.common.model.EmailTemplate;
public interface EmailTemplateRepository extends JpaRepository {
diff --git a/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/WorkflowLogger.java b/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/history/WorkflowLogger.java
similarity index 90%
rename from libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/WorkflowLogger.java
rename to libs/dnet-is-services/src/main/java/eu/dnetlib/manager/history/WorkflowLogger.java
index 31ae50cd..c1dd8fd8 100644
--- a/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/WorkflowLogger.java
+++ b/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/history/WorkflowLogger.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.manager.wf;
+package eu.dnetlib.manager.history;
import java.time.Instant;
import java.time.LocalDateTime;
@@ -11,8 +11,8 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
-import eu.dnetlib.manager.wf.model.WfProcessExecution;
-import eu.dnetlib.manager.wf.repository.WfProcessExecutionRepository;
+import eu.dnetlib.manager.history.model.WfProcessExecution;
+import eu.dnetlib.manager.history.repository.WfProcessExecutionRepository;
@Service
public class WorkflowLogger {
diff --git a/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/repository/WfProcessExecutionRepository.java b/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/history/repository/WfProcessExecutionRepository.java
similarity index 80%
rename from libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/repository/WfProcessExecutionRepository.java
rename to libs/dnet-is-services/src/main/java/eu/dnetlib/manager/history/repository/WfProcessExecutionRepository.java
index cf58142d..0ea555d0 100644
--- a/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/wf/repository/WfProcessExecutionRepository.java
+++ b/libs/dnet-is-services/src/main/java/eu/dnetlib/manager/history/repository/WfProcessExecutionRepository.java
@@ -1,4 +1,4 @@
-package eu.dnetlib.manager.wf.repository;
+package eu.dnetlib.manager.history.repository;
import java.time.LocalDateTime;
import java.util.List;
@@ -6,7 +6,7 @@ import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
-import eu.dnetlib.manager.wf.model.WfProcessExecution;
+import eu.dnetlib.manager.history.model.WfProcessExecution;
public interface WfProcessExecutionRepository extends JpaRepository {
diff --git a/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java b/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java
index 4a0afec7..e3a1e90b 100644
--- a/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java
+++ b/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import com.google.common.base.Splitter;
-import eu.dnetlib.manager.wf.repository.EmailTemplateRepository;
+import eu.dnetlib.common.repository.EmailTemplateRepository;
@Service
public class EmailDispatcher {
diff --git a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/cron/ScheduledWorkflowLauncher.java b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/cron/ScheduledWorkflowLauncher.java
index 4f07469c..3711a3e1 100644
--- a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/cron/ScheduledWorkflowLauncher.java
+++ b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/cron/ScheduledWorkflowLauncher.java
@@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.support.CronExpression;
import org.springframework.stereotype.Service;
-import eu.dnetlib.manager.wf.WorkflowLogger;
+import eu.dnetlib.manager.history.WorkflowLogger;
import eu.dnetlib.manager.wf.model.WorkflowInstance;
import eu.dnetlib.manager.wf.repository.WorkflowInstanceRepository;
import eu.dnetlib.manager.wf.workflows.procs.ProcessRegistry;
diff --git a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/ProcessEngine.java b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/ProcessEngine.java
index 64beaccd..16c8bc50 100644
--- a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/ProcessEngine.java
+++ b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/ProcessEngine.java
@@ -16,8 +16,8 @@ import org.springframework.stereotype.Service;
import com.google.common.base.Throwables;
-import eu.dnetlib.manager.wf.WorkflowLogger;
-import eu.dnetlib.manager.wf.model.WfProcessExecution;
+import eu.dnetlib.manager.history.WorkflowLogger;
+import eu.dnetlib.manager.history.model.WfProcessExecution;
import eu.dnetlib.manager.wf.nodes.ProcessNode;
import eu.dnetlib.manager.wf.notification.EmailSender;
import eu.dnetlib.manager.wf.workflows.graph.GraphNode;
diff --git a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/WorkflowExecutor.java b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/WorkflowExecutor.java
index 525d8bb1..44ea7223 100644
--- a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/WorkflowExecutor.java
+++ b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/workflows/procs/WorkflowExecutor.java
@@ -5,6 +5,8 @@ import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import javax.annotation.PostConstruct;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +19,6 @@ import eu.dnetlib.manager.wf.model.WorkflowDbEntry;
import eu.dnetlib.manager.wf.model.WorkflowInstance;
import eu.dnetlib.manager.wf.repository.WorkflowDbEntryRepository;
import eu.dnetlib.manager.wf.repository.WorkflowInstanceRepository;
-import eu.dnetlib.manager.wf.workflows.graph.GraphLoader;
import eu.dnetlib.manager.wf.workflows.util.ProcessCallback;
import eu.dnetlib.manager.wf.workflows.util.WorkflowsConstants;
import eu.dnetlib.utils.Stoppable;
@@ -28,8 +29,6 @@ public class WorkflowExecutor implements Stoppable {
private static final Log log = LogFactory.getLog(WorkflowExecutor.class);
- @Autowired
- private GraphLoader graphLoader;
@Autowired
private ProcessRegistry processRegistry;
@Autowired
@@ -46,6 +45,7 @@ public class WorkflowExecutor implements Stoppable {
private boolean paused = false;
+ @PostConstruct
public void init() {
Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> {
if (isPaused() || processRegistry.countRunningWfs() >= WorkflowsConstants.MAX_RUNNING_PROCS_SIZE) { return; }
diff --git a/pom.xml b/pom.xml
index 2de8e485..2047af42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -451,7 +451,7 @@
UTF-8
UTF-8
- 3.9.0
+ 3.11.0
1.8
2.14.0
7.1.0