diff --git a/apps/collector/dockerfile b/apps/collector/dockerfile
new file mode 100644
index 0000000..f15d281
--- /dev/null
+++ b/apps/collector/dockerfile
@@ -0,0 +1,14 @@
+# Fetching latest version of Java
+FROM openjdk:18
+
+# Setting up work directory
+WORKDIR /app
+
+# Copy the jar file into our app
+COPY ./target/*.jar /app/app.jar
+
+# Exposing port 8080
+EXPOSE 8080
+
+# Starting the application
+CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/apps/collector/src/main/resources/application.properties b/apps/collector/src/main/resources/application.properties
new file mode 100644
index 0000000..6ba05d1
--- /dev/null
+++ b/apps/collector/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+server.title = D-NET Collector API
+server.description = Simple service to collect metadata
+server.public_url =
+
+maven.pom.path = /META-INF/maven/eu.dnetlib.docker/dnet-collector/effective-pom.xml
diff --git a/apps/email/dockerfile b/apps/email/dockerfile
new file mode 100644
index 0000000..f15d281
--- /dev/null
+++ b/apps/email/dockerfile
@@ -0,0 +1,14 @@
+# Fetching latest version of Java
+FROM openjdk:18
+
+# Setting up work directory
+WORKDIR /app
+
+# Copy the jar file into our app
+COPY ./target/*.jar /app/app.jar
+
+# Exposing port 8080
+EXPOSE 8080
+
+# Starting the application
+CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/apps/email/src/main/java/eu/dnetlib/utils/mail/EmailConfiguration.java b/apps/email/src/main/java/eu/dnetlib/utils/mail/EmailConfiguration.java
index c2871c0..ef32e3f 100644
--- a/apps/email/src/main/java/eu/dnetlib/utils/mail/EmailConfiguration.java
+++ b/apps/email/src/main/java/eu/dnetlib/utils/mail/EmailConfiguration.java
@@ -1,7 +1,9 @@
package eu.dnetlib.utils.mail;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+@Component
@ConfigurationProperties(prefix = "mail")
public class EmailConfiguration {
diff --git a/apps/pom.xml b/apps/pom.xml
index 59bcc8c..73fa146 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -42,9 +42,16 @@
${project.groupId}
- dnet-common
+ dnet-app-common
${project.version}
+
+
+ ${project.groupId}
+ dnet-model
+ ${project.version}
+
+
diff --git a/libs/dnet-common/src/main/resources/import_scripts/loadVocs.sh b/data/import_scripts/loadVocs.sh
similarity index 100%
rename from libs/dnet-common/src/main/resources/import_scripts/loadVocs.sh
rename to data/import_scripts/loadVocs.sh
diff --git a/libs/dnet-common/src/main/resources/schemas/cleaning_rule.xsd b/data/schemas/cleaning_rule.xsd
similarity index 100%
rename from libs/dnet-common/src/main/resources/schemas/cleaning_rule.xsd
rename to data/schemas/cleaning_rule.xsd
diff --git a/libs/dnet-common/src/main/resources/schemas/hadoop_job_configuration.xsd b/data/schemas/hadoop_job_configuration.xsd
similarity index 100%
rename from libs/dnet-common/src/main/resources/schemas/hadoop_job_configuration.xsd
rename to data/schemas/hadoop_job_configuration.xsd
diff --git a/libs/dnet-common/src/main/resources/sql/patch_openaire_db.sql b/data/sql/patch_openaire_db.sql
similarity index 100%
rename from libs/dnet-common/src/main/resources/sql/patch_openaire_db.sql
rename to data/sql/patch_openaire_db.sql
diff --git a/libs/dnet-common/src/main/resources/sql/schema.sql b/data/sql/schema.sql
similarity index 99%
rename from libs/dnet-common/src/main/resources/sql/schema.sql
rename to data/sql/schema.sql
index bfd790f..f93e7b7 100644
--- a/libs/dnet-common/src/main/resources/sql/schema.sql
+++ b/data/sql/schema.sql
@@ -130,8 +130,8 @@ INSERT INTO resource_types(id, name, content_type) VALUES
('transformation_rule_xslt', 'Transformation Rules (xslt)', 'application/xml'),
('transformation_rule_legacy', 'Transformation Rules (legacy)', 'text/plain'),
('cleaning_rule', 'Cleaning Rules', 'application/xml'),
- ('hadoop_job_configuration', 'Hadoop Job Configurations', 'application/xml')
- ('dedup_configuration', 'Dedup Configurations', 'application/json')
+ ('hadoop_job_configuration', 'Hadoop Job Configurations', 'application/xml'),
+ ('dedup_configuration', 'Dedup Configurations', 'application/json'),
('wf_template', 'Workflow Templates', 'application/json');
CREATE TABLE resources (
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..bca1303
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,63 @@
+version: "3"
+services:
+ collect:
+ build: ./apps/collector
+ ports:
+ - "8080:8080"
+ networks:
+ - backend
+ depends_on:
+ - postgresdb
+ environment:
+ - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresdb:5432/dnet_is
+ - SPRING_DATASOURCE_USERNAME=dnet
+ - SPRING_DATASOURCE_PASSWORD=ax45vs#1A
+
+ email:
+ build: ./apps/email
+ ports:
+ - "8081:8081"
+ networks:
+ - backend
+ depends_on:
+ - postgresdb
+ environment:
+ - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresdb:5432/dnet_is
+ - SPRING_DATASOURCE_USERNAME=dnet
+ - SPRING_DATASOURCE_PASSWORD=ax45vs#1A
+
+ postgresdb:
+ image: postgres:15.4
+ restart: always
+ ports:
+ - "5432:5432"
+ networks:
+ - backend
+ environment:
+ POSTGRES_USER: dnet
+ POSTGRES_PASSWORD: ax45vs#1A
+ POSTGRES_DB: dnet_is
+ volumes:
+ - ./data/sql/schema.sql:/docker-entrypoint-initdb.d/init.sql
+ - pgdata:/var/lib/postgresql/data
+
+ solr:
+ image: solr:9.3.0
+ ports:
+ - "8983:8983"
+ networks:
+ - backend
+ volumes:
+ - solrdata:/var/solr
+ command:
+ - solr-precreate
+ - gettingstarted
+
+networks:
+ backend:
+ frontend:
+
+volumes:
+ solrdata:
+ pgdata:
+
\ No newline at end of file
diff --git a/libs/dnet-common/pom.xml b/libs/dnet-app-common/pom.xml
similarity index 65%
rename from libs/dnet-common/pom.xml
rename to libs/dnet-app-common/pom.xml
index beb4771..015015a 100644
--- a/libs/dnet-common/pom.xml
+++ b/libs/dnet-app-common/pom.xml
@@ -9,46 +9,15 @@
4.0.0
- dnet-common
+ dnet-app-common
jar
- dnet-common
- D-Net common library
-
- org.springframework.boot
- spring-boot-starter-data-jpa
+ org.springframework.data
+ spring-data-jpa
+ provided
-
- org.springframework.boot
- spring-boot-starter-json
-
-
- org.postgresql
- postgresql
-
-
- io.hypersistence
- hypersistence-utils-hibernate-62
-
-
- com.fasterxml.jackson.module
- jackson-module-jakarta-xmlbind-annotations
-
-
-
-
- jakarta.xml.bind
- jakarta.xml.bind-api
-
-
-
-
- org.glassfish.jaxb
- jaxb-runtime
-
-
@@ -75,7 +44,6 @@
io.prometheus
simpleclient_spring_boot
- ${prometheus.version}
org.springframework
@@ -86,17 +54,14 @@
io.prometheus
simpleclient_hotspot
- ${prometheus.version}
io.prometheus
simpleclient_servlet
- ${prometheus.version}
io.prometheus
simpleclient_spring_web
- 0.3.0
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/base/AbstractDnetApp.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/base/AbstractDnetApp.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/base/AbstractDnetApp.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/base/AbstractDnetApp.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/base/AbstractDnetController.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/base/AbstractDnetController.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/base/AbstractDnetController.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/base/AbstractDnetController.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/CleanerException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/CleanerException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/CleanerException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/CleanerException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/CollectorException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/CollectorException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/CollectorException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/CollectorException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/DnetException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DnetException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/DnetException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DnetException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/DnetRuntimeException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DnetRuntimeException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/DnetRuntimeException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DnetRuntimeException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/DsmException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DsmException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/DsmException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DsmException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/InformationServiceException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/InformationServiceException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/InformationServiceException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/InformationServiceException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/TransformationException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/TransformationException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/TransformationException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/TransformationException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/errors/WorkflowManagerException.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/errors/WorkflowManagerException.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/errors/WorkflowManagerException.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/errors/WorkflowManagerException.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/CountedValue.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/CountedValue.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/CountedValue.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/CountedValue.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/DateUtils.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/DateUtils.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/DateUtils.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/DateUtils.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/DnetStreamSupport.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/DnetStreamSupport.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/DnetStreamSupport.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/DnetStreamSupport.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/Stoppable.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/Stoppable.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/Stoppable.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/Stoppable.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/StoppableDetails.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/StoppableDetails.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/StoppableDetails.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/StoppableDetails.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/XmlCleaner.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/XmlCleaner.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/XmlCleaner.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/XmlCleaner.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/utils/XmlIndenter.java b/libs/dnet-app-common/src/main/java/eu/dnetlib/utils/XmlIndenter.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/utils/XmlIndenter.java
rename to libs/dnet-app-common/src/main/java/eu/dnetlib/utils/XmlIndenter.java
diff --git a/libs/dnet-common/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json b/libs/dnet-app-common/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json
similarity index 100%
rename from libs/dnet-common/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json
rename to libs/dnet-app-common/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json
diff --git a/libs/dnet-model/pom.xml b/libs/dnet-model/pom.xml
new file mode 100644
index 0000000..31ae110
--- /dev/null
+++ b/libs/dnet-model/pom.xml
@@ -0,0 +1,69 @@
+
+
+
+
+ eu.dnetlib.docker
+ libs
+ 7.0.0-SNAPSHOT
+
+
+ 4.0.0
+
+ dnet-model
+ jar
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+ provided
+
+
+ org.springframework.boot
+ spring-boot-starter-json
+ provided
+
+
+ org.postgresql
+ postgresql
+ provided
+
+
+ io.hypersistence
+ hypersistence-utils-hibernate-62
+ provided
+
+
+ com.fasterxml.jackson.module
+ jackson-module-jakarta-xmlbind-annotations
+ provided
+
+
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+
+ org.mockito
+ mockito-junit-jupiter
+ test
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreCurrentVersion.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreCurrentVersion.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreCurrentVersion.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreCurrentVersion.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreType.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreType.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreType.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreType.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecord.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecord.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecord.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecord.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecordImpl.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecordImpl.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecordImpl.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/records/MetadataRecordImpl.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/records/Provenance.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/records/Provenance.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/mdstore/model/records/Provenance.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/mdstore/model/records/Provenance.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/Category.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/Category.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/Category.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/Category.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/ConceptLevel0.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/ConceptLevel0.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/ConceptLevel0.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/ConceptLevel0.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/ConceptLevel1.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/ConceptLevel1.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/ConceptLevel1.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/ConceptLevel1.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/ConceptLevel2.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/ConceptLevel2.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/ConceptLevel2.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/ConceptLevel2.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/Context.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/Context.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/Context.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/Context.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/CtxChildInfo.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/CtxChildInfo.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/CtxChildInfo.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/CtxChildInfo.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/CtxInfo.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/CtxInfo.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/CtxInfo.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/CtxInfo.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/Parameter.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/Parameter.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/context/Parameter.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/context/Parameter.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Api.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Api.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Api.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Api.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/ApiParam.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/ApiParam.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/ApiParam.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/ApiParam.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/ApiParamPK.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/ApiParamPK.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/ApiParamPK.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/ApiParamPK.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/BrowseTerm.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/BrowseTerm.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/BrowseTerm.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/BrowseTerm.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Datasource.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Datasource.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Datasource.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Datasource.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Identity.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Identity.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Identity.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Identity.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Organization.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Organization.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/Organization.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/Organization.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/PidSystem.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/PidSystem.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/PidSystem.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/PidSystem.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/PidSystemPK.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/PidSystemPK.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/PidSystemPK.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/PidSystemPK.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/ApiWithAdditionalInfo.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/ApiWithAdditionalInfo.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/ApiWithAdditionalInfo.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/ApiWithAdditionalInfo.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleApi.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleApi.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleApi.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleApi.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleDsWithApis.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleDsWithApis.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleDsWithApis.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleDsWithApis.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleOrganization.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleOrganization.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleOrganization.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/dsm/readonly/SimpleOrganization.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/email/EmailTemplate.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/email/EmailTemplate.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/email/EmailTemplate.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/email/EmailTemplate.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/Protocol.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/Protocol.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/Protocol.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/Protocol.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParam.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParam.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParam.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParam.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamPK.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamPK.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamPK.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamPK.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamType.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamType.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamType.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/protocol/ProtocolParamType.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/resource/ResourceType.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/resource/ResourceType.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/resource/ResourceType.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/resource/ResourceType.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/resource/SimpleResource.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/resource/SimpleResource.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/resource/SimpleResource.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/resource/SimpleResource.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/Synonym.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/Synonym.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/Synonym.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/Synonym.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/Vocabulary.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/Vocabulary.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/Vocabulary.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/Vocabulary.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTerm.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTerm.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTerm.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTerm.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTermPK.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTermPK.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTermPK.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/model/vocabulary/VocabularyTermPK.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/NotificationCondition.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/NotificationCondition.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/NotificationCondition.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/NotificationCondition.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WfHistoryEntry.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WfHistoryEntry.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WfHistoryEntry.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WfHistoryEntry.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowConfiguration.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowConfiguration.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowConfiguration.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowConfiguration.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowParamDesc.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowParamDesc.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowParamDesc.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowParamDesc.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSection.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSection.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSection.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSection.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscription.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscription.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscription.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscription.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscriptionPK.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscriptionPK.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscriptionPK.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowSubscriptionPK.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowTemplate.java b/libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowTemplate.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/data/wfs/model/WorkflowTemplate.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/data/wfs/model/WorkflowTemplate.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/params/ApiDesc.java b/libs/dnet-model/src/main/java/eu/dnetlib/params/ApiDesc.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/params/ApiDesc.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/params/ApiDesc.java
diff --git a/libs/dnet-common/src/main/java/eu/dnetlib/params/EmailMessage.java b/libs/dnet-model/src/main/java/eu/dnetlib/params/EmailMessage.java
similarity index 100%
rename from libs/dnet-common/src/main/java/eu/dnetlib/params/EmailMessage.java
rename to libs/dnet-model/src/main/java/eu/dnetlib/params/EmailMessage.java
diff --git a/libs/dnet-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowConfigurationTest.java b/libs/dnet-model/src/test/java/eu/dnetlib/manager/wf/model/WorkflowConfigurationTest.java
similarity index 100%
rename from libs/dnet-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowConfigurationTest.java
rename to libs/dnet-model/src/test/java/eu/dnetlib/manager/wf/model/WorkflowConfigurationTest.java
diff --git a/libs/dnet-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java b/libs/dnet-model/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java
similarity index 100%
rename from libs/dnet-common/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java
rename to libs/dnet-model/src/test/java/eu/dnetlib/manager/wf/model/WorkflowTemplateTest.java
diff --git a/libs/dnet-model/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json b/libs/dnet-model/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json
new file mode 100644
index 0000000..ec1735b
--- /dev/null
+++ b/libs/dnet-model/src/test/resources/eu/dnetlib/manager/wf/model/test-conf.json
@@ -0,0 +1,23 @@
+{
+ "id": "",
+ "name": "fffff",
+ "section": "GC",
+ "enabled": true,
+ "priority": 75,
+ "workflow": "09991db4-79e6-4e7c-a388-5063955bf9d8",
+ "schedulingEnabled": true,
+ "cronExpression": "0 30 12 1/1 * ?",
+ "cronMinInterval": 9600,
+ "details": {
+
+ },
+ "configured": true,
+ "systemParams": {
+
+ },
+ "userParams": {
+ "Name": "xxx",
+ "Age": "xxx",
+ "Birthday": "xxxx"
+ }
+}
\ No newline at end of file
diff --git a/libs/pom.xml b/libs/pom.xml
index fb8bf32..5e96843 100644
--- a/libs/pom.xml
+++ b/libs/pom.xml
@@ -1,18 +1,19 @@
-
- eu.dnetlib.docker
- dnet-parent
- 7.0.0-SNAPSHOT
-
+
+ eu.dnetlib.docker
+ dnet-parent
+ 7.0.0-SNAPSHOT
+
- 4.0.0
- libs
- pom
-
-
- dnet-common
-
+ 4.0.0
+ libs
+ pom
+
+
+ dnet-app-common
+ dnet-model
+
diff --git a/pom.xml b/pom.xml
index cc99e04..6c6cc75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,15 +181,16 @@
jakarta.xml.bind
jakarta.xml.bind-api
- 2.3.2
+ 3.0.1
org.glassfish.jaxb
jaxb-runtime
- 2.3.2
+ 4.0.3
+